From ff54cb77e4fe63d5c85669cc3bd116d015c17c2d Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 九月 2023 11:22:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

---
 src/components/view/rawInsDetail.vue |   37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/components/view/rawInsDetail.vue b/src/components/view/rawInsDetail.vue
index 9f5a5d6..19898d7 100644
--- a/src/components/view/rawInsDetail.vue
+++ b/src/components/view/rawInsDetail.vue
@@ -12,7 +12,7 @@
             >鎻� 浜�</el-button
           >
           <el-button
-            icon="el-icon-download"
+            icon="el-icon-back"
             @click="
               () => {
                 goBack();
@@ -118,7 +118,7 @@
           <el-col :span="7">
             <el-form-item label="渚涘簲鍟嗗悕绉�:">
               <el-input
-                :placeholder="detailId !== null ? '' : '璇疯緭鍏ユ楠屾暟閲�'"
+                :placeholder="detailId !== null ? '' : '璇疯緭鍏ヤ緵搴斿晢鍚嶇О'"
                 :disabled="detailId !== null"
                 v-model="detailInfo.supplier"
               ></el-input>
@@ -274,7 +274,7 @@
       <el-table :data="conclusionTable" style="100%">
         <el-table-column prop="code" label="鐗╂枡缂栧彿"> </el-table-column>
         <el-table-column prop="name" label="鐗╂枡鍚嶇О"> </el-table-column>
-        <el-table-column prop="uName" label="妫�楠屽憳">
+        <el-table-column v-if="detailId != null" prop="uName" label="妫�楠屽憳">
           <template slot-scope="scope">
             <span
               v-for="item in scope.row.uName"
@@ -350,6 +350,7 @@
 </template>
 
 <script>
+import { triggerRef } from "vue";
 import RawIns from "./raw-ins.vue";
 export default {
   components: { RawIns },
@@ -383,6 +384,7 @@
       } else {
         conclusion.testState = 1;
       }
+      console.log([conclusion]);
       return [conclusion];
     }
   },
@@ -439,7 +441,11 @@
           this.projectTable = res.data.children;
           this.projectTable.forEach(i => {
             // 瑙ｅ喅閲嶆柊璧嬪�兼棤娉曠紪杈戞搷浣�
-            this.$set(i, "testValueList", i.testValue.split(","));
+            if (i.testValue == null) {
+              this.$set(i, "testValueList", []);
+            } else {
+              this.$set(i, "testValueList", i.testValue.split(","));
+            }
             // 鍙栨渶闀跨殑鍒楄〃鏁�
             if (i.testValueList.length > this.empiricalValueAdd) {
               this.empiricalValueAdd = i.testValueList.length;
@@ -463,10 +469,24 @@
       this.detailId = res.data;
       this.getDetailInfo();
       this.$message.success(res.message);
+      this.goBack();
     },
 
     // 淇敼椤圭洰鐨勬娴嬪�兼敼鍙樼粨璁�
     async changeState(row, index) {
+      let val=row.testValueList.filter(item=>{
+        return item!=''&&item!=null
+      })
+      let eq=val.filter(item=>{
+        return /^[^><=]/.test(item)
+      })
+      if(eq.length>0){
+        this.$message({
+                    message: "杈撳叆鍊糩"+eq+"]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
+                    type: 'warning'
+                });
+      return
+      }
       if (this.detailId !== null) {
         const res = await this.$axios.post(this.$api.url.updaterawInsProduct, {
           DevId: row.deviceId,
@@ -480,9 +500,11 @@
     async submitSave() {
       const res = await this.$axios.post(
         this.$api.url.updateRawInspectsById + `${this.detailId}`
-      );
-      this.$message.success("鎻愪氦鎴愬姛");
-      this.getDetailInfo();
+      ).then(res=>{
+        this.$message.success("鎻愪氦鎴愬姛");
+        this.getDetailInfo();
+        this.goBack()
+聽 聽 聽 });
     },
     // 鑾峰彇璁惧鏍戝唴瀹�
     getOptions() {
@@ -499,6 +521,7 @@
         name: "",
         required: "",
         textValue: "",
+        testState:null,
         testValueList: [],
         unit: ""
       };

--
Gitblit v1.9.3