From 1017428aa86212e6497cee6e889c4c5f90f4e4c9 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 22 十一月 2023 14:10:11 +0800
Subject: [PATCH] modified: src/views/quality/rawMaterial/index.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue modified: src/views/quality/teststandard/standard-form.vue
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 141 +++++++++++++----------------------------------
src/views/quality/teststandard/standard-form.vue | 29 +++++----
src/views/quality/rawMaterial/index.vue | 1
3 files changed, 56 insertions(+), 115 deletions(-)
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index b5ba1b6..4d12e6c 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -331,7 +331,6 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
- console.log(row);
this.$router.push({
name: 'rawMaterialForm',
query: {
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 30ddf45..a432a06 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)">
@@ -185,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>
@@ -328,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){
@@ -346,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') {
@@ -380,38 +372,15 @@
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=>{
@@ -489,8 +458,8 @@
if (arr.length > this.empiricalValueAdd) {
this.empiricalValueAdd = arr.length
}
+ })
this.list.push(ele)
- })
}else{
ele.children.push({
deviceId: null,
@@ -503,7 +472,7 @@
userName: null,
testValue: '',
testValueList: [],
- note: '',
+ note: null,
testState: ''
})
this.list.push(ele)
@@ -511,7 +480,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 => {
@@ -520,12 +489,9 @@
}
}
},
-
updateTestValue(row,index){
console.log(row);
if(row.rpId == null){
-
-
return
}
let val = row.testValueList.join(",");
@@ -546,8 +512,6 @@
this.$message.error(error)
})
},
-
-
init(){
if(this.dataForm.id){
getObj(this.dataForm.id).then(res=>{
@@ -579,13 +543,12 @@
if(obj.userName){
userNameList.push(obj.userName)
}
-
if(obj.testValue){
arr = obj.testValue.split(",")
}
if (arr.length > this.empiricalValueAdd) {
- this.empiricalValueAdd = arr.length
- }
+ this.empiricalValueAdd = arr.length
+ }
let o = {
deviceId: obj.deviceId,
deviceName: obj.deviceName,
@@ -619,44 +582,28 @@
}
},
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()
- })
+ console.log(row)
+ 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){
@@ -676,7 +623,6 @@
},
//娣诲姞瀛愰」鐩�
addChildren(row){
- console.log(row);
let obj = {
deviceId: null,
deviceName: null,
@@ -694,19 +640,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
diff --git a/src/views/quality/teststandard/standard-form.vue b/src/views/quality/teststandard/standard-form.vue
index 6e9dfa2..3b0cbde 100644
--- a/src/views/quality/teststandard/standard-form.vue
+++ b/src/views/quality/teststandard/standard-form.vue
@@ -155,6 +155,23 @@
ZttMonacoEditor,
operationDialog
},
+ watch:{
+ visible(newVal){
+ if(!newVal){
+ this.dataForm = {
+ id: 0,
+ standardName: '',
+ standardNo: '',
+ remark: '',
+ judgeFormula: '',
+ inspectionType: null,
+ operationId: null,
+ operationNo: null,
+ operationName: null,
+ }
+ }
+ }
+ },
created() {
this.funcs = funcForStandard()
this.constants = constantForStandard()
@@ -194,20 +211,8 @@
this.visible = true
this.$nextTick(() => {
this.$refs.dataForm.resetFields()
- this.dataForm = {
- id: 0,
- standardName: '',
- standardNo: '',
- remark: '',
- judgeFormula: '',
- inspectionType: null,
- operationId: null,
- operationNo: null,
- operationName: null,
- }
if (this.dataForm.id) {
getTestStandard(this.dataForm.id).then((response) => {
- console.log(response.data.data)
this.dataForm = response.data.data
// this.$refs.templateJudgmentCondition.setVal(
// this.dataForm.judgeFormula == null
--
Gitblit v1.9.3