From 7104751e2f26872d4891d01d42ee88cf19715d01 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 七月 2025 17:46:01 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
index efa5037..6957b8b 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
@@ -223,6 +223,7 @@
   hiprintTemplate.value.print(object)
 
 }
+const orderOtherMoney = ref(null)
 
 const {currentRoute} = useRouter()
 const route = currentRoute.value
@@ -241,7 +242,21 @@
         newDataCollection.push(item);
       })
     }
+    orderOtherMoney.value = res.data.orderOtherMoney
+    orderOtherMoney.value.forEach(item => {
+      let column = {
+        field: `${item.column}`,
+        width: 100,
+        title: item.alias,
+        filters: [{data: ''}],
+        slots: {filter: 'num1_filter'},
+        filterMethod: filterChanged,
+        sortable: true
+      }
 
+      gridOptions.columns.push(column)
+
+    })
     titleSelectJson.value.dataType = res.data.type
     xGrid.value.reloadData(newDataCollection)
     gridOptions.loading = false

--
Gitblit v1.8.0