From 9b0a82931d2d4ef6fa877ebba59737a65ba37103 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 07 八月 2024 11:18:53 +0800
Subject: [PATCH] 检验下单-检验项要求值校验修改

---
 src/components/do/b1-ins-order/add.vue |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 881bda3..033ba53 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -1573,7 +1573,7 @@
               isHaveBushing = false
             }
           })
-          //杩囨护妫�娴嬮」锛氬幓闄ょ壒娈婇」(bsm=1),
+          //杩囨护妫�娴嬮」锛氬幓闄ょ壒娈婇」
           let filterProductList = this.productListSelected.filter(ele=>ele.bsm==0&&/[0-9]/.test(ele.ask)).filter(ele=>{
               if(select[1].indexOf('閫氫俊')>=0 && ['鍏夌紗','鍏夌氦'].includes(select[2])){
                 return !['娓╁害寰幆','鍏夌氦鎺ュご鎹熻��'].includes(ele.inspectionItem)
@@ -1646,11 +1646,15 @@
               }
             }
             if(ele.ask.indexOf('-')>0 && ele.ask.length>1){
+              let tell = ele.tell
+              if(ele.tell.indexOf('~')>0){
+                tell = ele.tell.replace('~','-')
+              }
               const splits = ele.ask.split('-')
               if(splits.length==2 && !isNaN(splits[0]) && !isNaN(splits[1])){
                 let min = Math.min(...splits)
                 let max = Math.max(...splits)
-                if(ele.tell.indexOf('卤')<0&&ele.tell!=ele.ask){
+                if(ele.tell.indexOf('卤')<0&&tell.indexOf(ele.ask)<0){
                   isTrue = false
                 }else if(ele.tell.indexOf('卤')>0&&ele.tell!=ele.ask){
                   let splitNums = ele.tell.split('卤')

--
Gitblit v1.9.3