From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
h5_standard/src/views/workOrder/reportingForWork.vue | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/h5_standard/src/views/workOrder/reportingForWork.vue b/h5_standard/src/views/workOrder/reportingForWork.vue
index 256d10c..ccaceec 100644
--- a/h5_standard/src/views/workOrder/reportingForWork.vue
+++ b/h5_standard/src/views/workOrder/reportingForWork.vue
@@ -392,6 +392,12 @@
if (!from.qualified && !from.undesirable) {
return Toast('鑹搧鏁颁笌涓嶈壇鏁颁笉鑳藉悓鏃朵负绌�')
}
+ if (from.qualified && from.qualified <= 0) {
+ return Toast('鑹搧鏁板繀椤诲ぇ浜�0')
+ }
+ if (from.undesirable && from.undesirable <= 0) {
+ return Toast('涓嶈壇鍝佹暟蹇呴』澶т簬0')
+ }
// if (!from.qualified) return Toast('鑹搧鏁颁笉鑳戒负绌�')
// 鏈変笉鑹暟
if (from.undesirable > 0) {
@@ -697,6 +703,7 @@
getDeviceByCondition({ procedureId: res.procedureId })
.then(res1 => {
if (res1.code === 200) {
+ if (res1.data && res1.data.length > 0)
deviceId.value = res1.data[0].id
from.deviceId = res1.data[0].id
from.deviceName = res1.data[0].name
--
Gitblit v1.9.3