From 4660b68d3c3cd49c5dec355067cdf45b0abdd2e9 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 12 四月 2024 13:30:48 +0800
Subject: [PATCH] 修改工艺路线
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 79 +++++++++++++++++++++------------------
1 files changed, 43 insertions(+), 36 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index b5f81c2..1901015 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -129,6 +129,9 @@
<el-row style="width:100%;z-index: 10;height:50px;" v-if="resultVal==null">
<el-col :span="12"></el-col>
<el-col :span="12" style="text-align: right;">
+ <el-button v-if="dataForm.id&&resultVal==null" size="small"
+ type="primary"
+ @click="saveTable()">淇濆瓨</el-button>
<el-button v-if="dataForm.id==null" size="small" @click="clickAddLine()">娣诲姞妫�楠岄」鐩�</el-button>
<el-button class="pad-addcol-btn" v-if="resultVal==null || dataForm.id==null" size="small" @click="addTeatValueColumn()">娣诲姞妫�娴嬪�煎垪</el-button>
<el-button v-if="resultVal==null || dataForm.id==null" size="small" @click="delTeatValueColumn()">鍒犻櫎妫�娴嬪�煎垪</el-button>
@@ -154,13 +157,13 @@
</el-table-column>
<el-table-column prop="father" label="妫�楠岄」鐩�" width="160">
<template slot-scope="scope">
- <el-input v-if="scope.row.children" style="width:80%" :disabled="dataForm.id!=null" v-model="scope.row.father" placeholder="璇疯緭鍏ユ楠岄」鐩�"></el-input>
+ <el-input v-if="scope.row.children" style="width:80%" :disabled="dataForm.id!=null&&(resultVal!=null && resultVal!='')" v-model="scope.row.father" placeholder="璇疯緭鍏ユ楠岄」鐩�"></el-input>
</template>
</el-table-column>
<el-table-column prop="name" label="椤圭洰" width="160">
<template slot-scope="scope">
<div v-if="!scope.row.children">
- <el-input class="inline-input" :disabled="dataForm.id!=null" v-model="scope.row.name"
+ <el-input class="inline-input" :disabled="dataForm.id!=null&&(resultVal!=null && resultVal!='')" v-model="scope.row.name"
placeholder="璇疯緭鍏ラ」鐩悕绉�"></el-input>
</div>
</template>
@@ -168,7 +171,7 @@
<el-table-column prop="unit" label="鍗曚綅" width="160">
<template slot-scope="scope">
<div v-if="!scope.row.children">
- <el-input :disabled="dataForm.id != null" v-model="scope.row.unit" placeholder="璇疯緭鍏ュ崟浣�"></el-input>
+ <el-input :disabled="dataForm.id!=null&&(resultVal!=null && resultVal!='')" v-model="scope.row.unit" placeholder="璇疯緭鍏ュ崟浣�"></el-input>
</div>
</template>
@@ -176,7 +179,7 @@
<el-table-column prop="required" label="鏍囧噯鍊�" width="160">
<template slot-scope="scope">
<div v-if="!scope.row.children">
- <el-input :disabled="dataForm.id != null" v-model="scope.row.required"
+ <el-input :disabled="dataForm.id!=null&&(resultVal!=null && resultVal!='')" v-model="scope.row.required"
placeholder="璇疯緭鍏ユ爣鍑嗗��"></el-input>
</div>
</template>
@@ -407,6 +410,7 @@
getObj,
updateRawInsProduct,
updateRawInspectsById,
+ updateRawInsProduct2,
updateDeviceById, chooseIFS} from '@/api/quality/rawMaterial'
import {
getProcessConfigFiles,
@@ -773,21 +777,22 @@
if(i.testValueList.length>1){
let arr = i.testValue.split(",")
arr.splice((arr.length-1),1)
- let obj = {
- deviceId: i.deviceId,
- rpId: i.rpId,
- testValue: arr.join(","),
- note: i.note
- }
- updateRawInsProduct(obj).then(res=>{
- if(res.data.code === 0){
- this.init(this.dataForm.id)
- }
- })
+ // let obj = {
+ // deviceId: i.deviceId,
+ // rpId: i.rpId,
+ // testValue: arr.join(","),
+ // note: i.note
+ // }
+ // updateRawInsProduct(obj).then(res=>{
+ // if(res.data.code === 0){
+ // this.init(this.dataForm.id)
+ // }
+ // })
}
})
}
})
+ this.saveTable()
}
},
delTeatValueColumn(){
@@ -926,30 +931,32 @@
if(!isTrue){
return
}
- this.changeState(row)
+ // this.changeState(row)
}
},
- changeState(row) {
+ saveTable() {
+ let rawInsProducts = [];
this.$nextTick(()=>{
- if (row.rpId != null && row.rpId != '') {
- let val = row.testValueList.join(",")
- if (val === undefined || val === '' || val === null) {
- return
+ this.list.forEach(item=>{
+ if(item.children){
+ item.children.forEach(ele=>{
+ let obj = JSON.parse(JSON.stringify(ele))
+ obj.testValue = obj.testValueList.join(",")
+ obj.id = obj.rpId
+ delete obj.testValueList;
+ rawInsProducts.push(obj)
+ })
}
- let obj = {
- deviceId: row.deviceId,
- rpId: row.rpId,
- testValue: val,
- note: row.note
- }
- updateRawInsProduct(obj).then(res => {
- if (res.data.code == 0) {
- this.$message.success("鏇存柊鎴愬姛")
- } else {
- this.$message.error("鏇存柊澶辫触")
- }
- this.init(this.dataForm.id)
- })
+ })
+ if(rawInsProducts.length>0){
+ updateRawInsProduct2(rawInsProducts).then(res => {
+ if (res.data.code == 0) {
+ this.$message.success("鏇存柊鎴愬姛")
+ } else {
+ this.$message.error("鏇存柊澶辫触")
+ }
+ this.init(this.dataForm.id)
+ })
}
})
},
@@ -1006,7 +1013,7 @@
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)
})
--
Gitblit v1.9.3