From d9a840cdf9da27c95298b0f822748ae199a0cc51 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 11:48:20 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index b7c19e2..a09ed00 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -8,7 +8,7 @@
<h2 v-else>缂栬緫-浜у搧妫�楠屽崟</h2>
</div>
<div class="btn-group header-right">
- <el-button @click="addTestProject" type="primary" v-if="processInspectVo.id==null">鐢熸垚妫�楠岄」鐩�</el-button>
+ <el-button @click="addTestProject" v-if="processInspectVo.id==null">鐢熸垚妫�楠岄」鐩�</el-button>
</div>
</div>
<div class="page-main">
@@ -96,21 +96,22 @@
<el-table-column prop="required" label="鏍囧噯鍊�" width="240" ></el-table-column>
<el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="妫�娴嬪��"
width="240" style="text-align: center;">
+
<template slot-scope="scope">
<el-col v-if="scope.row.itype === '1'">
<el-tooltip v-if="scope.row.iname!=null" :disabled="scope.row.eId != null"
class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�"
placement="top-start">
<el-input :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]"
- @blur="changeState(scope.row, scope.$index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
+ @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
<span v-if="resultVal != null" v-text="scope.row.empiricalValueAddss[index]"></span>
</el-tooltip>
</el-col>
<el-col v-else>
<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-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
@@ -133,7 +134,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index"
+ <el-table-column prop="inspectionValue" :key="index"
label="妫�楠屾弿杩�" width="240" style="text-align: center;">
<template slot-scope="scope">
<el-col v-if="scope.row.itype === '1'">
@@ -142,7 +143,7 @@
<el-input :disabled="scope.row.eId == null"
v-model="scope.row.inote"
- @blur="changeState(scope.row, scope.$index)" placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
+ @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
<span v-if="resultVal != null && processInspectVo.id != null"
v-text="scope.row.inote"></span>
@@ -153,7 +154,7 @@
class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
<el-input :disabled="scope.row.eId == null"
v-model="scope.row.inote"
- @blur="changeState(scope.row, scope.$index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
+ @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
<!-- <el-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.inote" placeholder="璇烽�夋嫨">
<el-option v-for="item in dataVal" :key="item.value" :label="item.label"
:value="item.value">
@@ -275,6 +276,7 @@
this.init()
},
methods: {
+
submitSave(){
let pro = 0
this.inspectionItems.forEach(item => {
@@ -348,7 +350,7 @@
let userList = []
result.children.forEach(item=>{
item.iid = Math.random()
- if(item.children){
+ if(item.children != undefined){
item.children.forEach(obj=>{
let arr = []
if(obj.userName){
@@ -358,9 +360,9 @@
arr = obj.inspectionValue.split(",")
}
obj.empiricalValueAddss = arr
- // if(obj.note){
- // snote=obj.inote
- // }
+ if(obj.note){
+ snote=obj.inote
+ }
if(arr.length > this.empiricalValueAdd){
this.empiricalValueAdd = arr.length
}
@@ -388,15 +390,26 @@
})
},
updateDevice(row,index){
- updateDeviceById({equiomentId:row.eId,fpid:row.iid}).then(res=>{
+ let rowId=JSON.stringify(row.iid)
+ console.log(row);
+ updateDeviceById({deviceId:row.eId,fpid:row.iid}).then(res=>{
this.inspectionItems.forEach(obj=>{
- if(obj.children){
- obj.children[index-1].inspectionValue = ''
- obj.children[index-1].iresult = null
- obj.children[index-1].empiricalValueAddss = []
- obj.children[index-1].inote=''
+ obj.children.forEach(c=>{
+ if(c.iid==rowId){
+ c.inspectionValue = null
+ c.iresult = null
+ c.empiricalValueAddss = []
+ c.inote=''
+ }
+ })
- }
+ // if(obj.children){
+ // obj.children[index-1].inspectionValue = ''
+ // obj.children[index-1].iresult = null
+ // obj.children[index-1].empiricalValueAddss = []
+ // obj.children[index-1].inote=''
+
+ // }
})
}).catch(error=>{
console.log(error)
@@ -423,7 +436,7 @@
return
}
let obj = {
- equiomentId: row.eId,
+ deviceId: row.eId,
fpid: row.iid,
inspectionValue: str,
note : row.inote
--
Gitblit v1.9.3