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 | 451 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 344 insertions(+), 107 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 7a2d085..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"
@@ -75,12 +75,19 @@
</el-form-item>
</el-col>
<el-col :span="6">
+ <el-form-item prop="projectName" label="椤圭洰鍚嶇О">
+ <el-tooltip :disabled="dataForm.projectName==null" :content="dataForm.projectName">
+ <el-input v-model="dataForm.projectName" disabled ></el-input>
+ </el-tooltip>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
<el-form-item label="鎶ユ鏃ユ湡" prop="createTime" v-if="dataForm.id!=null">
<el-input v-model="dataForm.createTime" disabled />
</el-form-item>
- </el-col>
- </el-row>
- <el-row>
+ </el-col>
<el-col :span="6">
<el-form-item label="鎶ユ浜�" prop="createUser" v-if="dataForm.id!=null">
<el-input v-model="dataForm.createUser" disabled />
@@ -89,80 +96,123 @@
</el-row>
</el-form>
</div>
+
+
+
<div class="rawMaterial-detail">
<el-row style="width:100%;z-index: 10;height:50px;">
- <el-col :span="19">妫�楠岄」鐩�</el-col>
- <el-col :span="5">
- <div style="width:100%;text-align: right;">
- <el-button v-if="dataForm.id==null" size="small" @click="clickAddLine">娣诲姞妫�楠岃</el-button>
- <el-button 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>
- </div>
+ <el-col :span="18">妫�楠岄」鐩�</el-col>
+ <el-col :span="2">
+ <el-button style="width:90%" v-if="dataForm.id==null" size="small" @click="clickAddLine()">娣诲姞妫�楠岄」鐩�</el-button>
+ </el-col>
+ <el-col :span="2">
+ <el-button style="width:90%" v-if="resultVal==null || dataForm.id==null" size="small" @click="addTeatValueColumn()">娣诲姞妫�娴嬪�煎垪</el-button>
+ </el-col>
+ <el-col :span="2">
+ <el-button style="width:90%" v-if="resultVal==null || dataForm.id==null" size="small" @click="delTeatValueColumn()">鍒犻櫎妫�娴嬪�煎垪</el-button>
</el-col>
</el-row>
<el-row style="width:100%;">
<el-col :span="24">
- <el-table :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
- :cell-style="{textAlign:'center'}" ref="table"
- :data="list" border style="width: 100%;" height="400">
+ <el-table
+ :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
+ :cell-style="{textAlign:'center'}"
+ ref="table"
+ :data="list"
+ border
+ style="width: 100%;"
+ height="400"
+ row-key="iid"
+ default-expand-all
+ :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column type="index" label="搴忓彿" width="60">
+ </el-table-column>
+ <el-table-column prop="father" label="妫�楠岄」鐩�" width="260">
+ <template slot-scope="scope">
+ <el-input v-if="scope.row.children" style="width:90%" :disabled="dataForm.id!=null" v-model="scope.row.father" placeholder="璇疯緭鍏ユ楠岄」鐩�"></el-input>
+ </template>
</el-table-column>
<el-table-column prop="name" label="椤圭洰" width="260">
<template slot-scope="scope">
- <el-select v-if="projectList.length > 0" :disabled="dataForm.id != null" class="inline-input" v-model="scope.row.name"
- filterable allow-create placeholder="璇疯緭鍏ユ垨閫夋嫨椤圭洰鍚嶇О" style="width:100%" @change="changeName(scope.$index,scope.row)">
- <el-option v-for="(item,index) in projectList" :key="index" :label="item.name" :value="item.name"/>
- </el-select>
- <el-input v-else :disabled="dataForm.id != null" class="inline-input" v-model="scope.row.name"
+ <div v-if="!scope.row.children">
+ <el-input class="inline-input" :disabled="dataForm.id!=null" v-model="scope.row.name"
placeholder="璇疯緭鍏ラ」鐩悕绉�"></el-input>
- </template>
+ </div>
+ </template>
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅" width="260">
<template slot-scope="scope">
+ <div v-if="!scope.row.children">
<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">
+ <div v-if="!scope.row.children">
<el-input :disabled="dataForm.id != null" v-model="scope.row.required"
placeholder="璇疯緭鍏ユ爣鍑嗗��"></el-input>
+ </div>
</template>
</el-table-column>
- <el-table-column prop="testValue" label="妫�娴嬪��" min-width="260" v-for="(item, index) in empiricalValueAdd"
- :key="index">
+ <el-table-column prop="testValue" label="妫�娴嬪��" min-width="260" v-for="(item,index) in empiricalValueAdd" :key="index">
<template slot-scope="scope">
- <el-tooltip :disabled="scope.row.equipmentId != null" class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�"
- placement="top-start">
- <el-input :disabled="scope.row.equipmentId == null || (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.testValueList[index]"
- @blur="updateTestValue(scope.row,index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
- </el-tooltip>
+ <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
+ :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)"
+ v-model="scope.row.testValueList[index]"
+ placeholder="璇疯緭鍏ユ垨閫夋嫨妫�娴嬪��" @change="updateTestValue(scope.row,scope.$index)">
+ <el-option label="鏄�" value="鏄�"/>
+ <el-option label="鍚�" value="鍚�"/>
+ </el-select>
+ </el-tooltip>
+ </div>
</template>
</el-table-column>
<el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="260">
<template slot-scope="scope">
- <el-select :disabled="resultVal!=null && dataForm.id!=null" style="width:100%"
- v-model="scope.row.equipmentId" filterable @change="updateDevice(scope.row,scope.$index)">
- <el-option v-for="(item,index) in deviceList"
- :key="index" :value="item.id" :label="item.number +'-'+ item.name"></el-option>
+ <div v-if="!scope.row.children">
+ <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"
+ :key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
</el-select>
+ </div>
+ </template>
+ </el-table-column>
+ <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>
+ </div>
</template>
</el-table-column>
<el-table-column fixed="right" v-if="dataForm.id != null" prop="testState" label="缁撹" min-width="150">
<template slot-scope="scope">
- <span v-if="scope.row.testState == 0" style="color:#F56C6C">涓嶅悎鏍�</span>
- <span v-else-if="scope.row.testState == 1" style="color:#67C23A">鍚堟牸</span>
- <span v-else>鏆傛棤缁撹</span>
+ <div v-if="!scope.row.children">
+ <span v-if="scope.row.testState == 0" style="color:#F56C6C">涓嶅悎鏍�</span>
+ <span v-else-if="scope.row.testState == 1" style="color:#67C23A">鍚堟牸</span>
+ <span v-else>鏆傛棤缁撹</span>
+ </div>
</template>
</el-table-column>
<el-table-column fixed="right" style="background-color: white;" v-if="dataForm.id == null" label="鎿嶄綔" width="150">
<template slot-scope="scope">
- <el-button type="text" @click="clickDeleteline(scope)">鍙栨秷</el-button>
+ <div v-if="scope.row.fId!=null">
+ <el-button type="text" @click="addChildren(scope.row)">娣诲姞椤圭洰</el-button>
+ <el-button type="text" @click="delChildren(scope.row,scope.$index,true)">鍒犻櫎琛�</el-button>
+ </div>
+ <el-button v-else type="text" @click="delChildren(scope.row,scope.$index,false)">鍙栨秷</el-button>
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
</div>
+
+
<div class="rawMaterial-result">
<el-row>
<el-col :span="24">妫�楠岀粨璁�</el-col>
@@ -170,15 +220,15 @@
<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>
<el-table-column prop="userName" label="妫�楠屽憳"></el-table-column>
<el-table-column prop="judgeState" label="妫�楠岀粨璁�">
<template slot-scope="scope">
- <el-tag type="success" v-if="scope.row.judgeState == 1">鍚堟牸</el-tag>
- <el-tag type="danger" v-else-if="scope.row.judgeState == 0">涓嶅悎鏍�</el-tag>
+ <el-tag type="success" v-if="scope.row.testState == '1'">鍚堟牸</el-tag>
+ <el-tag type="danger" v-else-if="scope.row.testState == '0'">涓嶅悎鏍�</el-tag>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔">
@@ -201,10 +251,6 @@
<span>涓嶅悎鏍兼暟閲�:</span>
<el-input type="number" v-model="unqualifiedNum" placeholder="璇疯緭鍏ヤ笉鍚堟牸鏁伴噺"/>
</el-col>
- <el-col>
- <span>瀹炴鏁伴噺:</span>
- <el-input type="number" placeholder="璇疯緭鍏ュ疄妫�鏁伴噺" v-model="fiedNum"/>
- </el-col>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">鍙� 娑�</el-button>
@@ -215,7 +261,7 @@
</template>
<script>
-import {
+import {
selectDevice,
addRawInspects,
getObj,
@@ -230,7 +276,9 @@
},
data(){
return{
- fiedNum: null,
+ userdata:[],
+ currentRow:[],
+ userlist:[],
unqualifiedNum: null,
dialogVisible:false,
resultVal: null,
@@ -249,13 +297,14 @@
formTime: '',
message: '',
name: '',
- code: '88.118.1/A0487643',
+ code: '88.118.1/A0498220',
specs: '',
unit: '',
number: '',
supplier: '',
rawInsProducts: [{
- equipmentId: 0,
+ deviceId: 0,
+ father:'',
name: '',
required: '',
testValue: '',
@@ -295,9 +344,8 @@
dialogVisible(newVal){
if(newVal){
this.unqualifiedNum = null
- this.fiedNum = null
}
- }
+ },
},
methods:{
changeName(index,row){
@@ -319,8 +367,13 @@
this.dataForm.supplier = param.supplier
this.dataForm.number = param.number
this.dataForm.message = param.message
+ this.dataForm.projectName = param.projectName
this.projectList = param.rawInsProducts == null ? [] : param.rawInsProducts
+ param.rawInsProducts.forEach(o=>{
+ this.clickAddLine(o)
+ })
}
+
},
queryCode(){
this.paramObj = {
@@ -328,22 +381,64 @@
}
this.showPart = true
},
- updateDevice(row,index){
- if(this.dataForm.id != null){
- updateDeviceById({equiomentId:row.equipmentId,rpId:row.rpId}).then(res=>{
- this.list[index].testValue = ''
- this.list[index].testState = null
- this.list[index].testValueList = []
- }).catch(error=>{
- console.log(error)
+
+ 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)
+ // })
+ // }
+ // },
+ checkTestState(){
+ let resultVal = '1'
+ this.list.forEach(item=>{
+ if(item.children){
+ if(obj.testState == 0){
+ resultVal = '0'
+ }
+ }
})
- }
+ this.resultVal = resultVal
+ this.conclusionTable[0].testState = resultVal
+ sessionStorage.setItem("raw-resultVal-"+this.dataForm.id,resultVal)
},
showDialog(){
- let pro = this.list.filter(item => {
- return item.testState == 0;
+ let size = 0 //涓嶅悎鏍奸」鐩暟閲�
+ this.list.forEach(item=>{
+ if(item.children){
+ let num = item.children.filter(e=>{
+ return e.testState == 0
+ }).length
+ size+=num
+ }
})
- if (pro.length > 0) {
+ if (size > 0) {
this.dialogVisible = true
}else{
this.submitSave()
@@ -354,7 +449,6 @@
let data = {
id: this.dataForm.id,
number: this.unqualifiedNum,
- toLocationNo: this.fiedNum
}
updateRawInspectsById(data).then(res => {
if(res.data.code == 0){
@@ -363,27 +457,61 @@
this.dialogVisible = false
}
});
- this.init()
+ this.checkTestState()
},
addTeatValueColumn(){
this.empiricalValueAdd = this.empiricalValueAdd + 1;
},
// 娣诲姞琛�
- clickAddLine() {
- let obj = {
- equipmentId: null,
- name: "",
- required: "",
- testValue: "",
- unit: "",
- testState: null,
- testValueList: [],
- };
- this.list.push(obj);
- },
- // 鍒犻櫎琛�
- clickDeleteline(scope) {
- this.list.splice(scope.$index, 1);
+ clickAddLine(row) {
+ let ele = {
+ fId: Math.random(),
+ father: null,
+ iid: Math.random(),
+ children:[]
+ }
+ if(row){
+ ele.father = row.father?row.father:null
+ row.children.forEach(item => {
+ ele.children.push({
+ deviceId: null,
+ deviceName: null,
+ iid: Math.random(),
+ required: item.required?item.required:null,
+ rpId: null,
+ name: item.name?item.name:null,
+ unit: item.unit?item.unit:null,
+ userName: null,
+ testValue: null,
+ testValueList: [],
+ note: null,
+ testState: null
+ })
+ let arr = []
+ item.empiricalValueAddss = arr
+ if (arr.length > this.empiricalValueAdd) {
+ this.empiricalValueAdd = arr.length
+ }
+ this.list.push(ele)
+ })
+ }else{
+ ele.children.push({
+ deviceId: null,
+ deviceName: null,
+ iid: Math.random(),
+ required: null,
+ rpId: null,
+ name: null,
+ unit: null,
+ userName: null,
+ testValue: '',
+ testValueList: [],
+ note: '',
+ testState: ''
+ })
+ this.list.push(ele)
+ }
+
},
delTeatValueColumn(){
if (this.empiricalValueAdd - 1 === 0) { } else {
@@ -395,15 +523,20 @@
}
}
},
+
updateTestValue(row,index){
- console.log(row,index)
- if(row.rpId == null || row.testValueList[index]==null){
+ console.log(row);
+ if(row.rpId == null){
+
+
return
}
+ let val = row.testValueList.join(",");
let obj = {
- equiomentId: row.equipmentId,
+ deviceId: row.deviceId,
rpId: row.rpId,
- testValue: row.testValueList.join(",")
+ testValue: val,
+ note: row.note
}
updateRawInsProduct(obj).then(res=>{
if(res.data.code === 0){
@@ -416,6 +549,8 @@
this.$message.error(error)
})
},
+
+
init(){
if(this.dataForm.id){
getObj(this.dataForm.id).then(res=>{
@@ -427,37 +562,54 @@
this.dataForm.unit = data.runit
this.dataForm.supplier = data.supplier
this.dataForm.number = data.number
+ this.dataForm.projectName = data.projectName
this.dataForm.createTime = data.creatTime
this.dataForm.createUser = data.createUser
- // this.dataForm.judgeState = data.judgeState
let userNameList = []
this.list = []
- data.children.forEach(item=>{
- userNameList.push(item.userName)
- let arr = []
- if(item.testValue != undefined ){
- arr = item.testValue.split(",")
- if(arr.length > this.empiricalValueAdd){
- this.empiricalValueAdd = arr.length
+ data.children.forEach(item => {
+ if (item.children) {
+ let ele = {
+ iid: null,
+ father: null,
+ children: []
+ }
+ ele.iid = Math.random()
+ ele.father = item.rpFather
+ item.children.forEach(obj => {
+ if(obj.userName){
+ userNameList.push(obj.userName)
+ }
+ let arr= []
+
+ if(obj.testValue){
+ arr = obj.testValue.split(",")
+ }
+
+ let o = {
+ deviceId: obj.deviceId,
+ deviceName: obj.deviceName,
+ iid: Math.random(),
+ required: obj.required,
+ rpId: obj.rpId,
+ name: obj.rpName,
+ unit: obj.rpUnit,
+ userName: obj.userName,
+ testValue: obj.testValue?obj.testValue:'',
+ testValueList: arr,
+ note: obj.note?obj.note:'',
+ testState: obj.testState
+ }
+ ele.children.push(o)
+ })
+ this.list.push(ele)
}
- }
- this.list.push({
- equipmentId: item.equiomentId,
- deviceName: item.deviceName,
- name: item.rpName,
- required: item.required,
- testValue: item.testValue,
- unit: item.rpUnit,
- testState: item.testState,
- rpId: item.rpId,
- testValueList: arr
- })
})
this.conclusionTable = [{
code: data.code,
name: data.name,
userName: Array.from(new Set(userNameList)).join(','),
- judgeState: this.resultVal==null?null:this.resultVal
+ testState: this.resultVal==null?null:this.resultVal
}]
}).catch(error=>{
this.$message.error("鑾峰彇澶辫触",error)
@@ -466,13 +618,98 @@
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()
+ })
+ }
+ },
+
+
+
+ // 鍒犻櫎瀛愰」鐩�
+ delChildren(row,index,isParent) {
+ if(isParent){
+ let parentIndex = this.list.findIndex(el =>{
+ return el.iid == row.iid
+ })
+ this.list.splice(parentIndex,1)
+ }else{
+ let i = this.list.findIndex(el =>{
+ return el.children.find(ele => ele.iid == row.iid)
+ })
+ let childrenIndex = this.list[i].children.findIndex(el =>{
+ return el.iid == row.iid
+ })
+ this.list[i].children.splice(childrenIndex,1)
+ }
+ },
+ //娣诲姞瀛愰」鐩�
+ addChildren(row){
+ console.log(row);
+ let obj = {
+ deviceId: null,
+ deviceName: null,
+ iid: Math.random(),
+ required: null,
+ rpId: null,
+ name: null,
+ unit: null,
+ userName: null,
+ testValue: null,
+ testValueList: [],
+ note: null,
+ testState: null
+ }
+ row.children.push(obj)
+ },
save(){
+
let data = this.dataForm
- data.rawInsProducts = this.list
- data.rawInsProducts.forEach(item=>{
- let val = item.testValueList.join(",")
- item.testValue = val
+ 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("淇濆瓨鎴愬姛")
this.$router.go(-1)
@@ -481,7 +718,7 @@
})
},
getDeviceList(){
- selectDevice(null).then(res=>{
+ selectDevice().then(res=>{
this.deviceList = res.data.data
})
},
--
Gitblit v1.9.3