From 6eac588d18ef1e98dd0c6979aec9741a91044d80 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期五, 12 七月 2024 09:42:36 +0800
Subject: [PATCH] 修改代码
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 624cc27..e70a6a0 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>
@@ -301,7 +301,7 @@
<template v-if="n.v.ps!=undefined && n.v.ps.value==='妫�楠屽��' && state==1">
<el-input v-if="getInspectionValueType(n.i) == 1" class="table_input" v-model="n.v.v"
:disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')"
- @input="handleInput(n)" @blur="bigNum(n)"
+ @input="handleInput(n)"
@change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`, n)" @mousewheel.native.prevent :key="'abc-'+'000'+index+'000'+i+'000'+j">
<el-button slot="append" type="primary" icon="el-icon-edit" size="mini"
v-if="getInspectionItemType(n.i) == 1" @click="getSystemValue(n)"></el-button>
@@ -517,7 +517,7 @@
<el-table-column
prop="comValue"
align="center"
- label="骞冲潎鍊�"
+ label="琛板噺绯绘暟"
min-width="150">
</el-table-column>
<el-table-column
@@ -1670,6 +1670,10 @@
},
changeInput(m, code, n) {
if (n) {
+ // if (this.PROJECT === '瑁呭鐢电紗') {
+ // let num2 = new this.$Big(n.v.v)
+ // n.v.v = num2.toExponential()
+ // }
// 瀹氫箟涓�涓嚱鏁版潵楠岃瘉鍒嗘暟鏄惁鏈夋晥
function isValidFraction(fraction) {
const [numerator, denominator] = fraction.split('/'); // 鍒嗗瓙鍜屽垎姣�
@@ -1698,12 +1702,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)
@@ -1816,8 +1824,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) {
@@ -1852,12 +1859,6 @@
n.v.v = n.v.v.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
n.v.v = n.v.v.replace(/\/{2,}/g,"/"); //鍙繚鐣欑涓�涓�/娓呴櫎澶氫綑鐨�
n.v.v = n.v.v.replace("/","$#$").replace(/\//g,"").replace("$#$","/");
- },
- bigNum (n) {
- if (n.v.v > 10000 && this.PROJECT === '瑁呭鐢电紗') {
- let num2 = new this.$Big(n.v.v)
- n.v.v = num2.toExponential()
- }
},
getInspectionItemType(id) {
for (var a in this.currentSample.insProduct) {
--
Gitblit v1.9.3