From 77e6370cf2476a7c32fdd88df94cff0b042abd43 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 27 三月 2025 10:37:44 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
index 6583a68..71b210d 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
@@ -198,6 +198,7 @@
slots: {filter: 'num1_filter'},
filterMethod: filterChanged},
{field: 'quantity', width: 90,title: t('order.quantity')},
+ {field: 'gross_area', width: 90,title: t('order.area')},
{field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
// {field: 'shippedQuantity',width: 120, title: t('report.shippedQuantity')},
{field: 'inventory',width: 120, title: t('report.inventoryNum')},
@@ -223,7 +224,7 @@
if (columnIndex === 0) {
return t('basicData.total')
}
- const List = ["quantity", "broken_num", "inventory", "inventoryArea"]; // 闈欐�佸垪鐨勬眰鍜�
+ const List = ["quantity", "broken_num", "inventory", "inventoryArea","gross_area"]; // 闈欐�佸垪鐨勬眰鍜�
if (List.includes(column.field)) {
return footSum(data, column.field)
}
--
Gitblit v1.8.0