From d8d184a00d3581b3a77aa26864a153f0515524e0 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 29 八月 2023 18:30:03 +0800
Subject: [PATCH] 小程序
---
h5_standard/src/views/workOrder/workOrderReporting.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/h5_standard/src/views/workOrder/workOrderReporting.vue b/h5_standard/src/views/workOrder/workOrderReporting.vue
index b24be91..3057755 100644
--- a/h5_standard/src/views/workOrder/workOrderReporting.vue
+++ b/h5_standard/src/views/workOrder/workOrderReporting.vue
@@ -306,11 +306,11 @@
</van-list>
</div>
</div>
- <!-- 鎶ュ伐鎸夐挳 -->
- <template v-if="info.status === 2 || info.procedureNeedcheck === 1">
+ <!-- 鎶ュ伐鎸夐挳 v-if="info.status === 2 || info.procedureNeedcheck === 1" -->
+ <template>
<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_submit" v-if="typeView == 0 && (info.status === 2 || info.procedureNeedcheck === 1)" @click="submit">纭鎶ュ伐</div>
<!-- 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="" />
@@ -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