diff --git a/pc4mobx/hrmSalary/components/importModal/index.js b/pc4mobx/hrmSalary/components/importModal/index.js index 5815c3de..7f4a11d0 100644 --- a/pc4mobx/hrmSalary/components/importModal/index.js +++ b/pc4mobx/hrmSalary/components/importModal/index.js @@ -39,8 +39,27 @@ export default class ImportModal extends React.Component { this.props.setStep(step - 1); } - + validateDate() { + const { params } = this.props; + let flag = true + try { + params && Object.keys(params).forEach((key) => { + if(!params[key] || params[key] == "") { + message.warning("参数不完整"); + throw new Error("参数不完整") + } + }) + } catch(e) { + flag = false + } + + return flag; + } + handleStep1Next() { + if(!this.validateDate()) { + return + } if(this.state.fileId) { this.props.setStep(1) } else { diff --git a/pc4mobx/hrmSalary/pages/calculate/baseFormModal.js b/pc4mobx/hrmSalary/pages/calculate/baseFormModal.js index 1deacd94..4a04f93d 100644 --- a/pc4mobx/hrmSalary/pages/calculate/baseFormModal.js +++ b/pc4mobx/hrmSalary/pages/calculate/baseFormModal.js @@ -54,7 +54,7 @@ export default class baseFormModal extends React.Component { saveBasic(params).then((id) => { this.props.onCancel() this.props.onRefresh() - window.open("/spa/hrmSalary/static/index.html#/main/hrmSalary/calculateDetail?id=" + id) + window.open("/spa/hrmSalary/static/index.html#/main/hrmSalary/calculateDetailz?id=" + id) }) } diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js index e275a0d9..d9b14d66 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js @@ -532,6 +532,7 @@ export default class CumDeduct extends React.Component { init={() => { this.handleInitModal(); }} + onValidate={() => {this.handleValidate()}} params={modalParam} columns={modalColumns} step={step}