From 0f8aca36a23b098e40d94c5f0207b1cb5e409fa9 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 19 六月 2024 14:30:29 +0800
Subject: [PATCH] 修改检验任务bug

---
 src/components/do/b1-inspect-order-plan/Inspection.vue |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 8aa1334..489bd8d 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1161,6 +1161,7 @@
         }
         this.excelMethodList.forEach(item => {
           if (item.valueList.find(m => m.r == r && m.c == c)) {
+            console.log(item)
             var comValue = {}
             item.valueList.forEach(a => {
               list.forEach(b => {
@@ -1274,21 +1275,18 @@
                   valueList.forEach(b => {
                     str = str.replace(b.name, b.value)
                   })
-                  if (item.v.f.includes('/')) {
-                    if (Object.getOwnPropertyNames(comValue).length == valueList.length) {
-                      comResult = eval(str)
-                    } else {
-                      comResult = ''
-                    }
-                  } else {
+                  try {
                     if(this.getInspectionValueType(item.i)==1){
                       comResult = eval(str)
                     }else{
                       comResult = str
                     }
+                  } catch (error) {
+
                   }
                   break;
               }
+              console.log(comResult)
               list.forEach(a => {
                 if (a[0].r == item.r && comResult != '') {
                   for (var b in a) {

--
Gitblit v1.9.3