From 53a636b260e4a879d51e526cd8e98a72e8b1b6a5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 04 十二月 2023 17:14:48 +0800
Subject: [PATCH] 修复工序
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index a432a06..62a368f 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -21,6 +21,12 @@
label-width="110px">
<el-row>
<el-col :span="6">
+ <el-form-item label="鍘熸潗鏂欐楠岀紪鍙�" prop="rawInsNo">
+ <el-input v-model="dataForm.rawInsNo" disabled>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item label="闆朵欢鍙�" prop="code">
<el-input v-model="dataForm.code" :disabled="resultVal!=null && dataForm.id!=null">
<el-button
@@ -49,13 +55,13 @@
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="6">
+ </el-row>
+ <el-row>
+ <el-col :span="6">
<el-form-item label="瑙勬牸鍨嬪彿" prop="specs">
<el-input v-model="dataForm.specs" disabled></el-input>
</el-form-item>
- </el-col>
- </el-row>
- <el-row>
+ </el-col>
<el-col :span="6">
<el-form-item prop="unit" label="鍗曚綅">
<el-input
@@ -74,15 +80,15 @@
<el-input v-model="dataForm.number" :disabled="resultVal!=null" />
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="6">
- <el-form-item prop="projectName" label="椤圭洰鍚嶇О">
+ <el-form-item prop="projectName" label="椤圭洰鍚嶇О" v-if="dataForm.id!=null">
<el-tooltip :disabled="dataForm.projectName==null" :content="dataForm.projectName">
<el-input v-model="dataForm.projectName" disabled ></el-input>
</el-tooltip>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="6">
<el-form-item label="鎶ユ鏃ユ湡" prop="createTime" v-if="dataForm.id!=null">
<el-input v-model="dataForm.createTime" disabled />
@@ -349,6 +355,7 @@
// 纭鍥炶皟
selectPart(param, nodePart, index) {
if (typeof param !== 'undefined') {
+ this.dataForm.rawInsNo = param.rawInsNo
this.dataForm.code = param.code
this.dataForm.name = param.name
this.dataForm.formTime = param.formTime
@@ -385,9 +392,11 @@
let resultVal = '1'
this.list.forEach(item=>{
if(item.children){
- if(obj.testState == 0){
- resultVal = '0'
- }
+ item.children.forEach(ele=>{
+ if(ele.testState == 0){
+ resultVal = '0'
+ }
+ })
}
})
this.resultVal = resultVal
@@ -417,13 +426,15 @@
number: this.unqualifiedNum,
}
updateRawInspectsById(data).then(res => {
- if(res.data.code == 0){
+ if(res.data.code == 0 && (res.data.data=='1'|| res.data.data=='0')){
sessionStorage.setItem("raw-resultVal-"+this.dataForm.id,res.data.data)
this.$message.success("涓婃姤鎴愬姛");
- this.dialogVisible = false
+ }else{
+ this.$message.error("涓婃姤澶辫触锛�",res.data.data);
}
+ this.dialogVisible = false
+ this.checkTestState()
});
- this.checkTestState()
},
addTeatValueColumn(){
this.empiricalValueAdd = this.empiricalValueAdd + 1;
@@ -490,7 +501,6 @@
}
},
updateTestValue(row,index){
- console.log(row);
if(row.rpId == null){
return
}
@@ -516,6 +526,7 @@
if(this.dataForm.id){
getObj(this.dataForm.id).then(res=>{
let data = res.data.data
+ this.dataForm.rawInsNo = data.rawInsNo
this.dataForm.name = data.name
this.dataForm.formTime = data.formTime
this.dataForm.code = data.code
@@ -582,7 +593,6 @@
}
},
changeState(row, index) {
- console.log(row)
if (row.rpId != null && row.rpId != '') {
let val = row.testValueList.join(",")
if (val === undefined || val === '' || val === null) {
--
Gitblit v1.9.3