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/WorkInProgress.vue | 16 ++++------------
1 files changed, 4 insertions(+), 12 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 556532d..7ffb671 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
@@ -138,9 +138,7 @@
optionVal = null
}
let terminationVals = terminationVal.value
- if (terminationVals == '') {
- terminationVals = null
- }
+
request.post(`/report/workInProgress/${pageNum.value}/${total.pageSize}/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}/${terminationVals}`, filterData.value).then((res) => {
if (res.code == 200) {
@@ -175,9 +173,7 @@
optionVal = null
}
let terminationVals = terminationVal.value
- if (terminationVals == '') {
- terminationVals = null
- }
+
request.post(`/report/workInProgress/${pageNum.value}/${total.pageSize}/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}/${terminationVals}`, filterData.value).then((res) => {
if (res.code == 200) {
@@ -241,9 +237,7 @@
optionVal = null
}
let terminationVals = terminationVal.value
- if (terminationVals == '') {
- terminationVals = null
- }
+
request.post(`/report/workInProgress/${pageNum.value}/${total.pageSize}/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}/${terminationVals}`, filterData.value).then((res) => {
if (res.code == 200) {
@@ -416,9 +410,7 @@
inputProject = null
}
let terminationVals = terminationVal.value
- if (terminationVals == '') {
- terminationVals = null
- }
+
if(date===null){
ElMessage.warning(t('report.pleaseSelectADateFirst'))
return
--
Gitblit v1.8.0