From bb1edca3bf351497495e270014b229605e4460dc Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 17 十月 2024 09:24:51 +0800
Subject: [PATCH] 修改下单、电路试验多样品时的bug
---
src/components/do/b1-inspect-order-plan/circuit-parameters1.vue | 110 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 80 insertions(+), 30 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue b/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
index 9eb8c06..9f0b31e 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
@@ -1,21 +1,21 @@
<template>
<div class="circuit-parameters">
<el-divider></el-divider>
- <el-row :gutter="5" style="width: calc(100% - 1px);margin-bottom: 10px;">
+ <el-row :gutter="8" style="width: calc(100% - 1px);margin-bottom: 10px;">
<el-col :span="17">
<el-row>
<el-col :span="23" style="display: flex;flex-wrap: wrap;">
- <table border="1" cellpadding="10" style="margin: 0 10px 10px 0;" v-for="(item,index) in insProductNew" :key="index + 'ppp'" v-show="isMore?true:(index<3?true:false)">
+ <table border="1" cellpadding="10" style="margin: 4px 10px 10px 0;width: 32%;" v-for="(item,index) in insProductNew" :key="index + 'ppp'" v-show="isMore?true:(index<3?true:false)">
<tr>
<td style="text-align: center;background: #F0F1F5;">
<el-tooltip effect="dark" :content="item.inspectionItemSubclass" placement="top-start"><span style="display: inline-block;width: 95px;" class="single-line-ellipsis">{{ item.inspectionItemSubclass }}</span>
</el-tooltip>
</td>
<td>
- <el-input size="small" placeholder="璁惧鍚嶇О" v-model="item.equipName" style="width: 95px;" readonly></el-input>
+ <el-input size="small" placeholder="璁惧鍚嶇О" v-model="item.equipName" readonly></el-input>
</td>
<td>
- <el-select v-model="item.equipValue" placeholder="璁惧缂栫爜" size="small" style="width: 95px;" :disabled="state>1" @focus="methodFocus(item)" @change="m=>handleEquip(m,item)">
+ <el-select v-model="item.equipValue" placeholder="璁惧缂栫爜" size="small" :disabled="state>1" @focus="methodFocus(item)" @change="m=>handleEquip(m,item)">
<el-option
v-for="m in item.equipOptions"
:key="m.value"
@@ -34,11 +34,11 @@
</el-row>
</el-col>
<el-col :span="7">
- <div style="display: flex;align-items: center;justify-content: flex-end;" class="btns">
- <el-button type="primary" size="small" @click="addList(allBandList,'棰戞')" :disabled="state>1">娣诲姞棰戞</el-button>
- <el-button size="small" @click="deleteList(allBandList.length-1,allBandList,'鍒犻櫎棰戞')" :disabled="state>1">鍒犻櫎棰戞</el-button>
- <el-button type="primary" size="small" @click="addList(angleList)" :disabled="state>1">娣诲姞瑙掑害</el-button>
- <el-button size="small" @click="deleteList(angleList.length-1,angleList)" :disabled="state>1">鍒犻櫎瑙掑害</el-button>
+ <div style="display: flex;align-items: center;justify-content: flex-end;flex-wrap: wrap;" class="btns" v-if="!isLook">
+ <el-button type="primary" size="small" @click="addList(allBandList,'棰戞')" :disabled="state>1" style="margin: 4px;">娣诲姞棰戞</el-button>
+ <el-button size="small" @click="deleteList(allBandList.length-1,allBandList,'鍒犻櫎棰戞')" :disabled="state>1" style="margin: 4px;">鍒犻櫎棰戞</el-button>
+ <el-button type="primary" size="small" @click="addList(angleList)" :disabled="state>1" style="margin: 4px;">娣诲姞瑙掑害</el-button>
+ <el-button size="small" @click="deleteList(angleList.length-1,angleList)" :disabled="state>1" style="margin: 4px;">鍒犻櫎瑙掑害</el-button>
</div>
</el-col>
</el-row>
@@ -70,9 +70,9 @@
:value="item.value">
</el-option>
</el-select>
- <el-button type="primary" size="small" @click="addList(h.projectList,'浜掕皟')" style="margin-left: 16px;" :disabled="state>1">娣诲姞浜掕皟</el-button>
- <el-button size="small" @click="deleteList(0,h.projectList,'浜掕皟')" :disabled="state>1">鍒犻櫎浜掕皟</el-button>
- <el-button type="primary" size="small" @click="save(h,y)" :disabled="state>1" :loading="loading[y]">淇� 瀛�</el-button>
+ <el-button type="primary" size="small" @click="addList(h.projectList,'浜掕皟')" style="margin-left: 16px;" :disabled="state>1" v-show="!isLook&&intermodulationNum>0">娣诲姞浜掕皟</el-button>
+ <el-button size="small" @click="deleteList(0,h.projectList,'浜掕皟')" :disabled="state>1" v-show="!isLook&&intermodulationNum>0">鍒犻櫎浜掕皟</el-button>
+ <el-button type="primary" size="small" @click="save(h,y)" :disabled="state>1" :loading="loading[y]" v-show="!isLook">淇� 瀛�</el-button>
</div>
<el-divider></el-divider>
<div class="circuit-parameters-item-content">
@@ -100,8 +100,8 @@
</td>
<td :rowspan="n.angleList.length+1">
<el-button icon="el-icon-minus" circle size="mini" type="danger"
- @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1"></el-button>
- <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1"></el-button>
+ @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1" style="margin: 5px;"></el-button>
+ <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1" style="margin: 5px;"></el-button>
</td>
</tr>
<tr v-for="(item,index) in n.angleList" :key="index + 'eee'">
@@ -116,7 +116,7 @@
</div>
</el-col>
<el-col :span="2">
- <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'涓嶅悎鏍�':(n.result===1?'鍚堟牸':'寰呭畾') }}
+ <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'涓嶅悎鏍�':(n.result===1?'鍚堟牸':(n.result===3?'涓嶅垽瀹�':(n.result===3?'涓嶅垽瀹�':'寰呭畾'))) }}
</div>
</el-col>
</el-row>
@@ -143,7 +143,7 @@
</td>
</tr>
<tr>
- <td>瑙掑害</td>
+ <td>绔彛</td>
<td v-for="(item,index) in n.portList" :key="index+'fff'">
<div style="display: flex;align-items: center;">
<el-input size="small" placeholder="绔彛" v-model="item.value" :disabled="state>1"></el-input>
@@ -151,8 +151,8 @@
</td>
<td :rowspan="n.angleList.length+1">
<el-button icon="el-icon-minus" circle size="mini" type="danger"
- @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1"></el-button>
- <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1"></el-button>
+ @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1" style="margin: 5px;"></el-button>
+ <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1" style="margin: 5px;"></el-button>
</td>
</tr>
<tr v-for="(item,index) in n.angleList" :key="index + 'eee'">
@@ -167,7 +167,7 @@
</div>
</el-col>
<el-col :span="2">
- <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'涓嶅悎鏍�':(n.result===1?'鍚堟牸':'寰呭畾') }}
+ <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'涓嶅悎鏍�':(n.result===1?'鍚堟牸':(n.result===3?'涓嶅垽瀹�':(n.result===3?'涓嶅垽瀹�':'寰呭畾'))) }}
</div>
</el-col>
</el-row>
@@ -194,8 +194,8 @@
</td>
<td :rowspan="n.angleList.length+1">
<el-button icon="el-icon-minus" circle size="mini" type="danger"
- @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1"></el-button>
- <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1"></el-button>
+ @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1" style="margin: 5px;"></el-button>
+ <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1" style="margin: 5px;"></el-button>
</td>
</tr>
<tr v-for="(item,index) in n.angleList" :key="index + 'eee'">
@@ -210,7 +210,7 @@
</div>
</el-col>
<el-col :span="2">
- <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'涓嶅悎鏍�':(n.result===1?'鍚堟牸':'寰呭畾') }}
+ <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'涓嶅悎鏍�':(n.result===1?'鍚堟牸':(n.result===3?'涓嶅垽瀹�':'寰呭畾')) }}
</div>
</el-col>
</el-row>
@@ -248,7 +248,7 @@
</div>
</el-col>
<el-col :span="2">
- <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'涓嶅悎鏍�':(n.result===1?'鍚堟牸':'寰呭畾') }}
+ <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'涓嶅悎鏍�':(n.result===1?'鍚堟牸':(n.result===3?'涓嶅垽瀹�':'寰呭畾')) }}
</div>
</el-col>
</el-row>
@@ -261,7 +261,7 @@
<script>
export default {
- props:['insProduct','orderId','sampleId','state','num'],
+ props:['insProduct','orderId','sampleId','state','num','isLook','currentNum'],
data() {
return {
value: "",
@@ -343,7 +343,8 @@
allBandList:[],//棰戞
insProductNew:[],
isMore:false,
- loading:{}
+ loading:{},
+ intermodulationNum:0,//浜掕皟妫�楠岄」鐩殑鏁伴噺
};
},
watch: {
@@ -351,8 +352,17 @@
angleList(val) {
this.allBandList.forEach(item => {
item.projectList.forEach(m => {
- if(m.angleList.length!==val.length){
- m.angleList = JSON.parse(JSON.stringify(this.angleList))
+ // 娣诲姞瑙掑害
+ for(let i=0;i<val.length;i++){
+ if(!m.angleList[i]){
+ this.$set(m.angleList,i, {value:''})
+ }
+ }
+ // 鍒犻櫎瑙掑害
+ for(let i=0;i<m.angleList.length;i++){
+ if(!val[i]){
+ m.angleList.splice(i,1)
+ }
}
if(m.inspectionItemSubclass.includes('鑰﹀悎搴�')){
for(let i = 0;i<m.angleList.length;i++){
@@ -377,7 +387,17 @@
}
})
})
- console.log(this.allBandList)
+ // console.log(this.allBandList)
+ },
+ currentNum(val) {
+ this.initData()
+ },
+ insProduct:{
+ deep:true,
+ handler:function(val){
+ // console.log('鏇存柊椤甸潰鍟�')
+ this.initData()
+ }
}
},
mounted() {
@@ -395,11 +415,15 @@
},
// 鍒濆鍖栨暟鎹�
initData(){
+ this.allBandList = []
// 澶勭悊椤圭洰
this.insProductNew = JSON.parse(JSON.stringify(this.insProduct)).filter(m=>m.inspectionItem.includes('鐢佃矾璇曢獙'))
this.insProductNew.forEach(async item => {
+ if(item.inspectionItemSubclass.includes('浜掕皟')){
+ this.intermodulationNum++
+ }
// 鑾峰彇璁惧鍒楄〃
- item.equipOptions = await this.getEquipOptions(item)
+ item.equipOptions = []
})
if(this.insProductNew[0].insProductResult2&&this.insProductNew[0].insProductResult2.length>0){
// 宸茬粡瀛樺湪鍊兼椂锛岃祴鍊�
@@ -472,12 +496,32 @@
})
}
}else{
+ console.log(2222)
// 娌℃湁鍊兼椂锛屽垵濮嬪寲椤甸潰
this.insProductNew.forEach(async item => {
// 璧嬪�艰澶�
item.equipName = ''
item.equipValue = ''
// 璧嬪�肩鍙ｅ拰瑙掑害
+ this.portList = [
+ {
+ value:'1',
+ },
+ {
+ value:'2',
+ },
+ {
+ value:'3',
+ },
+ {
+ value:'4',
+ },
+ ]
+ this.angleList = [
+ {
+ value:''
+ }
+ ]
item.portList = JSON.parse(JSON.stringify(this.portList))
item.angleList = JSON.parse(JSON.stringify(this.angleList))
// 璧嬪�肩粨璁�
@@ -504,6 +548,7 @@
projectList: JSON.parse(JSON.stringify(this.insProductNew))
}
)
+ console.log(this.allBandList)
}
},
// 鍒犻櫎鏁扮粍
@@ -658,12 +703,17 @@
if(!n.often){
return
}
- if(!n.often.includes('MHz')||!n.often.includes('MHZ')){
+ if(!n.often.includes('MHz')&&!n.often.includes('MHZ')){
n.often = n.often + 'MHz'
}
},
save(h,y) {
let arr = h.projectList.map(item=>{
+ if(item.portList&&item.portList.length>0){
+ item.value.forEach(m=>{
+ m = m.splice(item.portList.length)
+ })
+ }
let obj = {
insProductId:item.id,
equipValue:this.insProductNew.find(m=>m.id==item.id).equipValue,
--
Gitblit v1.9.3