From c5a07dba94694d13f0a78e051dfa26c3522933ee Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 十一月 2024 18:10:02 +0800
Subject: [PATCH] 2024-11-15

---
 src/templates/zshare/verifycard/index.jsx |   62 +++++++++++++++++--------------
 1 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index 9113732..d674655 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -723,9 +723,9 @@
       _fields = card.modal.fields || []
     }
 
-    let sysfields = ['UserName', 'FullName', 'RoleID', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear', 'ModularDetailCode', 'tbid', 'mk_deleted', 'bid']
-    let _declare = ['@UserName nvarchar(50)', '@FullName nvarchar(50)', '@RoleID nvarchar(512)', '@mk_departmentcode nvarchar(512)', '@mk_organization nvarchar(512)', '@mk_user_type nvarchar(20)', '@mk_nation nvarchar(50)', '@mk_province nvarchar(50)', '@mk_city nvarchar(50)', '@mk_district nvarchar(50)', '@mk_address nvarchar(100)', '@ErrorCode nvarchar(50)', '@retmsg nvarchar(4000)', '@BillCode nvarchar(50)', '@BVoucher nvarchar(50)', '@FIBVoucherDate nvarchar(50)', '@FiYear nvarchar(50)', '@ModularDetailCode nvarchar(50)', '@bid nvarchar(50)', '@tbid nvarchar(50)', '@mk_deleted int']
-    let _select = ['@UserName=\'\'', '@FullName=\'\'', '@RoleID=\'\'', '@mk_departmentcode=\'\'', '@mk_organization=\'\'', '@mk_user_type=\'\'', '@mk_nation=\'\'', '@mk_province=\'\'', '@mk_city=\'\'', '@mk_district=\'\'', '@mk_address=\'\'', '@ErrorCode=\'\'', '@retmsg=\'\'', '@BillCode=\'\'', '@BVoucher=\'\'', '@FIBVoucherDate=\'\'', '@FiYear=\'\'', '@ModularDetailCode=\'\'', '@bid=\'\'', '@mk_deleted=1']
+    let sysfields = ['UserName', 'FullName', 'RoleID', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear', 'ModularDetailCode', 'tbid', 'mk_deleted', 'bid', 'mk_submit_type']
+    let _declare = ['@UserName nvarchar(50)', '@FullName nvarchar(50)', '@RoleID nvarchar(512)', '@mk_departmentcode nvarchar(512)', '@mk_organization nvarchar(512)', '@mk_user_type nvarchar(20)', '@mk_nation nvarchar(50)', '@mk_province nvarchar(50)', '@mk_city nvarchar(50)', '@mk_district nvarchar(50)', '@mk_address nvarchar(100)', '@ErrorCode nvarchar(50)', '@retmsg nvarchar(4000)', '@BillCode nvarchar(50)', '@BVoucher nvarchar(50)', '@FIBVoucherDate nvarchar(50)', '@FiYear nvarchar(50)', '@ModularDetailCode nvarchar(50)', '@bid nvarchar(50)', '@tbid nvarchar(50)', '@mk_deleted int', '@mk_submit_type nvarchar(50)']
+    let _select = ['@UserName=\'\'', '@FullName=\'\'', '@RoleID=\'\'', '@mk_departmentcode=\'\'', '@mk_organization=\'\'', '@mk_user_type=\'\'', '@mk_nation=\'\'', '@mk_province=\'\'', '@mk_city=\'\'', '@mk_district=\'\'', '@mk_address=\'\'', '@ErrorCode=\'\'', '@retmsg=\'\'', '@BillCode=\'\'', '@BVoucher=\'\'', '@FIBVoucherDate=\'\'', '@FiYear=\'\'', '@ModularDetailCode=\'\'', '@bid=\'\'', '@mk_deleted=1', '@mk_submit_type=\'\'']
     
     let fieldArr = sysfields.map(_f => _f.toLowerCase())
     let hasBid = false
@@ -754,13 +754,14 @@
     let formfields = []
     _fields = _fields.filter(_f => _f.field)
     _fields.forEach(_f => {
-      if (_f.field.toLowerCase() === 'bid') {
+      let key = _f.field.toLowerCase()
+      if (key === 'bid') {
         hasBid = true
       }
 
-      if (fieldArr.includes(_f.field.toLowerCase())) return
+      if (fieldArr.includes(key)) return
 
-      fieldArr.push(_f.field.toLowerCase())
+      fieldArr.push(key)
 
       formfields.push(_f.field)
 
@@ -791,6 +792,8 @@
       } else {
         _select.push(`@${_f.field}=''`)
       }
+
+      if (['appkey'].includes(key)) return
 
       _declare.push(`@${_f.field} ${_type}`)
     })
@@ -831,31 +834,34 @@
             _select.push(`@${_f.field}=''`)
           }
 
+          if (['appkey'].includes(key)) return
+
           _declare.push(`@${_f.field} ${_f.datatype}`)
-          return
-        }
-
-        let _fieldlen = _f.fieldlength || 50
-
-        if (_fieldlen > 4000) {
-          _fieldlen = 'max'
-        }
-
-        let _type = `nvarchar(${_fieldlen})`
-
-        if (_f.type === 'number') {
-          _type = `decimal(18,${_f.decimal ? _f.decimal : 0})`
-        } else if (_f.type === 'picture' || _f.type === 'textarea') {
-          _type = `nvarchar(${_fieldlen})`
-        }
-
-        if (_f.type === 'number') {
-          _select.push(`@${_f.field}=1`)
         } else {
-          _select.push(`@${_f.field}=''`)
-        }
+          let _fieldlen = _f.fieldlength || 50
+  
+          if (_fieldlen > 4000) {
+            _fieldlen = 'max'
+          }
+  
+          let _type = `nvarchar(${_fieldlen})`
+  
+          if (_f.type === 'number') {
+            _type = `decimal(18,${_f.decimal ? _f.decimal : 0})`
+          } else if (_f.type === 'picture' || _f.type === 'textarea') {
+            _type = `nvarchar(${_fieldlen})`
+          }
+  
+          if (_f.type === 'number') {
+            _select.push(`@${_f.field}=1`)
+          } else {
+            _select.push(`@${_f.field}=''`)
+          }
+  
+          if (['appkey'].includes(key)) return
 
-        _declare.push(`@${_f.field} ${_type}`)
+          _declare.push(`@${_f.field} ${_type}`)
+        }
       })
     }
 

--
Gitblit v1.8.0