From 01d8a6ab2837c934969b5cacb915207116268447 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 02 十一月 2023 12:52:55 +0800
Subject: [PATCH] modified: src/views/quality/finishedProductInspection/finishedProduct-form.vue modified: src/views/quality/processInspect/processInspect-form.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 7a2d085..bed230b 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -177,8 +177,8 @@
<el-table-column prop="userName" label="妫�楠屽憳"></el-table-column>
<el-table-column prop="judgeState" label="妫�楠岀粨璁�">
<template slot-scope="scope">
- <el-tag type="success" v-if="scope.row.judgeState == 1">鍚堟牸</el-tag>
- <el-tag type="danger" v-else-if="scope.row.judgeState == 0">涓嶅悎鏍�</el-tag>
+ <el-tag type="success" v-if="scope.row.testState == '1'">鍚堟牸</el-tag>
+ <el-tag type="danger" v-else-if="scope.row.testState == '0'">涓嶅悎鏍�</el-tag>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔">
@@ -339,6 +339,19 @@
})
}
},
+ checkTestState(){
+ let resultVal = '1'
+ this.list.forEach(item=>{
+ if(item.children){
+ if(obj.testState == 0){
+ resultVal = '0'
+ }
+ }
+ })
+ this.resultVal = resultVal
+ this.conclusionTable[0].testState = resultVal
+ sessionStorage.setItem("raw-resultVal-"+this.dataForm.id,resultVal)
+ },
showDialog(){
let pro = this.list.filter(item => {
return item.testState == 0;
@@ -363,7 +376,7 @@
this.dialogVisible = false
}
});
- this.init()
+ this.checkTestState()
},
addTeatValueColumn(){
this.empiricalValueAdd = this.empiricalValueAdd + 1;
@@ -396,7 +409,6 @@
}
},
updateTestValue(row,index){
- console.log(row,index)
if(row.rpId == null || row.testValueList[index]==null){
return
}
@@ -457,7 +469,7 @@
code: data.code,
name: data.name,
userName: Array.from(new Set(userNameList)).join(','),
- judgeState: this.resultVal==null?null:this.resultVal
+ testState: this.resultVal==null?null:this.resultVal
}]
}).catch(error=>{
this.$message.error("鑾峰彇澶辫触",error)
--
Gitblit v1.9.3