From cb57bc6b4abf45dbb0605c94359c63e3b31b4b87 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 10 九月 2024 15:55:57 +0800
Subject: [PATCH] 优化报告生成、修改电路下单传参
---
src/components/do/b1-inspect-order-plan/circuit-parameters2.vue | 84 +++++++++++++++++++++++++----------------
1 files changed, 51 insertions(+), 33 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..dab0058 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
@@ -35,7 +35,7 @@
</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 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>
@@ -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;">
@@ -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;">
@@ -180,7 +180,7 @@
<script>
export default {
- props:['insProduct','orderId','sampleId','state'],
+ props:['insProduct','orderId','sampleId','state','num'],
data() {
return {
value: "",
@@ -287,7 +287,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 +326,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 +422,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 +432,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 +470,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 +548,7 @@
if(!n.often){
return
}
- if(!n.often.includes('MHz')){
+ if(!n.often.includes('MHz')||!n.often.includes('MHZ')){
n.often = n.often + 'MHz'
}
},
--
Gitblit v1.9.3