From ef0c3a4140ba4af8b629838c7a34884e39a64126 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 24 十一月 2023 13:03:53 +0800
Subject: [PATCH] modified: .gitignore modified: src/views/quality/rawMaterial/index.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue modified: src/views/quality/rawMaterial/rawMaterial-print.vue modified: vue.config.js
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 169 +++++++++++++++++---------------------------------------
1 files changed, 52 insertions(+), 117 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 296b671..3523721 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -160,7 +160,7 @@
<template slot-scope="scope">
<div v-if="!scope.row.children">
<el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
- <el-select @blur="changeState(scope.row, index)" style="width:100%" allow-create filterable default-first-option
+ <el-select @blur="changeState(scope.row, index)" style="width:100%" allow-create filterable default-first-option
:disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)"
v-model="scope.row.testValueList[index]"
placeholder="璇疯緭鍏ユ垨閫夋嫨妫�娴嬪��" @change="updateTestValue(scope.row,scope.$index)">
@@ -171,10 +171,6 @@
</div>
</template>
</el-table-column>
-
-
-
-
<el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="260">
<template slot-scope="scope">
<div v-if="!scope.row.children">
@@ -189,7 +185,7 @@
<el-table-column prop="note" label="妫�楠屾弿杩�" width="260" >
<template slot-scope="scope">
<div v-if="!scope.row.children">
- <el-input @blur="changeState(scope.row, note)" :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.note" placeholder="妫�楠屾弿杩�"></el-input>
+ <el-input @blur="changeState(scope.row, scope.$index)" :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.note" placeholder="妫�楠屾弿杩�"></el-input>
</div>
</template>
</el-table-column>
@@ -215,8 +211,6 @@
</el-col>
</el-row>
</div>
-
-
<div class="rawMaterial-result">
<el-row>
<el-col :span="24">妫�楠岀粨璁�</el-col>
@@ -334,7 +328,7 @@
this.$refs.table.doLayout();
})
},
- mounted(){
+ created(){
this.dataForm.id = this.$route.query.id
this.resultVal = this.$route.query.resultVal
if(this.resultVal == null){
@@ -352,14 +346,6 @@
},
},
methods:{
- changeName(index,row){
- this.projectList.forEach(item=>{
- if(row.name == item.name){
- this.list[index].unit = item.unit
- this.list[index].required = item.required
- }
- })
- },
// 纭鍥炶皟
selectPart(param, nodePart, index) {
if (typeof param !== 'undefined') {
@@ -385,47 +371,25 @@
}
this.showPart = true
},
-
updateDevice(row, index) {
- let rowId=JSON.stringify(row.rpId)
- updateDeviceById({ deviceId: row.deviceId, rpId: row.rpId }).then(res => {
- this.list.forEach(obj => {
- obj.children.forEach(c=>{
- if(c.rpId==rowId){
- c.testValue = ''
- c.testState = null
- c.testValueList = []
- c.note=''
- }
- })
- })
- }).catch(error => {
- console.log(error)
- })
- },
-
- // updateDevice(row,index){
- // if(this.dataForm.id != null){
- // updateDeviceById({deviceId:row.deviceId,rpId:row.rpId}).then(res=>{
- // this.inspectionItems.forEach(obj => {
- // this.list[index-1].testValue = ''
- // this.list[index-1].testState = null
- // this.list[index-1].testValueList = []
- // this.list[index-1].note = ''
-
- // })
- // }).catch(error=>{
- // console.log(error)
- // })
- // }
- // },
+ updateDeviceById({ deviceId: row.deviceId, rpId: row.rpId }).then(res => {
+ row.testValue = null
+ row.testState = null
+ row.testValueList = []
+ row.note = null
+ }).catch(error => {
+ console.log(error)
+ })
+ },
checkTestState(){
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
@@ -455,13 +419,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;
@@ -496,8 +462,8 @@
if (arr.length > this.empiricalValueAdd) {
this.empiricalValueAdd = arr.length
}
+ })
this.list.push(ele)
- })
}else{
ele.children.push({
deviceId: null,
@@ -510,7 +476,7 @@
userName: null,
testValue: '',
testValueList: [],
- note: '',
+ note: null,
testState: ''
})
this.list.push(ele)
@@ -518,7 +484,7 @@
},
delTeatValueColumn(){
- if (this.empiricalValueAdd - 1 === 0) { } else {
+ if (this.empiricalValueAdd - 1 > 0) {
if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
this.empiricalValueAdd = this.empiricalValueAdd - 1;
this.list.forEach(i => {
@@ -527,12 +493,8 @@
}
}
},
-
updateTestValue(row,index){
- console.log(row);
if(row.rpId == null){
-
-
return
}
let val = row.testValueList.join(",");
@@ -553,8 +515,6 @@
this.$message.error(error)
})
},
-
-
init(){
if(this.dataForm.id){
getObj(this.dataForm.id).then(res=>{
@@ -580,16 +540,18 @@
}
ele.iid = Math.random()
ele.father = item.rpFather
+ if (item.children != undefined) {
item.children.forEach(obj => {
+ let arr= []
if(obj.userName){
userNameList.push(obj.userName)
}
- let arr= []
-
if(obj.testValue){
arr = obj.testValue.split(",")
}
-
+ if (arr.length > this.empiricalValueAdd) {
+ this.empiricalValueAdd = arr.length
+ }
let o = {
deviceId: obj.deviceId,
deviceName: obj.deviceName,
@@ -607,7 +569,7 @@
ele.children.push(o)
})
this.list.push(ele)
- }
+ }}
})
this.conclusionTable = [{
code: data.code,
@@ -623,44 +585,27 @@
}
},
changeState(row, index) {
- console.log(row)
- if (row.rpId != null && row.rpId != '') {
- let val = ""
- row.testValueList.forEach(e => {
- val += e + ","
- })
-
- // if (note === undefined || note === '' || note === null) {
- // return
- // }
- console.log(val)
- val = val.slice(0, -1);
- if (val === undefined || val === '' || val === null) {
- return
- }
-
-
- let obj = {
- deviceId: row.deviceId,
- rpId: row.rpId,
- testValue: val,
- note: row.note
-
- }
- console.log(obj)
- updateRawInsProduct(obj).then(res => {
- if (res.data.code == 0) {
- this.$message.success("鏇存柊鎴愬姛")
- } else {
- this.$message.error("鏇存柊澶辫触")
- }
- this.init()
- })
+ if (row.rpId != null && row.rpId != '') {
+ let val = row.testValueList.join(",")
+ if (val === undefined || val === '' || val === null) {
+ return
}
- },
-
-
-
+ 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()
+ })
+ }
+ },
// 鍒犻櫎瀛愰」鐩�
delChildren(row,index,isParent) {
if(isParent){
@@ -680,7 +625,6 @@
},
//娣诲姞瀛愰」鐩�
addChildren(row){
- console.log(row);
let obj = {
deviceId: null,
deviceName: null,
@@ -698,19 +642,10 @@
row.children.push(obj)
},
save(){
-
let data = this.dataForm
- console.log('--------',data);
- console.log("-----",this.list);
this.list.forEach(item=>{
item.children.forEach(c=>{
- let arr=c.testValueList
- let val=''
- arr.forEach(a=>{
- val+=a+","
- })
- let end=val.substring(0,val.length-1)
- c.testValue=end
+ c.testValue=c.testValueList.join(",")
})
})
data.rawInsProducts = this.list
--
Gitblit v1.9.3