From b20d0f21e53b3730de9ad1e7d96f25512620ff77 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 09 十月 2023 16:22:02 +0800
Subject: [PATCH] 2023-10-09
---
src/templates/zshare/verifycard/index.jsx | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index 3103749..df7c6dc 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -626,7 +626,7 @@
oriVerify: fromJS(_verify).toJS()
})
- if (config.Template !== 'FormTab' && card.intertype === 'inner') {
+ if (card.intertype === 'inner') {
return
}
@@ -637,11 +637,6 @@
field: card.field,
label: card.label,
type: 'text'
- })
- resolve(_fields)
- } else if (config.Template === 'FormTab') {
- config.groups.forEach(group => {
- _fields.push(...group.sublist)
})
resolve(_fields)
} else if (card.modal && (card.OpenType === 'pop' || !card.OpenType)) {
@@ -1553,7 +1548,7 @@
}
render() {
- const { card } = this.props
+ const { card, columns } = this.props
const { activeKey, verifyInter, setting, verify, fields, uniqueFields, uniqueColumns, unionFields, onceUniqueColumns, columnsFields, contrastColumns, customColumns, orderColumns, scriptsColumns, cbScriptsColumns, orderModular, orderModularDetail, voucher, voucherDetail, notes, appType } = this.state
const formItemLayout = {
labelCol: {
@@ -1576,7 +1571,7 @@
{verify.default === 'false' ? <span className="count-tip"><ExclamationOutlined style={{color: 'orange'}}/></span> : null}
</span>
} key="base">
- <BaseForm card={card} appType={appType} unionFields={unionFields} setting={setting} verify={verify} notes={notes} onChange={(verify) => this.setState({verify})} wrappedComponentRef={(inst) => this.baseForm = inst}/>
+ <BaseForm card={card} appType={appType} columns={columns} unionFields={unionFields} setting={setting} verify={verify} notes={notes} onChange={(verify) => this.setState({verify})} wrappedComponentRef={(inst) => this.baseForm = inst}/>
</TabPane> : null}
{verifyInter === 'system' ? <TabPane tab={
<span>
@@ -1612,7 +1607,7 @@
fields={fields}
btn={this.props.card}
billcodes={verify.billcodes}
- columns={this.props.columns}
+ columns={columns}
modular={orderModular}
modularDetail={orderModularDetail}
orderChange={this.orderChange}
@@ -1641,7 +1636,7 @@
} key="voucher">
<VoucherForm
voucher={voucher}
- columns={this.props.columns}
+ columns={columns}
voucherobj={verify.voucher}
voucherDetail={voucherDetail}
voucherChange={this.voucherChange}
--
Gitblit v1.8.0