From 47431e32e426d14736415ac0cc9cdcd88f7c07e5 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 22 四月 2024 18:02:20 +0800
Subject: [PATCH] 优化检验任务计算
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index e45dc8f..b7b216e 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -784,7 +784,15 @@
valueList.forEach(b => {
str = str.replace(b.name, b.value)
})
- comResult = eval(str)
+ if(item.v.f.includes('/')>-1){
+ if(Object.getOwnPropertyNames(comValue).length==valueList.length){
+ comResult = eval(str)
+ }else{
+ comResult = ''
+ }
+ }else{
+ comResult = eval(str)
+ }
break;
}
list.forEach(a => {
@@ -835,7 +843,7 @@
let regex = /[=\+\-\*\%\(\)\/\s]/g
let mode = item.v.f.replace(regex, ' ').split(' ');
mode.filter(m => m && !Number(m)).forEach(m => {
- let r = m.split('')[1] - 1
+ let r = m.replace(/[a-zA-Z]/g, "") - 1
let c = this.comparisonList.find(j => j.label == m.split('')[0]).value
valueList.push({
c,
--
Gitblit v1.9.3