From 282e032b5771da13d224214d3b0b71f3efde9a42 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 25 八月 2023 18:45:42 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
h5_standard/src/views/workOrder/workOrderReporting.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/h5_standard/src/views/workOrder/workOrderReporting.vue b/h5_standard/src/views/workOrder/workOrderReporting.vue
index b24be91..689f086 100644
--- a/h5_standard/src/views/workOrder/workOrderReporting.vue
+++ b/h5_standard/src/views/workOrder/workOrderReporting.vue
@@ -962,7 +962,7 @@
if (info.value.bomType === 1) { // 鎷夊紡
console.log('鎷夊紡')
statisticsData.value = []
- if (produceFrom.qualified <= 0) {
+ if (produceFrom.qualified <= 0 && produceFrom.undesirable <= 0) {
Toast.fail({ message: '浜у嚭鏄庣粏涓嶈兘涓虹┖' })
return
}
@@ -1121,7 +1121,7 @@
Toast.fail({ message: '鎶曟枡鏄庣粏涓嶈兘涓虹┖' })
return
}
- if (produceFrom.qualified <= 0) {
+ if (produceFrom.qualified <= 0 && produceFrom.undesirable <= 0) {
Toast.fail({ message: '浜у嚭鏄庣粏涓嶈兘涓虹┖' })
return
}
--
Gitblit v1.9.3