From 3ee23fa2bfb5f90863a1e2579c882b4bae875aa3 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 31 五月 2024 11:50:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue |    2 ++
 1 files changed, 2 insertions(+), 0 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 5e88767..1d5c2a3 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
@@ -64,6 +64,8 @@
   {field: 'technology_number', width: 90,title: '灏忕墖椤哄簭',showOverflow:"ellipsis"},
   {field: 'quantity', width: 90,title: '鏁伴噺'},
   {field: 'broken_num',width: 90, title: '娆$牬鏁伴噺'},
+  {field: 'shippedQuantity',width: 120, title: '鍙戣揣鏁伴噺'},
+  {field: 'inventory',width: 120, title: '鍏ュ簱鏁伴噺'},
   {field: 'inventoryArea',width: 120, title: '鍏ュ簱闈㈢Н'},
 ]
 //闇�瑕佸悎骞剁殑鍒�

--
Gitblit v1.8.0