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 | 140 ++++++++++++++++++++++++++--------------------
1 files changed, 78 insertions(+), 62 deletions(-)
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index 7c507ab..d674655 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -663,20 +663,20 @@
_verify.printTempId = ''
}
- if (window.GLOB.funcs && window.GLOB.funcs.length > 0) {
- window.GLOB.funcs.forEach(m => {
- let reg = new RegExp(`\\/\\*\\$ex@${m.func_code}-begin\\*\\/[\\s\\S]+\\/\\*@ex\\$-end\\*\\/`, 'ig')
- _verify.customverifys.forEach(item => {
- item.sql = item.sql.replace(reg, `$ex@${m.func_code}@ex$`)
- })
- _verify.scripts.forEach(item => {
- item.sql = item.sql.replace(reg, `$ex@${m.func_code}@ex$`)
- })
- _verify.cbScripts.forEach(item => {
- item.sql = item.sql.replace(reg, `$ex@${m.func_code}@ex$`)
- })
- })
- }
+ // if (window.GLOB.funcs && window.GLOB.funcs.length > 0) {
+ // window.GLOB.funcs.forEach(m => {
+ // let reg = new RegExp(`\\/\\*\\$ex@${m.func_code}-begin\\*\\/[\\s\\S]+\\/\\*@ex\\$-end\\*\\/`, 'ig')
+ // _verify.customverifys.forEach(item => {
+ // item.sql = item.sql.replace(reg, `$ex@${m.func_code}@ex$`)
+ // })
+ // _verify.scripts.forEach(item => {
+ // item.sql = item.sql.replace(reg, `$ex@${m.func_code}@ex$`)
+ // })
+ // _verify.cbScripts.forEach(item => {
+ // item.sql = item.sql.replace(reg, `$ex@${m.func_code}@ex$`)
+ // })
+ // })
+ // }
_verify.customverifys.forEach((item, i) => {
item.$index = i + 1
@@ -695,11 +695,19 @@
activeKey = 'cbScripts'
}
+ let oriVerify = fromJS(_verify).toJS()
+
+ if (_verify.wxAppId) {
+ if (!window.GLOB.WXApps || window.GLOB.WXApps.filter(app => app.appType === 'public').length === 0) {
+ delete _verify.wxAppId
+ }
+ }
+
this.setState({
activeKey: activeKey,
verifyInter: verifyInter,
verify: _verify,
- oriVerify: fromJS(_verify).toJS()
+ oriVerify: oriVerify
})
if (card.intertype === 'inner') return
@@ -715,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
@@ -746,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)
@@ -783,6 +792,8 @@
} else {
_select.push(`@${_f.field}=''`)
}
+
+ if (['appkey'].includes(key)) return
_declare.push(`@${_f.field} ${_type}`)
})
@@ -823,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}`)
+ }
})
}
@@ -1159,7 +1173,6 @@
}
orderSql = (record) => {
- let _ModularDetailCode = ''
let _lpline = ''
if (record.TypeCharOne === 'Lp') {
if (record.linkField.toLowerCase() === 'bid') {
@@ -1167,17 +1180,20 @@
} else {
_lpline = `set @ModularDetailCode= 'Lp'+ right('${record.mark || this.props.card.uuid}'+@${record.linkField.toLowerCase()},48)`
}
- _ModularDetailCode = '@ModularDetailCode'
} else if (record.TypeCharOne === 'BN') {
- _ModularDetailCode = `'${record.TypeCharOne}'`
+ if (record.linkField.toLowerCase() === 'bid') {
+ _lpline = `set @ModularDetailCode= 'BN'+ right(@BID@,48)`
+ } else {
+ _lpline = `set @ModularDetailCode= 'BN'+ right(@${record.linkField.toLowerCase()},48)`
+ }
} else {
- _ModularDetailCode = `'${record.ModularDetailCode}'`
+ _lpline = `set @ModularDetailCode= right('${record.ModularDetailCode}',50)`
}
let sql = `select @BillCode='', @${record.field}='', @ModularDetailCode=''
${_lpline}
exec s_get_BillCode
- @ModularDetailCode=${_ModularDetailCode},
+ @ModularDetailCode=@ModularDetailCode,
@Type=${record.Type},
@TypeCharOne='${record.TypeCharOne}',
@TypeCharTwo ='${record.TypeCharTwo}',
@@ -1585,20 +1601,20 @@
msg = '鑷畾涔夎剼鏈�'
}
- if (window.GLOB.funcs && window.GLOB.funcs.length > 0) {
- window.GLOB.funcs.forEach(m => {
- let reg = new RegExp('\\$ex@' + m.func_code + '@ex\\$', 'ig')
- verify.customverifys.forEach(item => {
- item.sql = item.sql.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`)
- })
- verify.scripts.forEach(item => {
- item.sql = item.sql.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`)
- })
- verify.cbScripts.forEach(item => {
- item.sql = item.sql.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`)
- })
- })
- }
+ // if (window.GLOB.funcs && window.GLOB.funcs.length > 0) {
+ // window.GLOB.funcs.forEach(m => {
+ // let reg = new RegExp('\\$ex@' + m.func_code + '@ex\\$', 'ig')
+ // verify.customverifys.forEach(item => {
+ // item.sql = item.sql.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`)
+ // })
+ // verify.scripts.forEach(item => {
+ // item.sql = item.sql.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`)
+ // })
+ // verify.cbScripts.forEach(item => {
+ // item.sql = item.sql.replace(reg, `/*$ex@${m.func_code}-begin*/\n${m.key_sql}\n/*@ex$-end*/`)
+ // })
+ // })
+ // }
delete verify.limitInvalid
delete verify.limitText
--
Gitblit v1.8.0