From 1e351d63cbdfc663a7ba528cbc43aa1f5288aa6c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 03 三月 2024 23:57:20 +0800
Subject: [PATCH] 2024-03-03
---
src/templates/zshare/verifycard/index.jsx | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index a824e90..4617c6c 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -44,7 +44,8 @@
emailCodes: [], // 閭妯℃澘
verify: {},
fields: [],
- usefulfields: '',
+ formfields: '',
+ colfields: '',
defaultsql: '', // 榛樿Sql
orderModular: [],
orderModularDetail: [],
@@ -715,15 +716,12 @@
_fields = card.modal.fields || []
}
- let _usefulfields = ['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']
+ 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 fieldArr = _usefulfields.map(_f => _f.toLowerCase())
- let hasBid = false
-
- _usefulfields = []
- fieldArr.push('bid')
+ let fieldArr = sysfields.map(_f => _f.toLowerCase())
+ let hasBid = false
let verIndex = _fields.findIndex(item => item.type === 'vercode')
if (verIndex > -1) {
@@ -746,6 +744,7 @@
})
}
+ let formfields = []
_fields = _fields.filter(_f => _f.field)
_fields.forEach(_f => {
if (_f.field.toLowerCase() === 'bid') {
@@ -756,7 +755,7 @@
fieldArr.push(_f.field.toLowerCase())
- _usefulfields.push(_f.field)
+ formfields.push(_f.field)
let _fieldlen = _f.fieldlength || 50
@@ -799,6 +798,7 @@
let unionFields = fromJS(_fields).toJS()
let formArr = _fields.map(_f => _f.field.toLowerCase())
+ let colfields = []
if (card.Ot !== 'notRequired' && columns) {
columns.forEach(_f => {
if (!_f.field) return
@@ -813,7 +813,7 @@
if (fieldArr.includes(key)) return
fieldArr.push(key)
- _usefulfields.push(_f.field)
+ colfields.push(_f.field)
if (_f.datatype) { // 鑷畾涔夊瓧娈�
if (/decimal/ig.test(_f.datatype)) {
@@ -1033,7 +1033,8 @@
columnsFields: _columns,
initsql: _sql,
defaultsql: _defaultsql,
- usefulfields: _usefulfields.join(', '),
+ formfields: formfields.join(', '),
+ colfields: colfields.join(', '),
uniqueColumns: this.state.uniqueColumns.map(col => {
if (col.dataIndex === 'field') {
col.options = uniqueFields
@@ -1664,7 +1665,7 @@
render() {
const { card, columns } = this.props
- const { activeKey, verifyInter, verify, fields, uniqueFields, uniqueColumns, unionFields, onceUniqueColumns, columnsFields, contrastColumns, customColumns, orderColumns, scriptsColumns, cbScriptsColumns, orderModular, orderModularDetail, voucher, voucherDetail, notes, emailCodes, appType } = this.state
+ const { activeKey, verifyInter, verify, fields, uniqueFields, uniqueColumns, unionFields, onceUniqueColumns, columnsFields, contrastColumns, customColumns, orderColumns, scriptsColumns, cbScriptsColumns, orderModular, orderModularDetail, voucher, voucherDetail, notes, emailCodes, appType, formfields, colfields } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -1706,7 +1707,8 @@
<CustomForm
btn={this.props.card}
initsql={this.state.initsql}
- usefulfields={this.state.usefulfields}
+ formfields={formfields}
+ colfields={colfields}
customChange={this.customChange}
wrappedComponentRef={(inst) => this.customForm = inst}
/>
@@ -1778,7 +1780,8 @@
customScripts={verify.scripts}
useDefaultSql={verify.default !== 'false'}
defaultsql={this.state.defaultsql}
- usefulfields={this.state.usefulfields}
+ formfields={formfields}
+ colfields={colfields}
systemScripts={this.state.systemScripts}
scriptsChange={this.scriptsChange}
wrappedComponentRef={(inst) => this.scriptsFullForm = inst}
@@ -1792,7 +1795,8 @@
customScripts={verify.scripts}
useDefaultSql={verify.default !== 'false'}
defaultsql={this.state.defaultsql}
- usefulfields={this.state.usefulfields}
+ formfields={formfields}
+ colfields={colfields}
systemScripts={this.state.systemScripts}
scriptsChange={this.scriptsChange}
wrappedComponentRef={(inst) => this.scriptsForm = inst}
@@ -1817,7 +1821,8 @@
btn={this.props.card}
initsql={this.state.initsql}
customScripts={verify.cbScripts}
- usefulfields={this.state.usefulfields}
+ formfields={formfields}
+ colfields={colfields}
systemScripts={this.state.systemScripts}
scriptsChange={this.cbScriptsChange}
wrappedComponentRef={(inst) => this.cbscriptsFullForm = inst}
@@ -1827,7 +1832,8 @@
btn={this.props.card}
initsql={this.state.initsql}
customScripts={verify.cbScripts}
- usefulfields={this.state.usefulfields}
+ formfields={formfields}
+ colfields={colfields}
systemScripts={this.state.systemScripts}
scriptsChange={this.cbScriptsChange}
wrappedComponentRef={(inst) => this.cbscriptsForm = inst}
--
Gitblit v1.8.0