From 5d3a7df62a0b0197ddd3fc7d3bcc65fe8f5bc75e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 12 七月 2024 13:20:55 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 5c222e7..a51e023 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -278,11 +278,11 @@
</el-radio-group>
<el-form :inline="true" :model="otherForm" class="form-inline" label-width="50px" style="padding-top: 0;padding-left: 10px;" v-if="PROJECT=='妫�娴嬩腑蹇�'">
<el-form-item label="娓╁害:" style="margin-bottom: 0;">
- <el-input clearable v-model="otherForm.temperature" size="small" placeholder="" style="width: 100px;" @change="m=>subOtherForm(m,'temperature')"></el-input>
+ <el-input v-model="otherForm.temperature" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'temperature')"></el-input>
<span style="margin-left: 4px;">鈩�</span>
</el-form-item>
<el-form-item label="婀垮害:" style="margin-bottom: 0;">
- <el-input clearable v-model="otherForm.humidity" size="small" placeholder="" style="width: 100px;" @change="m=>subOtherForm(m,'humidity')"></el-input>
+ <el-input v-model="otherForm.humidity" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'humidity')"></el-input>
<span style="margin-left: 4px;">%</span>
</el-form-item>
</el-form>
@@ -517,7 +517,7 @@
<el-table-column
prop="comValue"
align="center"
- label="骞冲潎鍊�"
+ label="琛板噺绯绘暟"
min-width="150">
</el-table-column>
<el-table-column
@@ -1478,16 +1478,26 @@
str += c.v.v
count4 += 1
}
+ }else if (c.v.ps != undefined && c.v.ps.value === '妫�楠屽瓙瀛愰」') {
+ console.log('妫�楠屽瓙瀛愰」',c)
+ if (count4 === 2) {
+ str += c.v.v
+ count4 += 1
+ }
}
}
})
if (str != '') {
let count2 = 0
for (let i in this.currentSample.insProduct) {
+ console.log(this.currentSample
+ .insProduct[i].inspectionItem,'---',this.currentSample
+ .insProduct[i].inspectionItemSubclass,'---',this.currentSample.insProduct[i].inspectionItemClass,'===',str,this.currentSample
+ .insProduct[i])
if (this.currentSample.insProduct[i].templateId === a.templateId && this.currentSample
.insProduct[i].inspectionItem +
(this.currentSample.insProduct[i].inspectionItemSubclass == null ? '' : this.currentSample
- .insProduct[i].inspectionItemSubclass) ===
+ .insProduct[i].inspectionItemSubclass+this.currentSample.insProduct[i].inspectionItemClass==null?'':this.currentSample.insProduct[i].inspectionItemClass) ===
str) {
ids.push({
r: b.r,
@@ -1670,10 +1680,10 @@
},
changeInput(m, code, n) {
if (n) {
- if (n.v.v > 10000 && this.PROJECT === '瑁呭鐢电紗') {
- let num2 = new this.$Big(n.v.v)
- n.v.v = num2.toExponential()
- }
+ // if (this.PROJECT === '瑁呭鐢电紗') {
+ // let num2 = new this.$Big(n.v.v)
+ // n.v.v = num2.toExponential()
+ // }
// 瀹氫箟涓�涓嚱鏁版潵楠岃瘉鍒嗘暟鏄惁鏈夋晥
function isValidFraction(fraction) {
const [numerator, denominator] = fraction.split('/'); // 鍒嗗瓙鍜屽垎姣�
@@ -1702,12 +1712,16 @@
this.result = JSON.parse(event.data);
switch (this.result.method){
case 'saveInsContext':
- this.tableList = this.result.value.tableList
- this.param = this.result.value.param
- this.saveInsContext()
+ this.$nextTick(()=>{
+ this.tableList = this.result.value.tableList
+ this.param = this.result.value.param
+ this.saveInsContext()
+ })
break;
case 'tableList':
- this.tableList = this.result.value
+ this.$nextTick(()=>{
+ this.tableList = this.result.value
+ })
break;
case 'getCurrentInsProduct':
this.getCurrentInsProduct(this.result.value)
@@ -1820,8 +1834,7 @@
}
},
getValue(v){
- let str = v.v?v.v:(v.ct&&v.ct.s?v.ct.s.length>0&&v.ct.s[0].v.replace(new RegExp('\n', 'g'), '<br/>'):'')
- // str.replace(new RegExp(search, 'g'), replace)
+ let str = v.v?v.v:(v.ct&&v.ct.s?v.ct.s.length>0&&v.ct.s[0].v.replace(new RegExp('\n', 'g'), '<br/>').replace(new RegExp('@', 'g'), '<br/>'):'')
return str
},
getInspectionValueType(id) {
--
Gitblit v1.9.3