From 08baded6ebee74bb3a3cb9c15c63fb09c0d120f8 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 05 六月 2024 15:37:52 +0800
Subject: [PATCH] 完成RTS
---
src/components/do/b1-ins-order/add.vue | 15 ++++++++++-----
src/main.js | 4 ++--
src/components/do/b1-ins-order/fiberoptic-config.vue | 2 +-
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index c33889d..82e3105 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -740,26 +740,31 @@
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) {
this.$message.error('鏈�夋嫨瀹㈡埛鍗曚綅')
diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index 4066118..c20a16e 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -289,7 +289,7 @@
}
})
this.models = this.models.replace(',', '')
- this.packageInfo.ismiers = this.models.split(',').every(e=>(e.indexOf('d')>-1||e.indexOf('D')))
+ this.packageInfo.ismiers = this.models.split(',').every(e=>(e.indexOf('d')>-1||e.indexOf('D')>-1))
if(this.sample[0].bushing === undefined || this.sample[0].bushing === null){
this.bushing = []
}else{
diff --git a/src/main.js b/src/main.js
index fd0ce3c..18e552a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,8 +13,8 @@
//鏈湴
Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
-// const javaApi = 'http://192.168.11.200:8001';//鏉�
-const javaApi = 'http://192.168.11.249:8001';//寮�
+const javaApi = 'http://192.168.11.200:8001';//鏉�
+// const javaApi = 'http://192.168.11.249:8001';//寮�
// const javaApi = 'http://172.20.10.3:8001';//濮�
// const javaApi = 'http://192.168.11.2:8001';//鏌�
// const javaApi = 'http://127.0.0.1:8001';//鏅�
--
Gitblit v1.9.3