From 0a3b4bac16a4cf49deaddc6b4f3a2aeee90e9061 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 21 五月 2024 16:33:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index d7354ef..02d1bf4 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -28,16 +28,16 @@
</el-col>
<el-col :span="6">
<el-form-item label="闆朵欢鍙�" prop="code">
- <el-input v-model="dataForm.code">
+ <el-input v-model="dataForm.code" :disabled="dataForm&&dataForm.id!==null&&dataForm.id!==''">
<el-button
slot="append"
icon="el-icon-search"
- :disabled="(resultVal!=null && resultVal!='')"
+ :disabled="dataForm&&dataForm.id!==null&&dataForm.id!==''"
@click="queryCode"></el-button>
<el-button
slot="append"
icon="el-icon-full-screen"
- :disabled="(resultVal!=null && resultVal!='')"
+ :disabled="dataForm&&dataForm.id!==null&&dataForm.id!==''"
@click="Turnonthecamera"></el-button>
</el-input>
</el-form-item>
@@ -86,7 +86,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="鏁伴噺" prop="number">
- <el-input v-model="dataForm.number" :disabled="(resultVal!=null && resultVal!='')" />
+ <el-input v-model="dataForm.number" :disabled="dataForm&&dataForm.id!==null&&dataForm.id!==''" />
</el-form-item>
</el-col>
</el-row>
@@ -117,7 +117,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="dataForm.remark" />
+ <el-input :disabled="dataForm&&dataForm.id!==null&&dataForm.id!==''" v-model="dataForm.remark" />
</el-form-item>
</el-col>
</el-row>
@@ -773,10 +773,12 @@
if(this.list){
this.list.forEach(e=>{
if(e.children){
- e.children.forEach(i=>{
+ e.children.map(i=>{
if(i.testValueList.length>1){
- let arr = i.testValue.split(",")
- arr.splice((arr.length-1),1)
+ i.testValueList = i.testValueList.splice(i.testValueList.length-1,1)
+ return i
+ // let arr = i.testValue.split(",")
+ // arr.splice((arr.length-1),1)
// let obj = {
// deviceId: i.deviceId,
// rpId: i.rpId,
@@ -799,7 +801,7 @@
if (this.empiricalValueAdd - 1 > 0) {
if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
this.empiricalValueAdd = this.empiricalValueAdd - 1;
- this.changeRowResult()
+ // this.changeRowResult()
this.list.forEach(i => {
if(i.children){
i.children.forEach(ele=>{
@@ -807,6 +809,7 @@
})
}
});
+ this.saveTable()
}
}
},
@@ -940,16 +943,18 @@
this.list.forEach(item=>{
if(item.children){
item.children.forEach(ele=>{
- console.log(ele);
let obj = JSON.parse(JSON.stringify(ele))
obj.testValue = obj.testValueList.join(",")
obj.id = obj.rpId
delete obj.testValueList;
+ obj.name = ele.name;
+ obj.father = item.father;
+ obj.unit = ele.unit;
rawInsProducts.push(obj)
})
}
})
- if(this.rawInsProducts.length>0){
+ if(rawInsProducts.length>0){
updateRawInsProduct2(rawInsProducts).then(res => {
if (res.data.code == 0) {
this.$message.success("鏇存柊鎴愬姛")
--
Gitblit v1.9.3