From 32fb43e06c0f3be9e4a1763286217bad5d7bba4d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 06 六月 2024 14:10:59 +0800
Subject: [PATCH] 修改检验下单bug
---
src/components/do/b1-ins-order/add.vue | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index c33889d..cdb6fed 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -740,25 +740,30 @@
if(ask.includes('&')){
// 澶氫釜鏉′欢
let arr0 = ask.split('&')
+ let arr1 = []
arr0.forEach(m=>{
let index = code.findIndex(b=>m.includes(b))
if(index>-1){
- let arr = m.split(code[index]).find(b=>b)
- let num = eval(arr[0].replace(/RTS/g, this.RTS))
+ let arr = m.split(code[index]).filter(b=>!!b)
+ let num = eval(this.replaceAll(arr[0],'RTS', this.RTS))
m = code[index] + ''+ num
+ arr1.push(m)
}
})
- return arr0.join('&')
+ return arr1.join('&')
}else{
// 鍗曚釜鏉′欢
let index = code.findIndex(b=>ask.includes(b))
if(index>-1){
- let arr = ask.split(code[index]).find(b=>b)
- let num = eval(arr[0].replace(/RTS/g, this.RTS))
+ let arr = ask.split(code[index]).filter(b=>!!b)
+ let num = eval(this.replaceAll(arr[0],'RTS', this.RTS))
return code[index] + ''+ num
}
}
}
+ },
+ replaceAll(str, find, replace) {
+ return str.replace(new RegExp(find, 'g'), replace);
},
save() {
if (!this.addObj.companyId) {
@@ -783,18 +788,20 @@
this.$message.error('璇疯緭鍏ユ牱鍝佸瀷鍙�')
} else if (!this.sampleList.every(m => m.standardMethodListId)) {
this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
- }else if (this.totalArr.find(a=>a.ask.includes('RTS'))&&!this.RTS) {
+ }else if (this.totalArr.find(a=>a.ask.includes('RTS')&&a.state==1)&&!this.RTS) {
this.$message.error('璇疯緭鍏TS')
} else {
let sampleList = this.HaveJson(this.sampleList)
- let isRTS = this.totalArr.find(a=>a.ask.includes('RTS'))
+ let isRTS = this.totalArr.find(a=>a.ask.includes('RTS')&&a.state==1)
if(isRTS){
sampleList.forEach(item=>{
if(item.insProduct&&item.insProduct.length>0){
item.insProduct.forEach(a=>{
- let ask = this.handleAsk(a.ask)
- if(ask){
- a.ask = ask
+ if(a.state==1){
+ let ask = this.handleAsk(a.ask)
+ if(ask&&a.state==1){
+ a.ask = ask
+ }
}
})
}
@@ -805,9 +812,11 @@
a.fiber.forEach(b=>{
if(b.productList&&b.productList.length>0){
b.productList.forEach(c=>{
- let ask = this.handleAsk(c.ask)
- if(ask){
- c.ask = ask
+ if(c.state==1){
+ let ask = this.handleAsk(c.ask)
+ if(ask&&c.state==1){
+ c.ask = ask
+ }
}
})
}
@@ -817,9 +826,11 @@
a.fibers.forEach(b=>{
if(b.productList&&b.productList.length>0){
b.productList.forEach(c=>{
- let ask = this.handleAsk(c.ask)
- if(ask){
- c.ask = ask
+ if(c.state==1){
+ let ask = this.handleAsk(c.ask)
+ if(ask&&c.state==1){
+ c.ask = ask
+ }
}
})
}
@@ -827,9 +838,11 @@
b.fiber.forEach(c=>{
if(c.productList&&c.productList.length>0){
c.productList.forEach(d=>{
- let ask = this.handleAsk(d.ask)
- if(ask){
- d.ask = ask
+ if(d.state==1){
+ let ask = this.handleAsk(d.ask)
+ if(ask){
+ d.ask = ask
+ }
}
})
}
--
Gitblit v1.9.3