From b8cde0c39d7b6d58ceff3adf6dea3cb3118ea602 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 13 九月 2022 14:46:15 +0800 Subject: [PATCH] 2022-09-13 --- src/templates/zshare/verifycard/index.jsx | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx index a5a49eb..069ae99 100644 --- a/src/templates/zshare/verifycard/index.jsx +++ b/src/templates/zshare/verifycard/index.jsx @@ -853,11 +853,14 @@ if (!_arr.includes('submitdate')) { _form.push('submitdate=getdate()') } - if (!_arr.includes('submituserid')) { - _form.push('submituserid=@userid@') - } if (!_arr.includes('submituser')) { _form.push('submituser=@username') + } + if (!_arr.includes('submitstaff')) { + _form.push('submitstaff=@fullname') + } + if (!_arr.includes('submituserid')) { + _form.push('submituserid=@userid@') } } else { if (!_arr.includes('modifydate')) { @@ -865,6 +868,9 @@ } if (!_arr.includes('modifyuser')) { _form.push('modifyuser=@username') + } + if (!_arr.includes('modifystaff')) { + _form.push('modifystaff=@fullname') } if (!_arr.includes('modifyuserid')) { _form.push('modifyuserid=@userid@') @@ -1180,17 +1186,22 @@ } handleEdit = (record, type) => { + let node = null + if (type === 'customverify') { this.customForm.edit(record) + node = document.getElementById('mk-custom-script') } else if (type === 'ordercode') { this.orderForm.edit(record) } else if (type === 'scripts') { this.scriptsForm.edit(record) + node = document.getElementById('mk-normal-script') } else if (type === 'cbscripts') { this.cbscriptsForm.edit(record) + node = document.getElementById('mk-callback-script') } - let node = document.getElementById('verify-card-box-tab').parentNode + // let node = document.getElementById('verify-card-box-tab').parentNode if (node && node.scrollTop) { let inter = Math.ceil(node.scrollTop / 10) @@ -1504,7 +1515,8 @@ } return ( - <div id="verify-card-box-tab"> + <div> + {card.label ? <div className="mk-com-name">{card.label} - 楠岃瘉淇℃伅</div> : null} <Tabs activeKey={activeKey} className="verify-card-box" onChange={this.changeTab}> {verifyInter === 'system' || card.intertype === 'inner' ? <TabPane tab={ <span> @@ -1528,7 +1540,7 @@ 鑷畾涔夐獙璇� {verify.customverifys.length ? <span className="count-tip">{verify.customverifys.length}</span> : null} </span> - } key="customverifys"> + } key="customverifys" id="mk-custom-script"> <CustomForm dict={this.props.dict} btn={this.props.card} @@ -1593,7 +1605,7 @@ 鑷畾涔夎剼鏈� {verify.scripts.length ? <span className="count-tip">{verify.scripts.length}</span> : null} </span> - } key="scripts"> + } key="scripts" id="mk-normal-script"> <BorderOutlined className="full-scripts" onClick={() => { if (this.scriptsForm && (this.scriptsForm.state.editItem || (this.scriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.scriptsForm.props.form.getFieldValue('sql'))))) { notification.warning({ @@ -1623,7 +1635,7 @@ 鍥炶皟鑴氭湰 {verify.cbScripts.length ? <span className="count-tip">{verify.cbScripts.length}</span> : null} </span> - } key="cbScripts"> + } key="cbScripts" id="mk-callback-script"> <CallBackCustomScript btn={this.props.card} dict={this.props.dict} -- Gitblit v1.8.0