From 87c12ba5f907d6c12d9b0b7448ff8cf01c958bc7 Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期四, 09 十一月 2023 20:08:19 +0800
Subject: [PATCH] 11
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 83 +++++++++++++++++++++++++++++++----------
1 files changed, 63 insertions(+), 20 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 3833aae..a4519e1 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -7,7 +7,7 @@
<h2 v-else>缂栬緫-鍘熸潗鏂欐楠�</h2>
</div>
<div class="btn-group header-right">
- <el-button type="primary" @click="save()" v-if="this.dataForm.id==null">淇濆瓨</el-button>
+ <el-button @click="save()" v-if="this.dataForm.id==null">淇濆瓨</el-button>
</div>
</div>
<div class="page-main">
@@ -160,7 +160,7 @@
<template slot-scope="scope">
<div v-if="!scope.row.children">
<el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
- <el-select style="width:100%" allow-create filterable default-first-option
+ <el-select @blur="changeState(scope.row, index)" style="width:100%" allow-create filterable default-first-option
:disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)"
v-model="scope.row.testValueList[index]"
placeholder="璇疯緭鍏ユ垨閫夋嫨妫�娴嬪��" @change="updateTestValue(scope.row,scope.$index)">
@@ -185,7 +185,7 @@
<el-table-column prop="note" label="妫�楠屾弿杩�" width="260" >
<template slot-scope="scope">
<div v-if="!scope.row.children">
- <el-input :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.note" placeholder="妫�楠屾弿杩�"></el-input>
+ <el-input @blur="changeState(scope.row, note)" :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.note" placeholder="妫�楠屾弿杩�"></el-input>
</div>
</template>
</el-table-column>
@@ -358,6 +358,7 @@
},
// 纭鍥炶皟
selectPart(param, nodePart, index) {
+ console.log(param)
if (typeof param !== 'undefined') {
this.dataForm.code = param.code
this.dataForm.name = param.name
@@ -381,12 +382,18 @@
}
this.showPart = true
},
+
+
+
updateDevice(row,index){
if(this.dataForm.id != null){
updateDeviceById({deviceId:row.deviceId,rpId:row.rpId}).then(res=>{
- this.list[index].testValue = ''
- this.list[index].testState = null
- this.list[index].testValueList = []
+ this.inspectionItems.forEach(obj => {
+ this.list[index-1].testValue = ''
+ this.list[index-1].testState = null
+ this.list[index-1].testValueList = []
+
+ })
}).catch(error=>{
console.log(error)
})
@@ -500,6 +507,13 @@
}
}
},
+
+
+
+
+
+
+
updateTestValue(row,index){
console.log(row);
if(row.rpId == null){
@@ -523,6 +537,44 @@
this.$message.error(error)
})
},
+ changeState(row, index) {
+ console.log(row)
+ if (row.rpId != null && row.rpId != '') {
+ let val = ""
+ row.testValueList.forEach(e => {
+ val += e + ","
+ })
+
+ // if (note === undefined || note === '' || note === null) {
+ // return
+ // }
+ console.log(val)
+ val = val.slice(0, -1);
+ if (val === undefined || val === '' || val === null) {
+ return
+ }
+
+
+ let obj = {
+ deviceId: row.deviceId,
+ rpId: row.rpId,
+ testValue: val,
+ note: row.note
+
+ }
+ console.log(obj)
+ updateRawInsProduct(obj).then(res => {
+ if (res.data.code == 0) {
+ this.$message.success("鏇存柊鎴愬姛")
+ } else {
+ this.$message.error("鏇存柊澶辫触")
+ }
+ this.init()
+ })
+ }
+ },
+
+
init(){
if(this.dataForm.id){
getObj(this.dataForm.id).then(res=>{
@@ -553,9 +605,11 @@
userNameList.push(obj.userName)
}
let arr= []
+
if(obj.testValue){
arr = obj.testValue.split(",")
}
+
let o = {
deviceId: obj.deviceId,
deviceName: obj.deviceName,
@@ -588,6 +642,9 @@
this.conclusionTable = []
}
},
+
+
+
// 鍒犻櫎瀛愰」鐩�
delChildren(row,index,isParent) {
if(isParent){
@@ -625,21 +682,7 @@
row.children.push(obj)
},
save(){
-
let data = this.dataForm
- console.log('--------',data);
- console.log("-----",this.list);
- this.list.forEach(item=>{
- item.children.forEach(c=>{
- let arr=c.testValueList
- let val=''
- arr.forEach(a=>{
- val+=a+","
- })
- let end=val.substring(0,val.length-1)
- c.testValue=end
- })
- })
data.rawInsProducts = this.list
addRawInspects(data).then(res=>{
this.$message.success("淇濆瓨鎴愬姛")
--
Gitblit v1.9.3