From 52594553248e87dd391c9d061256b7076b73d67c Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期五, 19 一月 2024 14:32:59 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 2f1fe2b..53a8f6a 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -497,7 +497,7 @@
let val = sessionStorage.getItem("raw-resultVal-"+this.dataForm.id)
val == undefined ? null : this.resultVal=val
}
- this.init()
+ this.init(this.dataForm.id)
this.getDeviceList()
},
watch:{
@@ -770,7 +770,7 @@
}
updateRawInsProduct(obj).then(res=>{
if(res.data.code === 0){
- this.init()
+ this.init(this.dataForm.id)
}
})
}
@@ -794,9 +794,9 @@
}
}
},
- init(){
- if(this.dataForm.id){
- getObj(this.dataForm.id).then(res=>{
+ init(id){
+ if(id){
+ getObj(id).then(res=>{
let data = res.data.data
this.dataForm.rawInsNo = data.rawInsNo
this.dataForm.name = data.name
@@ -883,12 +883,10 @@
}
},
selectBlur(e){
- console.log(e,"-----");
+ console.log(e,e.target.tabIndex);
console.log(e.target.value);
},
changeState(row, index) {
- console.log(row.testValueList);
- return
this.$nextTick(()=>{
if(row){
let isTrue = true
@@ -910,23 +908,19 @@
if (val === undefined || val === '' || val === null) {
return
}
- console.log(val);
- console.log(...row.testValueList);
let obj = {
deviceId: row.deviceId,
rpId: row.rpId,
testValue: val,
note: row.note
}
- console.log(obj);
- return
updateRawInsProduct(obj).then(res => {
if (res.data.code == 0) {
this.$message.success("鏇存柊鎴愬姛")
} else {
this.$message.error("鏇存柊澶辫触")
}
- this.init()
+ this.init(this.dataForm.id)
})
}
})
@@ -945,7 +939,11 @@
let childrenIndex = this.list[i].children.findIndex(el =>{
return el.iid == row.iid
})
- this.list[i].children.splice(childrenIndex,1)
+ if(this.list[i].children.length<2){
+ this.list.splice(i,1)
+ }else{
+ this.list[i].children.splice(childrenIndex,1)
+ }
}
},
//娣诲姞瀛愰」鐩�
@@ -967,6 +965,7 @@
row.children.push(obj)
},
save(){
+ const _than = this
let data = this.dataForm
this.list.forEach(item=>{
item.children.forEach(c=>{
@@ -976,10 +975,13 @@
data.rawInsProducts = this.list
addRawInspects(data).then(res=>{
this.$message.success("淇濆瓨鎴愬姛")
- this.$router.go(-1)
+ // this.$router.go(-1)
}).catch(error=>{
this.$message.error(error)
})
+ _than.$nextTick(()=>{
+ _than.init(Number(res.data.msg))
+ })
},
getDeviceList(){
selectDevice().then(res=>{
--
Gitblit v1.9.3