From a9d8f80c82234bc7c46f117eae00e75304a4e972 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 16 五月 2024 14:50:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index dccd0a9..c50d3e0 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -629,8 +629,9 @@
return false;
});
const notFinishList = xGrid.value.getTableData().fullData.filter(item =>{
- return item.saveFlag === false
+ return item.saveFlag === 0
})
+
for(let item of uniqueByOrderNum){
if(!checkSameNumForId(notFinishList,item.order_number)){
ElMessage.error(`璇锋鏌ヨ鍗曞簭鍙�: ${item.order_number} 鎶ュ伐鏁伴噺鏄惁鐩稿悓锛乣)
@@ -786,6 +787,10 @@
const getWork = () => {
let processId = titleUploadData.value.processId
+ if (processId == "" || processId == null) {
+ ElMessage.warning("娴佺▼鍗″彿涓嶈兘涓虹┖")
+ return
+ }
let parts = processId.split('/');
if (processId.indexOf("/") < 0 ||parts[1].trim() == '') {
--
Gitblit v1.8.0