From a62d9ff3b7bebf15f1bee8827ed5c263d9a1776c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 06 六月 2024 13:47:44 +0800
Subject: [PATCH] 在检验执行的模板渲染进行处理

---
 src/components/do/b1-ins-order/add.vue |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 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('鏈�夋嫨瀹㈡埛鍗曚綅')

--
Gitblit v1.9.3