From e6c3fccc9e412e79964a6dc2dae4c3da0c80095c Mon Sep 17 00:00:00 2001 From: licp <lichunping@guanfang.com.cn> Date: 星期二, 26 十一月 2024 15:22:28 +0800 Subject: [PATCH] 完成检验下单、检验任务、报告生成变更 --- src/components/do/b1-inspect-order-plan/circuit-parameters2.vue | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 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 ecd3ef7..4e84e59 100644 --- a/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue +++ b/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue @@ -86,7 +86,7 @@ <div style="text-align: center;">{{ n.unit }}</div> </el-col> <el-col :span="2"> - <div style="text-align: center;" v-html="n.tell"></div> + <div style="text-align: center;" v-html="n.ask"></div> </el-col> <el-col :span="16"> <div class="content" style="text-align: center;width: 100%;overflow-x: auto;"> @@ -127,7 +127,7 @@ <div style="text-align: center;">{{ n.unit }}</div> </el-col> <el-col :span="2"> - <div style="text-align: center;" v-html="n.tell"></div> + <div style="text-align: center;" v-html="n.ask"></div> </el-col> <el-col :span="16"> <div class="content" style="text-align: center;width: 100%;overflow-x: auto;"> @@ -213,7 +213,7 @@ { inspectionItemSubclass:'鐢靛帇椹绘尝姣�', unit:'/', - tell:'鈮�1.45', + ask:'鈮�1.45', result:0, portList:[], angleList:[], @@ -222,7 +222,7 @@ { inspectionItemSubclass:'鍚屾瀬鍖栭殧绂诲害', unit:'dB', - tell:'鈮�1.45', + ask:'鈮�1.45', result:0, portList:[], angleList:[], @@ -232,7 +232,7 @@ inspectionItemSubclass:'浜掕皟', often:'',//浜掕皟鐗规湁瀛楁 unit:'dB', - tell:'鈮�1.45', + ask:'鈮�1.45', result:0, portList:[], angleList:[], @@ -350,18 +350,18 @@ this.angleList = angleList this.upTemplateState = false } - let tell = '' - if(item.tell.includes(',')){ - item.tell.split(',').forEach((m,i)=>{ - tell = tell + m+ (i==item.tell.split(',').length-1?'':'<br/>') + let ask = '' + if(item.ask.includes(',')){ + item.ask.split(',').forEach((m,i)=>{ + ask = ask + m+ (i==item.ask.split(',').length-1?'':'<br/>') }) }else{ - tell = item.tell + ask = item.ask } let obj = { inspectionItemSubclass: item.inspectionItemSubclass, unit:item.unit, - tell:tell, + ask:ask, result:n.result, id:item.id, often:n.often, @@ -649,8 +649,8 @@ this.$set( this.loading, y, true) // this.loading[y] = true this.$axios.post(this.$api.insOrderPlan.saveInsContext2, { - orderId:this.orderId, - sampleId:this.sampleId, + // orderId:this.orderId, + sampleId:this.orderId, sonLaboratory:h.projectList[0].sonLaboratory, frequency:h.band, insProductResult2s:arr -- Gitblit v1.9.3