From 5d681a5c48d6b09b7bc053795760fa8030f5f1cf Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 15 九月 2023 14:24:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/finishedProductInspectionUp.vue | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/src/components/view/finishedProductInspectionUp.vue b/src/components/view/finishedProductInspectionUp.vue
index 63cdb1d..de810a2 100644
--- a/src/components/view/finishedProductInspectionUp.vue
+++ b/src/components/view/finishedProductInspectionUp.vue
@@ -121,9 +121,13 @@
</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="缁撹">
@@ -295,6 +299,10 @@
// this.getOptions();
},
methods: {
+ // blurNode(row){
+ // console.log(11);
+ // row.isSelectDevice=false
+ // },
escalation() {
let arr = this.inspectionItems
let bl = false
@@ -388,17 +396,19 @@
}
}).then(res => {
this.materialOptions = res.data;
+ this.filterText = row.did
});
},
// 鐐瑰嚮琛ㄦ牸閫夋嫨瑙﹀彂
clickTableSelect(scope) {
- this.centerDialogVisible = true;
+ scope.row.isSelectDevice = true
+ // this.centerDialogVisible = true;
this.clickSelectDevice.index = scope.$index;
this.clickSelectDevice.rpId = scope.row.id;
this.getOptions(scope.row);
},
// 鐐瑰嚮鏍戦噷闈㈢殑纭畾
- clickNodeSure() {
+ clickNodeSure(row) {
let select = this.materialOptions.filter(item => {
return item.id === this.filterText
})[0]
@@ -422,28 +432,32 @@
.then(res => {
this.getTableData()
this.centerDialogVisible = false;
+ row.isSelectDevice=false
});
}
},
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,
@@ -566,6 +580,7 @@
c.empiricalValueAddss.push("")
}
uName.push(c['username'])
+ c.isSelectDevice = false
arr.push(c)
})
})
--
Gitblit v1.9.3