diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js index 3e461453..fa968445 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js @@ -20,6 +20,7 @@ class LedgerSalaryItemEditSlide extends Component { handleChange = (params) => { const request = { ...this.props.request, ...params }; + console.log(this.props.request, params); this.props.onUpdateRequest(request); }; handleShowFormal = () => this.props.onEditFormnul(); @@ -34,7 +35,7 @@ class LedgerSalaryItemEditSlide extends Component { title={ } content={ diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js index cc3254a4..e33d7ce3 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js @@ -22,7 +22,7 @@ class LedgerSalaryItemTable extends Component { salaryItemPayload: { visible: false, record: {}, request: {}, isLedger: true, - userStatusList: [] + userStatusList: [], loading: false } }; } @@ -38,6 +38,7 @@ class LedgerSalaryItemTable extends Component { onHandleItemhide( _.map([...dataSource], item => { if (id === item.id || id === item.key) { + alert(1); return { ...item, itemHide: String(value) @@ -86,15 +87,30 @@ class LedgerSalaryItemTable extends Component { */ handleSaveItem = () => { const { salaryItemPayload } = this.state; - const { request } = salaryItemPayload; + const { request, record } = salaryItemPayload; + this.setState({ + salaryItemPayload: { ...salaryItemPayload, loading: true } + }); saveItem(request).then(({ status, errorMsg }) => { if (status) { message.success(getLabel(22619, "保存成功")); + this.setState({ + salaryItemPayload: { ...salaryItemPayload, loading: false, visible: false } + }); + const { id } = record; + const { hideDefault } = request; + this.handleChangeItem(hideDefault.toString(), id); + console.log(this.props, this.state); //TODO:渲染列表数据 } else { + this.setState({ + salaryItemPayload: { ...salaryItemPayload, loading: false } + }); message.error(errorMsg || getLabel(22620, "保存失败")); } - }); + }).catch(() => this.setState({ + salaryItemPayload: { ...salaryItemPayload, loading: false } + })); }; render() { diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js index 3a348a5e..333991c6 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js @@ -92,7 +92,7 @@ class SalaryItemForm extends Component { return { ...item }; }) }, () => { - if (key === "valueType") { + if (key === "valueType" && !this.props.isLedger) { onChangeFieldsItem({ formulaContent: "", formulaId: 0, valueType: v }); } else { onChangeFieldsItem({ [key]: (key === "useDefault" || key === "useInEmployeeSalary" || key === "hideDefault") ? Number(v) : v });