From 051e5b520f0b94dd409d4fd90ea8fc350a943f9d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 14 十月 2024 16:42:31 +0800
Subject: [PATCH] 完成温湿度特殊项目
---
src/components/do/b1-inspect-order-plan/circuit-parameters2.vue | 127 ++++++++++++++++++++++++++---------------
1 files changed, 80 insertions(+), 47 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue b/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
index 62ef7d0..84f89f5 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters2.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"
@@ -33,12 +33,12 @@
</el-col>
</el-row>
</el-col>
- <el-col :span="7">
+ <el-col :span="7" v-if="!isLook">
<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)" v-if="!(state>1)&&intermodulationNum>0">娣诲姞瑙掑害</el-button>
- <el-button size="small" @click="deleteList(angleList.length-1,angleList)" v-if="!(state>1)&&intermodulationNum>0">鍒犻櫎瑙掑害</el-button>
+ <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)" v-if="!(state>1)&&intermodulationNum>0" style="margin: 4px;">娣诲姞瑙掑害</el-button>
+ <el-button size="small" @click="deleteList(angleList.length-1,angleList)" v-if="!(state>1)&&intermodulationNum>0" style="margin: 4px;">鍒犻櫎瑙掑害</el-button>
</div>
</el-col>
</el-row>
@@ -72,7 +72,7 @@
</el-select>
<el-button type="primary" size="small" @click="addList(h.projectList,'浜掕皟')" style="margin-left: 16px;" v-if="intermodulationNum>0&&!(state>1)">娣诲姞浜掕皟</el-button>
<el-button size="small" @click="deleteList(0,h.projectList,'浜掕皟')" v-if="intermodulationNum>0&&!(state>1)">鍒犻櫎浜掕皟</el-button>
- <el-button type="primary" size="small" @click="save(h,y)" :disabled="state>1" :loading="loading[y]" style="margin-left: 16px;">淇� 瀛�</el-button>
+ <el-button type="primary" size="small" @click="save(h,y)" :disabled="state>1" :loading="loading[y]" style="margin-left: 16px;" v-show="!isLook">淇� 瀛�</el-button>
</div>
<el-divider></el-divider>
<div class="circuit-parameters-item-content">
@@ -86,7 +86,7 @@
<div style="text-align: center;">{{ n.unit }}</div>
</el-col>
<el-col :span="2">
- <div style="text-align: center;">{{ n.tell }}</div>
+ <div style="text-align: center;" v-html="n.tell"></div>
</el-col>
<el-col :span="16">
<div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -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>
@@ -129,7 +129,7 @@
<div style="text-align: center;">{{ n.unit }}</div>
</el-col>
<el-col :span="2">
- <div style="text-align: center;">{{ n.tell }}</div>
+ <div style="text-align: center;" v-html="n.tell"></div>
</el-col>
<el-col :span="16">
<div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -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'">
@@ -180,7 +180,7 @@
<script>
export default {
- props:['insProduct','orderId','sampleId','state'],
+ props:['insProduct','orderId','sampleId','state','num','isLook','currentNum'],
data() {
return {
value: "",
@@ -269,11 +269,21 @@
}
})
})
+ },
+ currentNum(val) {
+ this.initData()
+ },
+ insProduct:{
+ deep:true,
+ handler:()=>{
+ this.initData()
+ }
}
},
mounted() {
this.getTypeDicts()
this.initData()
+ console.log(2222,this.currentNum)
},
methods: {
// 瀛楀吀鑾峰彇鏁版嵁
@@ -287,7 +297,7 @@
// 鍒濆鍖栨暟鎹�
initData(){
// 澶勭悊椤圭洰
- this.insProductNew = JSON.parse(JSON.stringify(this.insProduct))
+ this.insProductNew = JSON.parse(JSON.stringify(this.insProduct)).filter(m=>m.inspectionItem.includes('鐢佃矾璇曢獙'))
this.insProductNew.forEach(async item => {
// 鑾峰彇璁惧鍒楄〃
item.equipOptions = await this.getEquipOptions(item)
@@ -326,16 +336,25 @@
})
this.angleList = angleList
}
+ let tell = ''
+ if(item.tell.includes(',')){
+ item.tell.split(',').forEach((m,i)=>{
+ tell = tell + m+ (i==item.tell.split(',').length-1?'':'<br/>')
+ })
+ }else{
+ tell = item.tell
+ }
let obj = {
inspectionItemSubclass: item.inspectionItemSubclass,
unit:item.unit,
- tell:item.tell,
+ tell:tell,
result:n.result,
id:item.id,
often:n.often,
equipName:n.equipName,
equipValue:n.equipValue,
- frequency:n.frequency
+ frequency:n.frequency,
+ sonLaboratory:item.sonLaboratory
}
this.$set(obj,'portList', n.port?portList:[])
this.$set(obj,'angleList', n.angle?angleList:[])
@@ -413,30 +432,7 @@
message: '涓嶈兘鍒犻櫎鏈�鍚庝竴涓簰璋�'
});
}else{
- if(list[index].frequency){
- this.$confirm(`鏄惁纭畾鍒犻櫎 ${list[index].often} 棰戠偣鏁版嵁?`, "鎻愮ず", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(() => {
- this.$axios.post(this.$api.insOrderPlan.deleteInsContext2, {
- frequency:list[index].frequency,
- productId:list[index].id,
- often:list[index].often
- }).then(res => {
- if (res.code === 201) {
- this.$message.error('鍒犻櫎澶辫触')
- return
- }
- this.$message.success('宸插垹闄�')
- list.splice(index, 1)
- }).catch(err => {
- console.log(err)
- })
- }).catch(() => {})
- }else{
- list.splice(index, 1)
- }
+ list.splice(index, 1)
}
}else if(type=='鍒犻櫎棰戞'){
this.$confirm(`鏄惁纭畾鍒犻櫎 ${list[index].band} 棰戞鏁版嵁?`, "鎻愮ず", {
@@ -446,7 +442,8 @@
}).then(() => {
this.$axios.post(this.$api.insOrderPlan.deleteInsContext, {
frequency:list[index].band,
- productIds:list[index].projectList.map(m=>m.id)
+ productIds:list[index].projectList.map(m=>m.id),
+ num:this.num
}, {
headers: {
'Content-Type': 'application/json'
@@ -483,7 +480,38 @@
index = i;
}
})
+ obj.often = ''
+ obj.result = ''
+ let num0 = obj.value.length
+ let num1 = obj.value[0].length
+ delete obj.value
+ obj.value = []
+ for(let i = 0;i<num0;i++){
+ obj.value.push([])
+ for(let j = 0;j<num1;j++){
+ obj.value[i].push('')
+ }
+ }
list.splice(index+1, 0, obj)
+ }else if(type=='棰戞'){
+ let obj = JSON.parse(JSON.stringify(list[0]));
+ obj.band = ''
+ obj.projectList.forEach(item=>{
+ item.often = ''
+ item.result = ''
+ item.frequency = ''
+ let num0 = item.value.length
+ let num1 = item.value[0].length
+ delete item.value
+ item.value = []
+ for(let i = 0;i<num0;i++){
+ item.value.push([])
+ for(let j = 0;j<num1;j++){
+ item.value[i].push('')
+ }
+ }
+ })
+ list.push(obj)
}else{
let obj = JSON.parse(JSON.stringify(list[0]));
list.push(obj)
@@ -530,7 +558,7 @@
if(!n.often){
return
}
- if(!n.often.includes('MHz')){
+ if(!n.often.includes('MHz')&&!n.often.includes('MHZ')){
n.often = n.often + 'MHz'
}
},
@@ -546,6 +574,11 @@
},
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