From 03df078310b88f2b4472c07ed9a09278b425ee00 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 16 七月 2024 17:28:34 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
index 02ee91d..39783f8 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
@@ -84,12 +84,13 @@
     orderOtherMoney.value.forEach(item => {
       let column = {
         field: `${item.column}`,
-        width: 60,
+        width: 85,
         title: item.alias,
+        filters: [{data: ''}],
+        slots: {filter: 'num1_filter'},
+        filterMethod: filterChanged,
       }
 
-      //columns.push(column)
-      console.log(column)
       gridOptions.columns.push(column)
 
     })
@@ -202,7 +203,10 @@
     {field: 'computeGrossArea', title: t('processCard.areaToDivided'), width: '80px'},
     {field: 'totalThickness', title: t('processCard.totalThickness'), width: '80px'},
     {field: 'thickness', title: t('processCard.glassThickness'), width: '80px'},
-    {field: 'weight', title: t('processCard.weight'), slots: {default: 'weight_sum'}, width: '85px'}
+    {field: 'weight', title: t('processCard.weight'), slots: {default: 'weight_sum'}, width: '85px'},
+    {field: 'remarks', title: t('processCard.notes'),  width: '85px',filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged}
   ],//琛ㄥご鎸夐挳
 
   toolbarConfig: {

--
Gitblit v1.8.0