From 547e5fe219ee7bee309ecd67db74bc8df66b5433 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 八月 2023 11:47:45 +0800
Subject: [PATCH] 2023-08-23
---
src/menu/datasource/verifycard/settingform/index.jsx | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/menu/datasource/verifycard/settingform/index.jsx b/src/menu/datasource/verifycard/settingform/index.jsx
index f4c917f..c47b78b 100644
--- a/src/menu/datasource/verifycard/settingform/index.jsx
+++ b/src/menu/datasource/verifycard/settingform/index.jsx
@@ -27,16 +27,24 @@
modules: [],
innerRules: [],
innertip: '',
+ MenuType: '',
ismain: false
}
UNSAFE_componentWillMount () {
const { config, setting } = this.props
- let modules = MenuUtils.getSupModules(window.GLOB.customMenu.components, config.uuid, window.GLOB.customMenu.interfaces)
+ let menu = window.GLOB.customMenu
+ let MenuType = ''
+
+ if (menu.parentId === 'BillPrintTemp') {
+ MenuType = 'billPrint'
+ }
+
+ let modules = MenuUtils.getSupModules(menu.components, config.uuid, menu.interfaces)
let ismain = false
- if (window.GLOB.customMenu.Template === 'BaseTable') {
+ if (menu.Template === 'BaseTable') {
ismain = config.name === '涓昏〃'
}
@@ -82,7 +90,7 @@
}
}
- this.setState({modules, innerRules, innertip, setting: _setting, ismain})
+ this.setState({modules, innerRules, innertip, setting: _setting, ismain, MenuType})
}
handleConfirm = () => {
@@ -181,7 +189,7 @@
render() {
const { columns, config } = this.props
const { getFieldDecorator } = this.props.form
- const { setting, modules, innerRules, innertip } = this.state
+ const { setting, modules, innerRules, innertip, MenuType } = this.state
const formItemLayout = {
labelCol: {
@@ -349,7 +357,7 @@
</Col> : null}
{setting.interType === 'system' ? <Col span={24} className="data-source" style={{paddingLeft: '7px'}}>
<Form.Item labelCol={{xs: { span: 24 }, sm: { span: 2 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 22 }} } label={
- <Tooltip placement="topLeft" title={`浣跨敤绯荤粺鍑芥暟鏃讹紝闇�濉啓鏁版嵁婧愩�傛敞锛氭暟鎹潈闄愭浛鎹㈢ $@ -> /* 鎴� ''銆� @$ -> */ 鎴� ''锛涙煡璇㈡浛鎹㈢ $select@ -> /* 鎴� ''銆� @select$ -> */ 鎴� ''锛涚粺璁℃浛鎹㈢ $sum@ -> /* 鎴� ''銆� @sum$ -> */ 鎴� ''銆俙}>
+ <Tooltip placement="topLeft" title={`浣跨敤绯荤粺鍑芥暟鏃讹紝闇�濉啓鏁版嵁婧愩�傛敞锛氭暟鎹潈闄愭浛鎹㈢ $@ -> /* 鎴� ''銆� @$ -> */ 鎴� ''銆俙}>
<QuestionCircleOutlined className="mk-form-tip" />
鏁版嵁婧�
</Tooltip>
@@ -421,7 +429,7 @@
</Radio.Group>)}
</Form.Item>
</Col> : null}
- {!['navbar', 'balcony', 'menubar'].includes(config.type) && (!config.wrap || config.wrap.supType !== 'multi') ? <Col span={8}>
+ {!['navbar', 'balcony', 'menubar'].includes(config.type) && (!config.wrap || config.wrap.supType !== 'multi') && MenuType !== 'billPrint' ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title={'璇ョ粍浠跺鏋滃彈鍏朵粬缁勪欢鎺у埗锛岃閫夐」鐩稿簲鐨勭粍浠讹紝娌℃湁鏃堕�夆�滄棤鈥濄��'}>
<QuestionCircleOutlined className="mk-form-tip" />
@@ -535,7 +543,7 @@
)}
</Form.Item>
</Col> : null}
- {config.type === 'interface' && setting.supModule && setting.supModule[0] === 'empty' ? <Col span={8}>
+ {config.type === 'interface' && ((setting.supModule && setting.supModule[0] === 'empty') || MenuType === 'billPrint') ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title="鍒濆鍖栧姞杞藉皢鍦ㄩ〉闈㈠姞杞藉墠鎵ц銆�">
<QuestionCircleOutlined className="mk-form-tip" />
@@ -552,7 +560,7 @@
)}
</Form.Item>
</Col> : null}
- {config.type === 'interface' ? <Col span={8}>
+ {config.type === 'interface' && MenuType !== 'billPrint' ? <Col span={8}>
<Form.Item label="瀹氭椂鍣�">
{getFieldDecorator('timer', {
initialValue: setting.timer || ''
--
Gitblit v1.8.0