From a8fb5d596d0fef7421c3946ad331588b84a390cd Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 09 十一月 2023 10:04:39 +0800
Subject: [PATCH] modified: src/views/quality/finishedProductInspection/finishedProduct-form.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue modified: vue.config.js
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 379 ++++++++++++++++++-----------------------------------
1 files changed, 130 insertions(+), 249 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index c06473a..4a13e4a 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -101,13 +101,10 @@
<div class="rawMaterial-detail">
<el-row style="width:100%;z-index: 10;height:50px;">
- <el-col :span="19">妫�楠岄」鐩�</el-col>
- <el-col :span="5">
+ <el-col :span="18">妫�楠岄」鐩�</el-col>
+ <el-col :span="6">
<div style="width:100%;text-align: right;">
- <el-col :span="12" >
- <el-button v-if="dataForm.id==null" icon="el-icon-plus" type="primary" size="small" @click="increase">娣诲姞妫�楠岄」鐩�</el-button>
- </el-col>
- <!-- <el-button v-if="dataForm.id==null" size="small" @click="clickAddLine">娣诲姞妫�楠岃</el-button> -->
+ <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>
@@ -130,17 +127,13 @@
</el-table-column>
<el-table-column prop="father" label="妫�楠岄」鐩�" width="260">
<template slot-scope="scope">
- <el-input v-if="scope.row.children" :disabled="dataForm.id != null" v-model="scope.row.father" placeholder="璇疯緭鍏ユ楠岄」鐩�"></el-input>
+ <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">
<div v-if="!scope.row.children">
- <!-- <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 class="inline-input" v-model="scope.row.name"
+ <el-input class="inline-input" :disabled="dataForm.id!=null" v-model="scope.row.name"
placeholder="璇疯緭鍏ラ」鐩悕绉�"></el-input>
</div>
</template>
@@ -161,33 +154,25 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="testValue" label="妫�娴嬪��" min-width="260" >
+ <el-table-column prop="testValue" label="妫�娴嬪��" min-width="260" v-for="(item,index) in empiricalValueAdd" :key="index">
<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-input :disabled="dataForm.id != null"
- v-model="scope.row.testValueList"
- placeholder="璇疯緭鍏ユ娴嬪��"></el-input> -->
-
- <!-- <el-autocomplete style="width:100%" :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)" class="inline-input" v-model="scope.row.testValueList[index]"
- :fetch-suggestions="querySearch" placeholder="璇疯緭鍏ユ娴嬪��" @select="handleSelect"
- ></el-autocomplete> -->
<el-col v-if="scope.row.itype === '1'">
- <el-input :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)"
- v-model="scope.row.testValueList"
- placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
- </el-col>
- <el-col v-else>
- <el-select style="width: 100%;"
- :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)"
- v-model="scope.row.testValueList"
- placeholder="璇烽�夋嫨">
- <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-col>
+ <el-input :disabled="scope.row.deviceId == '' || (dataForm.id!=null&&resultVal!=null)"
+ v-model="scope.row.testValueList[index]"
+ placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
+ </el-col>
+ <el-col v-else>
+ <el-select style="width: 100%;"
+ :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)"
+ v-model="scope.row.testValueList[index]" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-col>
</el-tooltip>
</div>
</template>
@@ -195,7 +180,7 @@
<el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="260">
<template slot-scope="scope">
<div v-if="!scope.row.children">
- <el-select :disabled="resultVal!=null && dataForm.id!=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"
:key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
@@ -212,16 +197,18 @@
</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">
- <div v-if="!scope.row.children">
- <el-button type="text" @click="addwaydata(scope)">鏂板</el-button>
- <el-button type="text" @click="clickDeleteline(scope)">鍙栨秷</el-button>
+ <div>
+ <el-button v-if="scope.row.father!=null" type="text" @click="addChildren(scope.row)">娣诲姞椤圭洰</el-button>
+ <el-button v-else type="text" @click="delChildren(scope,scope.$index)">鍙栨秷</el-button>
</div>
</template>
</el-table-column>
@@ -351,7 +338,6 @@
dataRule: {},
deviceList: [],
restaurants:[],
- whetherNot:'',
}
},
beforeUpdate(){
@@ -369,9 +355,6 @@
this.init()
this.getDeviceList()
this.restaurants = this.loadAll();
-
- console.log(this.dataForm);
-
},
watch:{
dialogVisible(newVal){
@@ -379,16 +362,11 @@
this.unqualifiedNum = null
}
},
-
},
methods:{
- increase(){
-
- },
querySearch(queryString, cb) {
var restaurants = this.restaurants;
var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
-
cb(results);
},
// createFilter(queryString) {
@@ -426,30 +404,6 @@
this.dataForm.message = param.message
this.dataForm.projectName = param.projectName
this.projectList = param.rawInsProducts == null ? [] : param.rawInsProducts
- console.log(param.rawInsProducts);
- param.rawInsProducts.forEach(item =>{
- item.iid = Math.random()
- console.log(item);
- })
- // param.rawInsProducts.forEach(item => {
- // item.iid = Math.random()
- // if (item.children != undefined) {
- // item.children.forEach(obj => {
- // let arr = []
- // if (obj.userName) {
- // userNameList.push(obj.userName)
- // }
- // if (obj.inspectionValue) {
- // arr = obj.inspectionValue.split(",")
- // }
- // obj.empiricalValueAddss = arr
- // if (arr.length > this.empiricalValueAdd) {
- // this.empiricalValueAdd = arr.length
- // }
- // })
- // }
- // })
- // this.list.push( param.rawInsProducts)
param.rawInsProducts.forEach(o=>{
this.clickAddLine(o)
})
@@ -517,52 +471,47 @@
},
// 娣诲姞琛�
clickAddLine(row) {
- console.log(row);
- // console.log(row.children[0]);
- // this.componentData = row;
-
- let obj = {
- father:null,
- // componentData.deviceId: null,
- // name: "",
- // required: "",
- // testValue: "",
- // unit: "",
- // testState: null,
- children:[],
- testValueList: [],
- };
- let userNameList = []
- row.children.forEach(item => {
- item.iid = Math.random()
- if (item.children != undefined) {
- item.children.forEach(obj => {
- let arr = []
- if (obj.userName) {
- userNameList.push(obj.userName)
- }
- if (obj.inspectionValue) {
- arr = obj.inspectionValue.split(",")
- }
- obj.empiricalValueAddss = arr
- if (arr.length > this.empiricalValueAdd) {
- this.empiricalValueAdd = arr.length
- }
- })
- }
- })
-
- console.log(this.list);
+ if(row){
+ let userNameList = []
+ row.children.forEach(item => {
+ item.iid = Math.random()
+ let arr = []
+ item.testValue = ''
+ item.testValueList= []
+ if (item.userName) {
+ userNameList.push(item.userName)
+ }
+ if (item.inspectionValue) {
+ arr = item.inspectionValue.split(",")
+ }
+ item.empiricalValueAddss = arr
+ if (arr.length > this.empiricalValueAdd) {
+ this.empiricalValueAdd = arr.length
+ }
+ this.list.push(row)
+ })
+ }else{
+ let ele = {
+ father: '',
+ iid: Math.random(),
+ children:[{
+ deviceId: null,
+ deviceName: null,
+ iid: Math.random(),
+ required: null,
+ rpId: null,
+ name: null,
+ unit: null,
+ userName: null,
+ testValue: null,
+ testValueList: [],
+ note: null,
+ testState: null
+ }]
+ }
+ this.list.push(ele)
+ }
- // this.list = row.children
- this.list.push(row)
- // console.log(this.list);
- // if(row!=undef.list){
- // obj.name = row.children.name
- // obj.unit = row.children.unit
- // obj.required = row.children.required
- // }
- // this.list.push(obj)
},
delTeatValueColumn(){
if (this.empiricalValueAdd - 1 === 0) { } else {
@@ -597,7 +546,6 @@
init(){
if(this.dataForm.id){
getObj(this.dataForm.id).then(res=>{
-
console.log(res);
let data = res.data.data
this.dataForm.name = data.name
@@ -612,80 +560,46 @@
this.dataForm.createUser = data.createUser
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
- // }
- // }
- // this.userdata = item.children[0];
- // console.log(this.userdata);
- // this.list.push({
- // father: item.rpFather,
- // note: this.userdata.note,
- // deviceId: this.userdata.deviceId,
- // deviceName: this.userdata.deviceName,
- // name: this.userdata.rpName,
- // required: this.userdata.required,
- // testValue: this.userdata.testValue,
- // unit: this.userdata.rpUnit,
- // testState: this.userdata.testState,
- // rpId: this.userdata.rpId,
- // testValueList: arr
- // })
- // })
- console.log("=======================");
- console.log(data.children);
- // data.children.forEach(item => {
- // item.iid = Math.random()
- // if (item.children != undefined) {
- // item.children.forEach(obj => {
- // console.log(obj);
- // obj.ild = Math.random()
- // // let arr = []
- // // if (obj.userName) {
- // // userNameList.push(obj.userName)
- // // }
- // // if (obj.inspectionValue) {
- // // arr = obj.inspectionValue.split(",")
- // // }
- // // obj.empiricalValueAddss = arr
- // // if (arr.length > this.empiricalValueAdd) {
- // // this.empiricalValueAdd = arr.length
- // // }
- // })
- // }
- // })
- console.log(data.children);
- // this.userdata = data.children
-
- // this.list.push({
- // father: item.rpFather,
- // note: this.userdata.note,
- // deviceId: this.userdata.deviceId,
- // deviceName: this.userdata.deviceName,
- // name: this.userdata.rpName,
- // required: this.userdata.required,
- // testValue: this.userdata.testValue,
- // unit: this.userdata.rpUnit,
- // testState: this.userdata.testState,
- // rpId: this.userdata.rpId,
- // testValueList: arr
- // })
- // })
- // console.log(this.list);
- // this.userdata = data.children
- this.list.push(data.children )
- console.log( this.list);
- this.conclusionTable = [{
- code: data.code,
- name: data.name,
- userName: Array.from(new Set(userNameList)).join(','),
- testState: this.resultVal==null?null:this.resultVal
- }]
+ 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 => {
+ console.log(obj);
+ 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.conclusionTable = [{
+ code: data.code,
+ name: data.name,
+ userName: Array.from(new Set(userNameList)).join(','),
+ testState: this.resultVal==null?null:this.resultVal
+ }]
}).catch(error=>{
this.$message.error("鑾峰彇澶辫触",error)
})
@@ -693,54 +607,29 @@
this.conclusionTable = []
}
},
- // 鍒犻櫎琛�
- clickDeleteline(scope) {
- // console.log(55555);
- console.log(scope);
- let index = this.list.findIndex(el =>{
- return el.children.find(ele => ele.iid == scope.row.iid)
- })
-
- let childrenIndex = this.list[index].children.findIndex(el => {
- return el.iid == scope.row.iid
- })
- // console.log(this.list);
- console.log(index);
- console.log(childrenIndex);
-
- this.list[index].children.splice(childrenIndex , 1);
- if(childrenIndex == 0){
- this.list.splice(scope.row,1)
- }
+ // 鍒犻櫎瀛愰」鐩�
+ delChildren(scope,index) {
+ console.log(scope,index);
+
},
- increase(){
+ //娣诲姞瀛愰」鐩�
+ addChildren(row){
+ console.log(row);
let obj = {
- iid:Math.random(),
- father:'',
- children:[
- {
- iid:Math.random(),
- name:'',
- required:'',
- unit:''
- }
- ]
+ deviceId: null,
+ deviceName: null,
+ iid: Math.random(),
+ required: null,
+ rpId: null,
+ name: null,
+ unit: null,
+ userName: null,
+ testValue: null,
+ testValueList: [],
+ note: null,
+ testState: null
}
- this.list.push(obj)
- },
- addwaydata(row){
- console.log(row.row);
- let index = this.list.findIndex(el =>{
- return el.children.find(ele => ele.iid == row.row.iid)
- })
- console.log(index);
- let obj = {
- iid:Math.random(),
- name:'',
- required:'',
- unit:''
- }
- this.list[index].children.push(obj)
+ row.children.push(obj)
},
save(){
console.log(this.dataForm);
@@ -748,20 +637,12 @@
console.log(data);
console.log(this.list);
data.rawInsProducts = this.list
- // console.log(data.rawInsProducts);
- // data.rawInsProducts.forEach(item=>{
- // console.log(item);
- // let val = item.testValueList.join(",")
- // item.testValue = val
- // console.log(item.testValue);
- // })
- // console.log(data);
console.log('=====>');
addRawInspects(data).then(res=>{
- // this.$message.success("淇濆瓨鎴愬姛")
+ this.$message.success("淇濆瓨鎴愬姛")
this.$router.go(-1)
}).catch(error=>{
- // this.$message.error(error||'error')
+ this.$message.error(error)
})
},
getDeviceList(){
--
Gitblit v1.9.3