From ee528b89f22d1054ef7c4391c6fc54f2bd39612b Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 30 七月 2024 20:00:48 +0800
Subject: [PATCH] 修改客户培训提出的优化

---
 src/components/do/b1-inspect-order-plan/Inspection.vue |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index fb42e85..73bde1c 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1205,7 +1205,11 @@
       },
       // 娓╁害寰幆---寮�濮�
       changeItem(row){
-        if(row.value0&&row.value1){
+        if(row.value0&&!row.value1){
+          this.$set(row,'comValue',Number(row.value0).toFixed(3))
+        }else if(!row.value0&&row.value1){
+          this.$set(row,'comValue',Number(row.value1).toFixed(3))
+        }else if(row.value0&&row.value1){
           this.$set(row,'comValue',((Number(row.value0)+Number(row.value1))/2).toFixed(3))
         }else{
           return
@@ -2705,6 +2709,14 @@
           this.$message.error("璇锋寚瀹氬鏍镐汉鍛�")
           return
         }
+        if(!this.otherForm.humidity){
+          this.$message.error("璇疯緭鍏ユ箍搴�")
+          return
+        }
+        if(!this.otherForm.temperature){
+          this.$message.error("璇疯緭鍏ユ俯搴�")
+          return
+        }
         this.addVerifyDia = false
         this.submitLoading = true;
         this.$axios.post(this.$api.insOrderPlan.checkSubmitPlan, {
@@ -2799,7 +2811,9 @@
           if (this.equipOptions[i].value === val) {
             for (let i1 in this.param[n.i].equipName) {
               if (this.param[n.i].equipName[i1].i === n.i && this.param[n.i].equipName[i1].r === n.r) {
+                this.$delete(this.param[n.i].equipValue[i1].v,'v')
                 this.$set(this.param[n.i].equipValue[i1].v,'v',val)
+                this.$delete(this.param[n.i].equipName[i1].v,'v')
                 this.$set(this.param[n.i].equipName[i1].v,'v',this.equipOptions[i].label)
                 this.param[n.i].equipValue[i1].isItADataAcquisitionDevice = this.equipOptions[i].isItADataAcquisitionDevice
               }

--
Gitblit v1.9.3