diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js index 8a1bd83d..f29e2f53 100644 --- a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js +++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js @@ -42,6 +42,7 @@ export default class BaseInformForm extends React.Component { } ); }); + JSON.parse(templateBaseData).salarySob && this.getReplenishRuleSetOptions({ salarySobId: JSON.parse(templateBaseData).salarySob }); } hanldeChange = (params) => { @@ -56,9 +57,9 @@ export default class BaseInformForm extends React.Component { }); this.props.onChange && this.props.onChange(request); }; - getReplenishRuleSetOptions = () => { + getReplenishRuleSetOptions = (params = {}) => { const { request } = this.state; - getReplenishRuleSetOptions({ salarySobId: request.salarySob }).then(({ status, data }) => { + getReplenishRuleSetOptions({ salarySobId: request.salarySob, ...params }).then(({ status, data }) => { if (status && !_.isEmpty(data)) { this.setState({ replenishRuleOptions: _.map(data, it => ({ key: it.id, showname: it.content })) diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js index 9dea9c85..15e21c20 100644 --- a/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js +++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js @@ -17,22 +17,22 @@ export default class ShowSettingForm extends React.Component { } // form 字段变化时的回调 - handleChange(params) { + handleChange = (params) => { const { payrollStore: { salaryTemplateShowSet, setSalaryTemplateShowSet } } = this.props; let request = { ...salaryTemplateShowSet, ...params }; setSalaryTemplateShowSet(request); - } + }; // 工资单主题 插入变量 - handleThemeNameCllck(param) { + handleThemeNameCllck = (param) => { const { payrollStore } = this.props; const { salaryTemplateShowSet, setSalaryTemplateShowSet } = payrollStore; let request = { ...salaryTemplateShowSet }; request.theme = (request.theme ? request.theme : "") + param; setSalaryTemplateShowSet(request); - } + }; - handleDownClick(index) { + handleDownClick = (index) => { const { payrollStore: { salaryItemSet, setSalaryItemSet } } = this.props; let downItem = salaryItemSet[index + 1]; let thisItem = salaryItemSet[index]; @@ -40,9 +40,9 @@ export default class ShowSettingForm extends React.Component { resultSet[index] = downItem; resultSet[index + 1] = thisItem; setSalaryItemSet(resultSet); - } + }; - handleUpClick(index) { + handleUpClick = (index) => { const { payrollStore: { salaryItemSet, setSalaryItemSet } } = this.props; let upItem = salaryItemSet[index - 1]; let thisItem = salaryItemSet[index]; @@ -50,9 +50,9 @@ export default class ShowSettingForm extends React.Component { resultSet[index] = upItem; resultSet[index - 1] = thisItem; setSalaryItemSet(resultSet); - } + }; - handleDeleteItem(group, item) { + handleDeleteItem = (group, item) => { const { payrollStore: { salaryItemSet, setSalaryItemSet } } = this.props; let resultSalaryItemSet = [...salaryItemSet]; resultSalaryItemSet.map(sourceGroup => { @@ -65,9 +65,9 @@ export default class ShowSettingForm extends React.Component { } }); setSalaryItemSet(resultSalaryItemSet); - } + }; - handleDeleteClick(index) { + handleDeleteClick = (index) => { Modal.confirm({ title: "信息确认", content: "确认删除", @@ -76,15 +76,13 @@ export default class ShowSettingForm extends React.Component { let resultSalaryItemSet = [...salaryItemSet]; resultSalaryItemSet.splice(index, 1); setSalaryItemSet(resultSalaryItemSet); - }, - onCancel: () => { } }); - } + }; render() { - const salaryTemplateShowSetStorage = window.localStorage.getItem("salaryTemplateShowSet") || "{}"; - const { payrollStore } = this.props; + const { payrollStore, id } = this.props; + const salaryTemplateShowSetStorage = id ? "{}" : window.localStorage.getItem("salaryTemplateShowSet") || "{}"; const { salaryTemplateShowSet } = payrollStore; const { salaryItemSet } = payrollStore; const {