From bb661732a2c5211938e316734dda79ff2d88f749 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期四, 04 七月 2024 12:52:03 +0800
Subject: [PATCH] 表格输入框分数计算
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 10 ++++++----
src/util/excelFountion.js | 4 +++-
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 3ce4408..f1f8f3b 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -300,9 +300,9 @@
:style="`width:${handleWidth(n)}px !important;min-height:${item.style.rowlen[n.r]}px;`">
<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)"
- @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)" @mousewheel.native.prevent :key="'abc-'+'000'+index+'000'+i+'000'+j">
+ :disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')"
+ @input="handleInput(n)" @blur="bigNum(n)"
+ @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)" @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>
</el-input>
@@ -1999,11 +1999,13 @@
return sum
},
handleInput (n) {
+ n.v.v = n.v.v.replace(/[^\d.^e/]/g, '');
+ },
+ bigNum (n) {
if (n.v.v > 10000 && this.PROJECT === '瑁呭鐢电紗') {
let num2 = new this.$Big(n.v.v)
n.v.v = num2.toExponential()
}
- n.v.v = n.v.v.replace(/[^\d.^e/]/g, '');
},
getInspectionItemType(id) {
for (var a in this.currentSample.insProduct) {
diff --git a/src/util/excelFountion.js b/src/util/excelFountion.js
index 1fa318f..8399698 100644
--- a/src/util/excelFountion.js
+++ b/src/util/excelFountion.js
@@ -319,7 +319,9 @@
if(typeof(comValue[a])=='string'&&comValue[a].includes('^')){
// 璁$畻骞傛
arr[a] = CalculatePower(comValue[a])
- }else{
+ } else if (typeof(comValue[a])=='string'&&comValue[a].includes('/')) {
+ arr[a] = comValue[a]
+ } else{
arr[a] = comValue[a]
}
}
--
Gitblit v1.9.3