diff --git a/src/pages/repair/repairManage/code-operate.vue b/src/pages/repair/repairManage/code-operate.vue index 7e79780..7d0ec57 100644 --- a/src/pages/repair/repairManage/code-operate.vue +++ b/src/pages/repair/repairManage/code-operate.vue @@ -756,8 +756,8 @@ const saveCode = () => { console.log(formRight.value) if (repairPerson.value == '') { uni.showToast({ title: '请先选择维修人员!', icon: 'none' }) - } else if (formRight.value.scrapReason == '') { - uni.showToast({ title: '请选择报废原因', icon: 'none' }) + } else if (!formRight.value.scrapReason && !formRight.value.scrapId) { + uni.showToast({ title: '请填写报废原因', icon: 'none' }) } else { saveCodeApi() } diff --git a/src/pages/repair/repairManage/num-operate.vue b/src/pages/repair/repairManage/num-operate.vue index 80df9fd..4e82097 100644 --- a/src/pages/repair/repairManage/num-operate.vue +++ b/src/pages/repair/repairManage/num-operate.vue @@ -685,7 +685,7 @@ const saveNumAll = async () => { uni.showToast({ title: '请选择维修类型并填写维修数量!', icon: 'none' }) }else if(formMiddle.value.repairNum>0&&(formMiddle.value.supplierId==undefined||formMiddle.value.supplierId=='')){ uni.showToast({ title: '返厂维修请选择厂家!', icon: 'none' }) - }else if(formRight.value.scrapNum>0&&formRight.value.scrapReason==''){ + }else if(formRight.value.scrapNum > 0 && !formRight.value.scrapReason && !formRight.value.scrapId) { uni.showToast({ title: '维修报废请填写报废原因!', icon: 'none' }) }else { if (loading.value) {