From 1adf527b99dd79ffd45796325710f0896756841c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 07 八月 2024 21:44:39 +0800
Subject: [PATCH] 光纤配置查看
---
src/components/do/b1-ins-order/add.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 881bda3..225de2c 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('卤')
@@ -2956,9 +2960,8 @@
getTotal() {
this.totalArr = []
this.total = 0;
- // console.log(this.sampleList)
this.sampleList.forEach(item => {
- if (item.insProduct && item.insProduct.length > 0) {
+ if (item.insProduct && item.insProduct.length > 0) {
item.insProduct.forEach(a => {
this.totalArr.push(a)
})
--
Gitblit v1.9.3