From 326aa6b3effaccc71cfe0775d47b0f29eb3695a6 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期日, 25 八月 2024 00:36:40 +0800 Subject: [PATCH] 2024-08-25 --- src/menu/components/share/actioncomponent/index.jsx | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx index 96a9190..c30f245 100644 --- a/src/menu/components/share/actioncomponent/index.jsx +++ b/src/menu/components/share/actioncomponent/index.jsx @@ -20,6 +20,7 @@ const VerifyExcelIn = asyncSpinComponent(() => import('@/templates/sharecomponent/actioncomponent/verifyexcelin')) const VerifyExcelOut = asyncSpinComponent(() => import('@/templates/sharecomponent/actioncomponent/verifyexcelout')) const VerifyMegvii = asyncSpinComponent(() => import('@/templates/sharecomponent/actioncomponent/verifymegvii')) +const VerifyPay = asyncSpinComponent(() => import('@/templates/sharecomponent/actioncomponent/verifypay')) class ActionComponent extends Component { static propTpyes = { @@ -162,6 +163,8 @@ addButton = (cardId, element) => { if (cardId !== this.props.config.uuid) return + delete element.eleType + const { actionlist } = this.state this.setState({actionlist: [...actionlist, element]}) @@ -487,19 +490,19 @@ */ deleteElement = (card) => { const { config } = this.props - let _this = this + let that = this confirm({ content: `纭畾鍒犻櫎 - ${card.label} 锛焋, onOk() { - let _actionlist = fromJS(_this.state.actionlist).toJS() + let _actionlist = fromJS(that.state.actionlist).toJS() _actionlist = _actionlist.filter(item => item.uuid !== card.uuid) - _this.setState({ + that.setState({ actionlist: _actionlist }, () => { - _this.props.updateaction({...config, action: _actionlist}) + that.props.updateaction({...config, action: _actionlist}) }) }, onCancel() {} @@ -522,7 +525,7 @@ verifySubmit = () => { const { config } = this.props const { card } = this.state - + this.verifyRef.handleConfirm().then(res => { let _actionlist = fromJS(this.state.actionlist).toJS() _actionlist = _actionlist.filter(item => !item.origin || item.uuid === card.uuid) @@ -696,6 +699,12 @@ columns={config.columns} wrappedComponentRef={(inst) => this.verifyRef = inst} /> + } else if (card.payMode === 'system') { + return <VerifyPay + card={card} + columns={config.columns} + wrappedComponentRef={(inst) => this.verifyRef = inst} + /> } } -- Gitblit v1.8.0