diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js index e861b31d..5ef37ea5 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js @@ -21,7 +21,7 @@ class LedgerBaseSetting extends Component { constructor(props) { super(props); this.state = { - baseForm: baseSettingFormItem, + baseForm: [], settingBaseInfo: { name: "", taxAgentId: "", @@ -38,13 +38,16 @@ class LedgerBaseSetting extends Component { }; } - componentDidMount() { + componentWillMount() { this.getTaxAgentSelectListAsAdmin(); - this.commonEenumList(); + } + + componentDidMount() { + // this.getTaxAgentSelectListAsAdmin(); + // this.commonEenumList(); if (this.props.visible && this.props.editId) { this.getLedgerBasicForm(this.props.editId); } - } componentWillReceiveProps(nextProps, nextContext) { @@ -98,9 +101,8 @@ class LedgerBaseSetting extends Component { const { getTaxAgentSelectListAsAdmin } = taxAgentStore; getTaxAgentSelectListAsAdmin().then(({ status, data }) => { if (status) { - const { baseForm } = this.state; this.setState({ - baseForm: _.map(baseForm, it => { + baseForm: _.map(baseSettingFormItem, it => { if (it.key === "taxAgentId") { return { ...it, @@ -109,11 +111,11 @@ class LedgerBaseSetting extends Component { } return { ...it }; }) - }); + }, () => this.commonEenumList()); } }); }; - commonEenumList= ()=>{ + commonEenumList = () => { const payload = { enumClass: "com.engine.salary.enums.salarysob.IncomeCategoryEnum" }; @@ -133,7 +135,7 @@ class LedgerBaseSetting extends Component { }); } }); - } + }; handleChangeField = (key, value) => { const { onSaveParams } = this.props; const { settingBaseInfo } = this.state;