From d77fc6758d8d66e0f3e35486251d211d102857be Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 九月 2023 13:45:38 +0800
Subject: [PATCH] 	modified:   src/components/view/finishedProductInspectionAdd.vue 	modified:   src/components/view/finishedProductInspectionUp.vue 	modified:   src/components/view/processInspection.vue 	modified:   src/components/view/processInspectionUpdate.vue 	modified:   src/components/view/rawInsDetail.vue

---
 src/components/view/processInspection.vue |   59 ++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/src/components/view/processInspection.vue b/src/components/view/processInspection.vue
index 02cb997..3a1abf5 100644
--- a/src/components/view/processInspection.vue
+++ b/src/components/view/processInspection.vue
@@ -80,8 +80,8 @@
           <el-col :span="12">鏂板杩囩▼妫�楠屽崟</el-col>
           <el-col :span="12" style="text-align: right;">
             <!-- 鐐瑰嚮杩斿洖锛屽綋鍓嶉〉闈㈠�间负false -->
-            <el-button type="primary" size="mini" style="background: #004EA2; "
-              icon="el-icon-circle-plus-outline">鏂板</el-button>
+            <!-- <el-button type="primary" size="mini" style="background: #004EA2; "
+              icon="el-icon-circle-plus-outline">鏂板</el-button> -->
             <el-button @click="combackIndex" type="primary" size="mini" icon="el-icon-back"
               style="background: #004EA2; ">杩斿洖</el-button>
           </el-col>
@@ -192,9 +192,14 @@
           </el-table-column>
           <el-table-column prop="dname" label="璇曢獙璁惧" min-width="100">
             <template slot-scope="scope">
-              <el-button type="text" @click="clickTableSelect(scope)">{{
+              <el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
                 scope.row.dname == null ? "璇烽�夋嫨" : scope.row.dname
               }}</el-button>
+              <el-select v-if="scope.row.isSelectDevice" style="width: 100%;" @change="clickNodeSure(scope.row)"
+                v-model="filterText" placeholder="璇烽�夋嫨">
+                <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
+                </el-option>
+              </el-select>
             </template>
           </el-table-column>
           <el-table-column label="缁撹">
@@ -335,9 +340,9 @@
     };
   },
   watch: {
-    filterText(val) {
-      this.$refs.tree.filter(val);
-    }
+    // filterText(val) {
+    //   this.$refs.tree.filter(val);
+    // }
   },
   mounted() {
     // this.getTableData()
@@ -388,14 +393,16 @@
         }
       }).then(res => {
         this.materialOptions = res.data;
+        this.filterText = row.did
       });
     },
     // 鐐瑰嚮琛ㄦ牸閫夋嫨瑙﹀彂
     clickTableSelect(scope) {
-      this.centerDialogVisible = true;
+      // this.centerDialogVisible = true;
+      scope.row.isSelectDevice = true
       this.clickSelectDevice.index = scope.$index;
       this.clickSelectDevice.rpId = scope.row.id;
-      this.options(scope.row)
+      this.getOptions(scope.row)
     },
     // 鐐瑰嚮鏍戦噷闈㈢殑纭畾
     clickNodeSure() {
@@ -427,23 +434,26 @@
     },
     changeState(row, index) {
       if (row.did != null && row.did != '') {
-        let val = row.empiricalValueAddss.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
-        }
+        // let val = row.empiricalValueAddss.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
+        // }
         let str = ""
         row.empiricalValueAddss.forEach(e => {
           str += e + ","
         })
+        if (str.slice(0, -1) === '' || str.slice(0, -1) === null || str.slice(0, -1) === undefined) {
+          return
+        }
         this.$axios.post(this.$api.url.inspectionItemlose_focus_update, {
           deviceId: row.did,
           inspectionItemId: row.id,
@@ -519,10 +529,10 @@
       this.optionTechnology = working.children
     },
     addTestProjevt() {
-      this.isAddProject = true
       let val = JSON.parse(JSON.stringify(this.processInspectVo))
       val.techname = this.processInspectVo.techname.split("-")[1]
       val.technologyId = this.processInspectVo.techname.split("-")[0]
+      this.processInspectVo.technologyId=val.technologyId
       this.$axios.post(this.$api.url.processInspectAddProcess, {
         material: val.material,
         materialCode: val.materialCode,
@@ -543,6 +553,7 @@
           });
           return
         }
+        this.isAddProject = true
         this.detailId = res.data
         this.inspectionResultForm[0].id = val.materialCode
         this.inspectionResultForm[0].name = val.material
@@ -572,6 +583,7 @@
               c.empiricalValueAddss.push("")
             }
             uName.push(c['username'])
+            c.isSelectDevice=false
             arr.push(c)
           })
         })
@@ -768,4 +780,5 @@
 .inspectionProject_span .el-button {
   float: right;
   font-size: 13px !important;
-}</style>
+}
+</style>

--
Gitblit v1.9.3