From 58b8a2ef7bb9d50ab8d66ae0048156cafb684a15 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 30 十二月 2025 08:28:25 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgressCombination.vue | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgressCombination.vue b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgressCombination.vue
index 4235538..eb109ba 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgressCombination.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgressCombination.vue
@@ -108,9 +108,7 @@
optionVal = null
}
let terminationVals = terminationVal.value
-if (terminationVals == '') {
- terminationVals = null
-}
+
//绗竴娆″姞杞芥暟鎹�
request.post(`/report/workInProgressCombinationProcess/1/${total.pageSize}/${selectProcesses}/${inputVal}/${inputProject}/${optionVal}`, filterData.value).then((res) => {
@@ -145,9 +143,7 @@
optionVal = null
}
let terminationVals = terminationVal.value
- if (terminationVals == '') {
- terminationVals = null
- }
+
request.post(`/report/workInProgressCombination/${pageNum.value}/${total.pageSize}/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}/${terminationVals}`, filterData.value).then((res) => {
if (res.code == 200) {
total.value = res.data.total
@@ -181,9 +177,6 @@
optionVal = null
}
let terminationVals = terminationVal.value
- if (terminationVals == '') {
- terminationVals = null
- }
request.post(`/report/workInProgressCombination/${pageNum.value}/${total.pageSize}/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}/${terminationVals}`, filterData.value).then((res) => {
if (res.code == 200) {
@@ -326,9 +319,7 @@
inputProject = null
}
let terminationVals = terminationVal.value
- if (terminationVals == '') {
- terminationVals = null
- }
+
if(date===null){
ElMessage.warning(t('report.pleaseSelectADateFirst'))
return
--
Gitblit v1.8.0