From 225ff308a9a06cca35573940c051252835e1276f Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期五, 15 九月 2023 15:18:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/finishedProductInspectionAdd.vue | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/src/components/view/finishedProductInspectionAdd.vue b/src/components/view/finishedProductInspectionAdd.vue
index d043147..7c2948c 100644
--- a/src/components/view/finishedProductInspectionAdd.vue
+++ b/src/components/view/finishedProductInspectionAdd.vue
@@ -120,9 +120,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 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="缁撹">
@@ -200,7 +204,8 @@
qualityTraceability: null,
quantity: null,
specificationsModel: null,
- unit: null
+ unit: null,
+ technologyId: null
},
InspectioniD: null,
addInspectionform: [
@@ -312,17 +317,18 @@
}
}).then(res => {
this.materialOptions = res.data;
+ this.filterText = row.did
});
},
// 鐐瑰嚮琛ㄦ牸閫夋嫨瑙﹀彂
clickTableSelect(scope) {
- this.centerDialogVisible = true;
+ scope.row.isSelectDevice = 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]
@@ -346,28 +352,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,
@@ -489,6 +499,7 @@
c.empiricalValueAddss.push("")
}
uName.push(c['username'])
+ c.isSelectDevice = false
arr.push(c)
})
})
--
Gitblit v1.9.3