From ffa1b835b4063e9492dec702620534f2fe51c9a8 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 09 十一月 2023 18:24:13 +0800
Subject: [PATCH] modified: src/views/quality/finishedProductInspection/finishedProduct-form.vue modified: src/views/quality/processInspect/processInspect-form.vue
---
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 6 +++---
src/views/quality/processInspect/processInspect-form.vue | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index b7c19e2..aa912dc 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -110,7 +110,7 @@
<el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
<el-select style="width: 100%;" @change="changeState(scope.row, scope.$index)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="璇烽�夋嫨">
- <el-option v-for="(item,i) in dataVal" :key="i" :label="item.label"
+ <el-option v-for="(item,i) in dataVal" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
@@ -128,12 +128,12 @@
<el-select style="width:100%" v-model="scope.row.eId"
v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row,scope.$index)">
<el-option v-for="(item,index) in deviceList"
- :key="index" :value="item.id" :label="item.number +'-'+ item.name"></el-option>
+ :key="item.id" :value="item.id" :label="item.number +'-'+ item.name"></el-option>
</el-select>
</div>
</template>
</el-table-column>
- <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index"
+ <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="item"
label="妫�楠屾弿杩�" width="240" style="text-align: center;">
<template slot-scope="scope">
<el-col v-if="scope.row.itype === '1'">
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 2f5837d..e10bafd 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -400,10 +400,11 @@
})
},
updateDevice(row, index) {
+ let father=row.father
updateDeviceBypppId({ deviceId: row.eId, ppid: row.iid }).then(res => {
this.inspectionItems.forEach(obj => {
console.log(obj);
- if (obj.children) {
+ if (obj.children&&obj.father==father) {
obj.children[index - 1].inspectionValue = null
obj.children[index - 1].iresult = null
obj.children[index - 1].empiricalValueAddss = []
--
Gitblit v1.9.3