From d1b46161801b8b4641bdec066796d75d80eebb2f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 04 六月 2024 13:36:17 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master

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

diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index f0d7503..b3ed844 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1025,6 +1025,15 @@
                     return res < m.split('<')[1]
                   }else if (m.includes('>')) {
                     return res > m.split('>')[1]
+                  }else if (m.includes('~')) {
+                    let k = m.split('~')
+                    return res >= k[0] && res <= k[1]
+                  }else if(m.includes('-')){
+                    let k = m.split('-')
+                    return res >= k[0] && res <= k[1]
+                  }else if(m.includes('卤')){
+                    let k = m.split('卤')
+                    return res >= (k[0] - k[1]) && res <= (k[0] + k[1])
                   }
                 })
                 if(this.getInspectionValueType(item.i)==1){

--
Gitblit v1.9.3