From 2a1ea6a1c5b2210b3ac751e344517741cfbac2dd Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 19 一月 2024 10:59:31 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

---
 src/views/quality/teststandard/standard-form.vue |   35 +++++++++++++++++++++++------------
 1 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/views/quality/teststandard/standard-form.vue b/src/views/quality/teststandard/standard-form.vue
index 6e9dfa2..4cc5f4c 100644
--- a/src/views/quality/teststandard/standard-form.vue
+++ b/src/views/quality/teststandard/standard-form.vue
@@ -155,6 +155,23 @@
     ZttMonacoEditor,
     operationDialog
   },
+  watch:{
+    visible(newVal){
+      if(!newVal){
+        this.dataForm = {
+          id: 0,
+          standardName: '',
+          standardNo: '',
+          remark: '',
+          judgeFormula: '',
+          inspectionType: null,
+          operationId: null,
+          operationNo: null,
+          operationName: null,
+        }
+      }
+    }
+  },
   created() {
     this.funcs = funcForStandard()
     this.constants = constantForStandard()
@@ -194,20 +211,8 @@
       this.visible = true
       this.$nextTick(() => {
         this.$refs.dataForm.resetFields()
-        this.dataForm = {
-          id: 0,
-          standardName: '',
-          standardNo: '',
-          remark: '',
-          judgeFormula: '',
-          inspectionType: null,
-          operationId: null,
-          operationNo: null,
-          operationName: null,
-        }
         if (this.dataForm.id) {
           getTestStandard(this.dataForm.id).then((response) => {
-            console.log(response.data.data)
             this.dataForm = response.data.data
             // this.$refs.templateJudgmentCondition.setVal(
             //   this.dataForm.judgeFormula == null
@@ -257,6 +262,9 @@
               this.visible = false
               this.isSubmit = false
               this.$emit('refreshDataList')
+            }).catch(error=>{
+              console.error(error);
+              this.isSubmit = false
             })
           } else {
             addTestStandard(this.dataForm).then((data) => {
@@ -264,6 +272,9 @@
               this.visible = false
               this.isSubmit = false
               this.$emit('refreshDataList')
+            }).catch(error=>{
+              console.error(error);
+              this.isSubmit = false
             })
           }
         } else {

--
Gitblit v1.9.3