diff --git a/src/pages/deviceReport/addForm.vue b/src/pages/deviceReport/addForm.vue index b311ec9..ba43d10 100644 --- a/src/pages/deviceReport/addForm.vue +++ b/src/pages/deviceReport/addForm.vue @@ -94,6 +94,7 @@ const singleColumnList = ref([]) const imgList = ref([]) const field = ref('') + const msg = ref('') function chickRightButton(field) { if (!form.value.type) { proxy.$modal.showToast('请先选择类型') @@ -139,6 +140,7 @@ }).then((res) => { console.log(res) if (!res.data) { + msg.value = res.msg form.value.deviceName = '' form.value.factoryAreaName = '' form.value.factoryAreaNumber = '' @@ -159,6 +161,7 @@ flag:1 }).then((res) => { if (!res.data) { + msg.value = res.msg form.value.deviceName = '' form.value.factoryAreaName = '' form.value.factoryAreaNumber = '' @@ -190,6 +193,10 @@ proxy.$modal.showToast(`请选择${type.value == 'DEVICE' || type.value == 'TECH' ? '设备' : '模具'}`) return; } + if (!form.value.deviceName) { + proxy.$modal.showToast(msg.value) + return; + } if (!form.value.type) { proxy.$modal.showToast(`请选择类型'}`) return; diff --git a/src/pages/overhaulOrder/addForm.vue b/src/pages/overhaulOrder/addForm.vue index 8dc2eea..c2ea802 100644 --- a/src/pages/overhaulOrder/addForm.vue +++ b/src/pages/overhaulOrder/addForm.vue @@ -114,6 +114,11 @@ proxy.$modal.showToast('请输入故障描述') return; } + + if (!form.value.deviceNumber) { + proxy.$modal.showToast(`请选择${type.value == 'DEVICE' || type.value == 'TECH' ? '设备' : '模具'}名称`) + return; + } if (!form.value.deviceName) { proxy.$modal.showToast(msg.value) return; diff --git a/src/pages/repairOrder/addForm.vue b/src/pages/repairOrder/addForm.vue index b9a33d8..1127cff 100644 --- a/src/pages/repairOrder/addForm.vue +++ b/src/pages/repairOrder/addForm.vue @@ -123,6 +123,7 @@ const maintenanceShift = ref([]) const faultType = ref([]) const choosesingleColumnItem = ref() + const msg = ref('') // 扫描设备条码 function chickRightButton(field) { if (!form.value.type) { @@ -153,6 +154,7 @@ type: type.value }).then((res) => { if (!res.data) { + msg.value = res.msg form.value.deviceName = '' form.value.factoryAreaName = '' form.value.factoryAreaNumber = '' @@ -171,6 +173,7 @@ number: form.value.deviceNumber }).then(res => { if (!res.data) { + msg.value = res.msg form.value.deviceName = '' form.value.factoryAreaName = '' form.value.factoryAreaNumber = '' @@ -197,6 +200,10 @@ proxy.$modal.showToast(`请选择${type.value == 'DEVICE' || type.value == 'TECH' ? '设备' : '模具'}名称`) return; } + if (!form.value.deviceName) { + proxy.$modal.showToast(msg.value) + return; + } if (!form.value.factoryAreaName) { proxy.$modal.showToast('请输入区域') return;