From a61d61f3dfe64da5f49287fae3371e2538608d9c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 24 七月 2025 11:15:36 +0800
Subject: [PATCH] 提交首页流程卡显示问题
---
north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
index 8fc4d58..4cbb0e4 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
@@ -80,13 +80,14 @@
{field: 'child_width', width: 90,title: t('order.width'),showOverflow:"ellipsis"},
{field: 'child_height', width: 90,title: t('order.height'),showOverflow:"ellipsis"},
{field: 'quantity', width: 90,title: t('order.quantity')},
+ {field: 'glassQuantity', width: 90,title: t('order.glassQuantity')},
{field: 'gross_area', width: 90,title: t('order.area')},
{field: 'shippedQuantity',width: 120, title: t('delivery.deliveryQuantity')},
{field: 'inventory',width: 120, title: t('productStock.inventoryQuantity')},
{field: 'inventoryArea',width: 120, title: t('report.inventoryArea')},
{field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
]
-let column = [0,1,3,6,7,8,9,10,11,12]
+let column = [0,1,3,6,7,8,10,11,12,13]
onMounted(()=>{
@@ -108,7 +109,7 @@
gridOptions.columns.forEach(item =>{
item.filterMethod = filterChanged
})
- list.value = ['quantity','inventory','inventoryArea','gross_area']
+ list.value = ['quantity','inventory','inventoryArea','gross_area','shippedQuantity','glassQuantity']
res.data.title.forEach((item,index) =>{
list.value.push('reportWorkQuantity.'+item.process)
let column = {slots: { default: 'quantitySum'},
@@ -123,7 +124,7 @@
})
await xGrid.value.loadData(res.data.data)
- //await xGrid.value.setMergeCells(res.data.mergeCells)
+ await xGrid.value.setMergeCells(res.data.mergeCells)
gridOptions.loading = false
} else {
--
Gitblit v1.8.0