From 4652431ce329b4dec6c4dcc0758d5c4ff97e0666 Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期六, 11 十一月 2023 09:57:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 184 ++++++++++++++++++++++++++-------------------
1 files changed, 105 insertions(+), 79 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index a4519e1..7b80424 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -39,7 +39,7 @@
</el-col>
<el-col :span="6">
<el-form-item prop="formTime" label="鏉ユ枡鏃ユ湡">
- <el-date-picker
+ <el-date-picker
style="width:100%"
v-model="dataForm.formTime"
type="datetime"
@@ -98,7 +98,7 @@
</div>
-
+
<div class="rawMaterial-detail">
<el-row style="width:100%;z-index: 10;height:50px;">
<el-col :span="18">妫�楠岄」鐩�</el-col>
@@ -114,16 +114,16 @@
</el-row>
<el-row style="width:100%;">
<el-col :span="24">
- <el-table
- :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
+ <el-table
+ :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
:cell-style="{textAlign:'center'}"
ref="table"
- :data="list"
- border
+ :data="list"
+ border
style="width: 100%;"
height="400"
- row-key="iid"
- default-expand-all
+ row-key="iid"
+ default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column type="index" label="搴忓彿" width="60">
</el-table-column>
@@ -146,7 +146,7 @@
<el-input :disabled="dataForm.id != null" v-model="scope.row.unit" placeholder="璇疯緭鍏ュ崟浣�"></el-input>
</div>
</template>
-
+
</el-table-column>
<el-table-column prop="required" label="鏍囧噯鍊�" width="260">
<template slot-scope="scope">
@@ -174,9 +174,9 @@
<el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="260">
<template slot-scope="scope">
<div v-if="!scope.row.children">
- <el-select :disabled="dataForm!=null && resultVal!=null" style="width:100%"
+ <el-select :disabled="dataForm!=null && resultVal!=null" style="width:100%"
v-model="scope.row.deviceId" filterable @change="updateDevice(scope.row,scope.$index)">
- <el-option v-for="(item,index) in deviceList"
+ <el-option v-for="(item,index) in deviceList"
:key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
</el-select>
</div>
@@ -211,7 +211,7 @@
</el-col>
</el-row>
</div>
-
+
<div class="rawMaterial-result">
<el-row>
@@ -220,7 +220,7 @@
<el-row style="width:100%">
<el-col :span="24">
<el-table border height="90" :data="conclusionTable" ref="conclusion" v-model="conclusion"
- :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
+ :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
:cell-style="{textAlign:'center'}">
<el-table-column prop="code" label="鐗╂枡缂栧彿"></el-table-column>
<el-table-column prop="name" label="鐗╂枡鍚嶇О"></el-table-column>
@@ -261,7 +261,7 @@
</template>
<script>
-import {
+import {
selectDevice,
addRawInspects,
getObj,
@@ -358,7 +358,6 @@
},
// 纭鍥炶皟
selectPart(param, nodePart, index) {
- console.log(param)
if (typeof param !== 'undefined') {
this.dataForm.code = param.code
this.dataForm.name = param.name
@@ -383,22 +382,39 @@
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 = []
-
- })
- }).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)
+ // })
+ // }
+ // },
checkTestState(){
let resultVal = '1'
this.list.forEach(item=>{
@@ -488,10 +504,10 @@
name: null,
unit: null,
userName: null,
- testValue: null,
+ testValue: '',
testValueList: [],
- note: null,
- testState: null
+ note: '',
+ testState: ''
})
this.list.push(ele)
}
@@ -508,15 +524,11 @@
}
},
-
-
-
-
-
-
updateTestValue(row,index){
console.log(row);
if(row.rpId == null){
+
+
return
}
let val = row.testValueList.join(",");
@@ -537,42 +549,6 @@
this.$message.error(error)
})
},
- 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()
- })
- }
- },
init(){
@@ -605,11 +581,11 @@
userNameList.push(obj.userName)
}
let arr= []
-
+
if(obj.testValue){
arr = obj.testValue.split(",")
}
-
+
let o = {
deviceId: obj.deviceId,
deviceName: obj.deviceName,
@@ -628,7 +604,7 @@
})
this.list.push(ele)
}
- })
+ })
this.conclusionTable = [{
code: data.code,
name: data.name,
@@ -642,7 +618,43 @@
this.conclusionTable = []
}
},
-
+ 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()
+ })
+ }
+ },
+
// 鍒犻櫎瀛愰」鐩�
@@ -682,7 +694,21 @@
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
+ })
+ })
data.rawInsProducts = this.list
addRawInspects(data).then(res=>{
this.$message.success("淇濆瓨鎴愬姛")
--
Gitblit v1.9.3