From c5a07dba94694d13f0a78e051dfa26c3522933ee Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 十一月 2024 18:10:02 +0800
Subject: [PATCH] 2024-11-15
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 80 +++++++++++++++++++++++-----------------
1 files changed, 46 insertions(+), 34 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 9be2a57..78a63bd 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -45,7 +45,8 @@
autoMatic: false,
check: false,
count: 0,
- dict: window.GLOB.dict
+ dict: window.GLOB.dict,
+ submitType: ''
}
preCallback = null
@@ -445,6 +446,7 @@
getSystemParam = (data, formdata, retmsg) => {
const { setting, columns, btn } = this.props
+ const { submitType } = this.state
let _params = []
if ( btn.Ot === 'notRequired' || btn.Ot === 'requiredSgl' || btn.Ot === 'requiredOnce' ) {
@@ -468,11 +470,11 @@
param.ID = primaryId
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, '', param, data[0], columns, retmsg) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, '', param, data[0], columns, retmsg, submitType) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, '', param, data[0], columns, false) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, '', param, data[0], columns, false, submitType) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -495,11 +497,11 @@
param.ID = Utils.getguid()
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, retmsg) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, retmsg, submitType) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, false) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, false, submitType) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -521,11 +523,11 @@
param.ID = primaryId
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, retmsg) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, retmsg, submitType) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, false) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, false, submitType) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -587,11 +589,11 @@
param.ID = primaryId
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, '', param, cell, columns, retmsg) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, '', param, cell, columns, retmsg, submitType) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, '', param, cell, columns, false) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, '', param, cell, columns, false, submitType) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -627,11 +629,11 @@
param.ID = Utils.getguid()
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, cell, columns, retmsg) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, cell, columns, retmsg, submitType) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, formdata, param, cell, columns, false) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, formdata, param, cell, columns, false, submitType) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -653,11 +655,11 @@
param.ID = primaryId
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, cell, columns, retmsg) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, cell, columns, retmsg, submitType) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, formdata, param, cell, columns, false) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, formdata, param, cell, columns, false, submitType) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -808,6 +810,8 @@
getExps = (ex, formdata, cell, id, process) => {
const { columns, BID, btn } = this.props
+ const { submitType } = this.state
+
let exps = []
let values = {
time_id: Utils.getguid(),
@@ -826,6 +830,7 @@
datam: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
datam_begin: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
datam_end: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
+ mk_submit_type: submitType || ''
// mk_check_begin: '',
// mk_check_end: ''
}
@@ -836,8 +841,6 @@
let formkeys = []
formdata && formdata.forEach(form => {
- // if (!ex.reps.includes(form.key)) return
-
formkeys.push(form.key)
let val = form.value
@@ -1289,9 +1292,11 @@
* @description 鑾峰彇鍥炶皟鑴氭湰鐨勫瓧娈靛畾涔�
*/
getSysDeclareSql = (btn, formdata, data, columns, BID = '') => {
+ const { submitType } = this.state
+
let datavars = {} // 澹版槑鐨勫彉閲忥紝琛ㄥ崟鍙婃樉绀哄垪
// 闇�瑕佸０鏄庣殑鍙橀噺闆�
- let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode', 'roleid', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address', 'mk_deleted', 'bid']
+ let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode', 'roleid', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address', 'mk_deleted', 'bid', 'mk_submit_type']
// sql璇彞
let _sql = ''
@@ -1421,7 +1426,7 @@
_declarefields = ',' + _declarefields
}
_sql = `/* 绯荤粺鐢熸垚 */
- Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50),@ModularDetailCode nvarchar(50), @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),@mk_deleted int,@bid nvarchar(50)${_declarefields}
+ Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50),@ModularDetailCode nvarchar(50), @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),@mk_deleted int,@bid nvarchar(50),@mk_submit_type nvarchar(50)${_declarefields}
`
let userName = sessionStorage.getItem('User_Name') || ''
@@ -1439,7 +1444,7 @@
// 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
_sql += `
/* 鍑瘉鍙婄敤鎴蜂俊鎭垵濮嬪寲璧嬪�� */
- select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}', @mk_deleted=1, @bid='${BID}', @BillCode='', @ModularDetailCode=''
+ select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}', @mk_deleted=1, @bid='${BID}', @mk_submit_type='${submitType}', @BillCode='', @ModularDetailCode=''
`
// 琛ㄥ崟鍙橀噺璧嬪��
@@ -3895,11 +3900,11 @@
/**
* @description 妯℃�佹锛堣〃鍗曪級锛岀‘璁�
*/
- handleOk = () => {
+ handleOk = (submitType = '') => {
if (!this.formRef) return
this.formRef.handleConfirm().then(res => {
- this.setState({ confirmLoading: true })
+ this.setState({ confirmLoading: true, submitType: submitType })
this.execSubmit(this.state.selines, () => { this.setState({ confirmLoading: false }) }, res)
})
@@ -3912,7 +3917,8 @@
this.setState({
loading: false,
visible: false,
- confirmLoading: false
+ confirmLoading: false,
+ submitType: ''
})
this.preCallback && this.preCallback()
@@ -4085,7 +4091,7 @@
*/
getModels = () => {
const { BID, btn, BData } = this.props
- const { btnconfig, visible, dict } = this.state
+ const { btnconfig, visible, dict, confirmLoading, submitType } = this.state
if (!btnconfig || !btnconfig.setting) return null
@@ -4114,19 +4120,23 @@
<MutilForm
BID={BID}
action={btnconfig}
- inputSubmit={this.handleOk}
+ inputSubmit={() => this.handleOk()}
data={this.state.selines[0]}
BData={BData}
wrappedComponentRef={(inst) => this.formRef = inst}
/>
- <div className="ant-drawer-footer" style={{ position: 'absolute', zIndex: 1, right: 0, bottom: 0, width: '100%', borderTop: '1px solid #e9e9e9', padding: '10px 16px', background: '#fff', textAlign: 'right'}}>
+ {btnconfig.setting.formType === 'check' ? <div className="ant-drawer-footer" style={{ position: 'absolute', zIndex: 1, right: 0, bottom: 0, width: '100%', borderTop: '1px solid #e9e9e9', padding: '10px 16px', background: '#fff', textAlign: 'right'}}>
<Button onClick={this.handleCancel} style={{ marginRight: 8 }}>
- {btnconfig.setting.formType !== 'check' ? dict['cancel'] || '鍙栨秷' : dict['close'] || '鍏抽棴'}
+ {dict['close'] || '鍏抽棴'}
</Button>
- {btnconfig.setting.formType !== 'check' ? <Button onClick={this.handleOk} loading={this.state.confirmLoading} type="primary">
- {dict['ok'] || '纭畾'}
- </Button> : null}
- </div>
+ </div> : <div className="ant-drawer-footer" style={{ position: 'absolute', zIndex: 1, right: 0, bottom: 0, width: '100%', borderTop: '1px solid #e9e9e9', padding: '10px 16px', background: '#fff', textAlign: 'right'}}>
+ <Button onClick={this.handleCancel} style={{ marginRight: 8 }}>
+ {dict['cancel'] || '鍙栨秷'}
+ </Button>
+ {btn.extBtn === 'true' ? <Button style={{color: 'var(--mk-sys-color)', borderColor: 'var(--mk-sys-color)'}} disabled={confirmLoading && submitType !== btn.extValue} loading={confirmLoading && submitType === btn.extValue} onClick={() => this.handleOk(btn.extValue)}>{btn.extLabel}</Button> : null}
+ {btn.extBtn === 'true' ? <Button type="primary" disabled={confirmLoading && submitType !== ''} loading={confirmLoading && submitType === ''} onClick={() => this.handleOk()}>{dict['ok'] || '纭畾'}</Button> : null}
+ {btn.extBtn !== 'true' ? <Button type="primary" loading={confirmLoading} onClick={() => this.handleOk()}>{dict['ok'] || '纭畾'}</Button> : null}
+ </div>}
</Drawer>
)
} else {
@@ -4152,18 +4162,20 @@
wrapClassName={'action-modal' + (btnconfig.setting.moveable === 'true' ? ' moveable-modal modal-' + btn.uuid : '')}
visible={visible}
width={width}
- okText={dict['ok'] || '纭畾'}
- cancelText={dict['cancel'] || '鍙栨秷'}
- onOk={this.handleOk}
maskStyle={btnconfig.setting.moveable === 'true' ? {backgroundColor: 'rgba(0, 0, 0, 0.15)'} : null}
- confirmLoading={this.state.confirmLoading}
onCancel={this.handleCancel}
+ footer={[
+ <Button key="cancel" onClick={this.handleCancel}>{dict['cancel'] || '鍙栨秷'}</Button>,
+ btn.extBtn === 'true' ? <Button key="extend" style={{color: 'var(--mk-sys-color)', borderColor: 'var(--mk-sys-color)'}} disabled={confirmLoading && submitType !== btn.extValue} loading={confirmLoading && submitType === btn.extValue} onClick={() => this.handleOk(btn.extValue)}>{btn.extLabel}</Button> : null,
+ btn.extBtn === 'true' ? <Button key="confirm" type="primary" disabled={confirmLoading && submitType !== ''} loading={confirmLoading && submitType === ''} onClick={() => this.handleOk()}>{dict['ok'] || '纭畾'}</Button> : null,
+ btn.extBtn !== 'true' ? <Button key="confirm" type="primary" loading={confirmLoading} onClick={() => this.handleOk()}>{dict['ok'] || '纭畾'}</Button> : null
+ ]}
destroyOnClose
>
<MutilForm
BID={BID}
action={btnconfig}
- inputSubmit={this.handleOk}
+ inputSubmit={() => this.handleOk()}
data={this.state.selines[0]}
BData={BData}
wrappedComponentRef={(inst) => this.formRef = inst}
--
Gitblit v1.8.0