From e6bf567a863fb8a6bc7b776ac938825111c9ab52 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 14 十月 2024 08:54:07 +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 | 4 +++-
1 files changed, 3 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 c4c6653..e5fcb9f 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
@@ -358,7 +358,9 @@
}else if(row.quantity_card<row.completedQuantity){
return new Error("瀹屽伐鏁颁笉鑳藉ぇ浜庢祦绋嬪崱鏁伴噺")
}
- if(titleUploadData.value.reportingWorkId!=null && row.completedQuantity<row.minQuantity){
+ const completedNum =
+ (row.completedQuantity === undefined || row.completedQuantity===null || row.completedQuantity==='') ? 0 : row.completedQuantity
+ if(titleUploadData.value.reportingWorkId!=null && completedNum>row.minQuantity){
return new Error(`${t('reportingWorks.pleaseGreaterThanOrEqual1')}
${row.minQuantity}
${t('reportingWorks.pleaseGreaterThanOrEqual2')}`)
--
Gitblit v1.8.0