From a925836fa0ec4d3e5362a289995c5cb3a3942ed7 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 26 十二月 2024 11:30:43 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
index 20e4aa0..69b3d6d 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
@@ -117,13 +117,19 @@
 //椤佃剼缈婚〉鏌ヨ
 const selectPageList = () => {
   let inputVal = form.orderId
+  let selectProcesses = value.value
   if (inputVal == '') {
     inputVal = null
+  }
+  let inputProject = form.project
+  if (inputProject == '') {
+    inputProject = null
   }
   let optionVal=stateValue.value
   if (optionVal == '') {
     optionVal = null
   }
+  console.log(selectProcesses)
   request.post(`/report/workInProgress/${pageNum.value}/${total.pageSize}/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}`, filterData.value).then((res) => {
 
     if (res.code == 200) {

--
Gitblit v1.8.0