From bd03748adb5b9fda8ac4b52c8de93062eaa8ee72 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 22 五月 2024 10:26:09 +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/SelectPrintFlowCard.vue |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
index d3ac47b..8a8971e 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
@@ -98,7 +98,16 @@
 
   let startTime = form.date1[0]
   let endTime = form.date1[1]
-  request.post(`/processCard/selectAddProcess/${startTime}/${endTime}`).then((res) => {
+  let orderId=form.orderId
+  let project=form.project
+
+  if (orderId==''){
+    orderId=null
+  }
+  if (project==''){
+    project=null
+  }
+  request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}`, filterData.value).then((res) => {
     if (res.code == 200) {
 
       xGrid.value.loadData(res.data.data)

--
Gitblit v1.8.0