From c5c6fa800cedd37cea0e3cc3e68df78b47ee2813 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 10:37:59 +0800
Subject: [PATCH] 111

---
 h5_standard/src/views/workOrder/workOrderReporting.vue |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/h5_standard/src/views/workOrder/workOrderReporting.vue b/h5_standard/src/views/workOrder/workOrderReporting.vue
index 531d7fd..689f086 100644
--- a/h5_standard/src/views/workOrder/workOrderReporting.vue
+++ b/h5_standard/src/views/workOrder/workOrderReporting.vue
@@ -311,7 +311,8 @@
             <div class="bh_zw"></div>
             <div class="bg_footer">
                 <div class="bg_footer_submit" v-if="typeView == 0" @click="submit">纭鎶ュ伐</div>
-                <div class="bg_footer_submit1" @click="jumpdj" v-if="proxy.$auth('h5:workorder:processRecord') && typeView == 1">
+                <!-- proxy.$auth('h5:workorder:processRecord') &&  -->
+                <div class="bg_footer_submit1" @click="jumpdj" v-if="typeView == 1">
                     <img src="@/assets/icon/gongdan_ic_shoudong@2x.png" alt="" />
                     <span>鏂板鐐规</span>
                 </div>
@@ -961,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
             }
@@ -1120,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