From 26633e17d9e9a612e4744405d214cf513d13bffd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 26 九月 2024 13:56:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 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 96147ee..4c2a748 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
@@ -181,10 +181,10 @@
 
 let orderId = route.query.orderId
 data.value.printList = JSON.parse(route.query.printList)
-
+let type = parseInt(route.query.type)
 let inquiryMode = route.query.checkedValue
 // 绗竴娆″姞杞芥煡璇�
-request.post(`/processCard/selectPrintDetails/${inquiryMode}`, data.value).then((res) => {
+request.post(`/processCard/selectPrintDetails/${inquiryMode}/${type}`, data.value).then((res) => {
 
   if (res.code == 200) {
     let newDataCollection = [];
@@ -293,6 +293,13 @@
       filterMethod: filterChanged,width: 100
     },
     {
+      field: 'technology_number',
+      title: t('processCard.technologyNumber'),
+      filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged,width: 100
+    },
+    {
       field: 'glassNumber',
       title: t('reportingWorks.glassNumber'),
       filters: [{data: ''}],

--
Gitblit v1.8.0