From 0230dbe06ce2bf124b9f1ddc822e97c6cefe96b8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 12 八月 2020 23:19:27 +0800
Subject: [PATCH] 2020-08-12

---
 src/utils/utils.js |  142 +++++++++++++++++++++++-----------------------
 1 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 3fa55b7..7808f1e 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1248,6 +1248,77 @@
         `
       })
     }
+    
+    // 鑷畾涔夐獙璇�
+    verify.customverifys && verify.customverifys.forEach(item => {        
+      _sql += `
+        /* 鑷畾涔夐獙璇� */
+        select @tbid='', @ErrorCode='',@retmsg=''
+        select top 1 @tbid='X' from (${item.sql}) a
+        If @tbid ${item.result === 'true' ? '!=' : '='}''
+        Begin
+          select @ErrorCode='${item.errorCode}',@retmsg='${item.errmsg}'
+          goto aaa
+        end
+        `
+    })
+
+    // 鍗曞彿鐢熸垚锛屼娇鐢ㄤ笂绾d锛圔ID锛夋垨鍒楄〃鏁版嵁锛屽0鏄庡彉閲忥紙妫�楠岋級
+    let _billcodesSql  = ''
+    if (verify.billcodes && verify.billcodes.length > 0) {
+      verify.billcodes.forEach(item => {
+        let _ModularDetailCode = ''
+        let _lpline = ''
+        if (item.TypeCharOne === 'Lp') {
+          if (item.linkField === 'BID' && BID) { // 鏇挎崲bid
+            _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@BID@,48)`
+          } else {
+            _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@${item.linkField},48)`
+          }
+          _ModularDetailCode = '@ModularDetailCode'
+        } else if (item.TypeCharOne === 'BN') {
+          let _val = ''
+          if (item.linkField === 'BID' && BID) { // 鏇挎崲bid
+            _val = BID
+          } else if (data && data.hasOwnProperty(item.linkField)) {
+            _val = data[item.linkField]
+          }
+          _ModularDetailCode = `'${item.TypeCharOne + _val}'`
+        } else {
+          _ModularDetailCode = `'${item.ModularDetailCode}'`
+        }
+
+        let _declare = ''
+        let _key = item.field.toLowerCase()
+
+        if (!_vars.includes(_key)) {
+          _declare = `Declare @${_key} nvarchar(50)`
+          _vars.push(_key)
+        }
+
+        _billcodesSql += `
+        /* 鍗曞彿鐢熸垚 */
+        ${_declare}
+        select @BillCode='', @${_key}='', @ModularDetailCode=''
+        ${_lpline}
+        exec s_get_BillCode
+          @ModularDetailCode=${_ModularDetailCode},
+          @Type=${item.Type},
+          @TypeCharOne='${item.TypeCharOne}',
+          @TypeCharTwo ='${item.TypeCharTwo}',
+          @BillCode =@BillCode output,
+          @ErrorCode =@ErrorCode output, 
+          @retmsg=@retmsg output
+        if @ErrorCode!=''
+          goto aaa
+        set @${_key}=@BillCode
+        `
+      })
+
+      if (_actionType !== 'insertOrUpdate') {
+        _sql += _billcodesSql
+      }
+    }
 
     // 鍞竴鎬ч獙璇侊紝蹇呴』瀛樺湪琛ㄥ崟锛堣〃鍗曞瓨鍦ㄦ椂锛屼富閿潎涓哄崟鍊硷級,蹇呴』濉啓鏁版嵁婧愶紝澶氳鎷兼帴鏃朵笉鍙敤
     if (formdata && verify.uniques && verify.uniques.length > 0 && btn.Ot !== 'requiredOnce') {
@@ -1322,77 +1393,6 @@
         end
         `
       })
-    }
-    
-    // 鑷畾涔夐獙璇�
-    verify.customverifys && verify.customverifys.forEach(item => {        
-      _sql += `
-        /* 鑷畾涔夐獙璇� */
-        select @tbid='', @ErrorCode='',@retmsg=''
-        select top 1 @tbid='X' from (${item.sql}) a
-        If @tbid ${item.result === 'true' ? '!=' : '='}''
-        Begin
-          select @ErrorCode='${item.errorCode}',@retmsg='${item.errmsg}'
-          goto aaa
-        end
-        `
-    })
-
-    // 鍗曞彿鐢熸垚锛屼娇鐢ㄤ笂绾d锛圔ID锛夋垨鍒楄〃鏁版嵁锛屽0鏄庡彉閲忥紙妫�楠岋級
-    let _billcodesSql  = ''
-    if (verify.billcodes && verify.billcodes.length > 0) {
-      verify.billcodes.forEach(item => {
-        let _ModularDetailCode = ''
-        let _lpline = ''
-        if (item.TypeCharOne === 'Lp') {
-          if (item.linkField === 'BID' && BID) { // 鏇挎崲bid
-            _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@BID@,48)`
-          } else {
-            _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@${item.linkField},48)`
-          }
-          _ModularDetailCode = '@ModularDetailCode'
-        } else if (item.TypeCharOne === 'BN') {
-          let _val = ''
-          if (item.linkField === 'BID' && BID) { // 鏇挎崲bid
-            _val = BID
-          } else if (data && data.hasOwnProperty(item.linkField)) {
-            _val = data[item.linkField]
-          }
-          _ModularDetailCode = `'${item.TypeCharOne + _val}'`
-        } else {
-          _ModularDetailCode = `'${item.ModularDetailCode}'`
-        }
-
-        let _declare = ''
-        let _key = item.field.toLowerCase()
-
-        if (!_vars.includes(_key)) {
-          _declare = `Declare @${_key} nvarchar(50)`
-          _vars.push(_key)
-        }
-
-        _billcodesSql += `
-        /* 鍗曞彿鐢熸垚 */
-        ${_declare}
-        select @BillCode='', @${_key}='', @ModularDetailCode=''
-        ${_lpline}
-        exec s_get_BillCode
-          @ModularDetailCode=${_ModularDetailCode},
-          @Type=${item.Type},
-          @TypeCharOne='${item.TypeCharOne}',
-          @TypeCharTwo ='${item.TypeCharTwo}',
-          @BillCode =@BillCode output,
-          @ErrorCode =@ErrorCode output, 
-          @retmsg=@retmsg output
-        if @ErrorCode!=''
-          goto aaa
-        set @${_key}=@BillCode
-        `
-      })
-
-      if (_actionType !== 'insertOrUpdate') {
-        _sql += _billcodesSql
-      }
     }
 
     let hasvoucher = false

--
Gitblit v1.8.0