diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js index e9108e3d..565a87bd 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js @@ -74,7 +74,8 @@ class SalaryDetails extends Component { if (status) { this.setState({ tempPageList: _.map(data, o => ({ key: String(o.id), showname: o.name })), - templateId: !_.isEmpty(_.find(data, o => !!o.checked)) ? String(_.find(data, o => !!o.checked).id) : "" + templateId: !_.isEmpty(_.find(data, o => !!o.checked)) ? String(_.find(data, o => !!o.checked).id) : "", + transferDialog: { ...this.state.transferDialog, visible: false, cancel: true, type: "default" } }); } }); @@ -271,13 +272,9 @@ class SalaryDetails extends Component { })}/> {/*薪资明细模板设置*/} this.setState({ - tempDialog: { ...tempDialog, visible: false, setting: [] }, - transferDialog: { - ...this.state.transferDialog, - visible: false, cancel: true, type: "default" - } - }, () => callback && callback())}/> + onCancel={() => this.setState({ + tempDialog: { ...tempDialog, visible: false, setting: [] } + })}/> );