From 8f6b3d26bde4e22773cc53386dfbae669a7472ed Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 13 十月 2020 09:16:21 +0800
Subject: [PATCH] 2020-10-13

---
 src/utils/utils.js |   82 +++++++++++++++++++++--------------------
 1 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index b7ad801..952b283 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1043,53 +1043,51 @@
     let _declarefields = []
 
     // 鑾峰彇瀛楁閿�煎
-    if (formdata) {
-      formdata.forEach(form => {
-        if (form.type === 'text') { // 鐗规畩瀛楁鏇挎崲
-          form.value = form.value.replace(/^(\s*)@appkey@(\s*)$/ig, appkey)
-          form.value = form.value.replace(/^(\s*)@SessionUid@(\s*)$/ig, sessionUid)
-          form.value = form.value.replace(/^(\s*)@bid@(\s*)$/ig, BID)
-        }
+    formdata && formdata.forEach(form => {
+      if (form.type === 'text') { // 鐗规畩瀛楁鏇挎崲
+        form.value = form.value.replace(/^(\s*)@appkey@(\s*)$/ig, appkey)
+        form.value = form.value.replace(/^(\s*)@SessionUid@(\s*)$/ig, sessionUid)
+        form.value = form.value.replace(/^(\s*)@bid@(\s*)$/ig, BID)
+      }
 
-        _formFieldValue[form.key] = form.value
-        let _key = form.key.toLowerCase()
+      _formFieldValue[form.key] = form.value
+      let _key = form.key.toLowerCase()
 
-        if (!_initvars.includes(_key)) {
-          _initvars.push(_key)
+      if (!_initvars.includes(_key)) {
+        _initvars.push(_key)
 
-          if (form.type === 'number') {
-            let val = form.value
-            if (typeof(val) !== 'number') {
-              val = parseFloat(val)
-              if (isNaN(val)) {
-                val = 0
-              }
+        if (form.type === 'number') {
+          let val = form.value
+          if (typeof(val) !== 'number') {
+            val = parseFloat(val)
+            if (isNaN(val)) {
+              val = 0
             }
-            _initfields.push(`@${_key}=${val}`)
-          } else {
-            _initfields.push(`@${_key}='${form.value}'`)
           }
+          _initfields.push(`@${_key}=${val}`)
+        } else {
+          _initfields.push(`@${_key}='${form.value}'`)
         }
-        
-        if (!_vars.includes(_key)) {
-          _vars.push(_key)
+      }
+      
+      if (!_vars.includes(_key)) {
+        _vars.push(_key)
 
-          if (form.fieldlen && form.fieldlen > 2048) {
-            form.fieldlen = 'max'
-          }
-
-          let _type = `nvarchar(${form.fieldlen})`
-
-          if (form.type.match(/date/ig)) {
-            _type = 'datetime'
-          } else if (form.type === 'number') {
-            _type = `decimal(18,${form.fieldlen})`
-          }
-
-          _declarefields.push(`@${_key} ${_type}`)
+        if (form.fieldlen && form.fieldlen > 2048) {
+          form.fieldlen = 'max'
         }
-      })
-    }
+
+        let _type = `nvarchar(${form.fieldlen})`
+
+        if (form.type.match(/date/ig)) {
+          _type = 'datetime'
+        } else if (form.type === 'number') {
+          _type = `decimal(18,${form.fieldlen})`
+        }
+
+        _declarefields.push(`@${_key} ${_type}`)
+      }
+    })
 
     // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
     if (data && btn.Ot !== 'notRequired' && btn.Ot !== 'requiredOnce') {
@@ -1269,8 +1267,12 @@
 
     // 鍗曞彿鐢熸垚锛屼娇鐢ㄤ笂绾d锛圔ID锛夋垨鍒楄〃鏁版嵁锛屽０鏄庡彉閲忥紙妫�楠岋級
     let _billcodesSql  = ''
-    if (verify.billcodes && verify.billcodes.length > 0) {
+    if (formdata && verify.billcodes && verify.billcodes.length > 0) {
+      let keys = formdata.map(item => item.key.toLowerCase()) // 琛ㄥ崟瀛楁
+
       verify.billcodes.forEach(item => {
+        if (!keys.includes(item.field.toLowerCase())) return // 琛ㄥ崟涓笉鍚崟鍙风敓鎴愬瓧娈�
+
         let _ModularDetailCode = ''
         let _lpline = ''
         if (item.TypeCharOne === 'Lp') {

--
Gitblit v1.8.0