diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/editSlideContent.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/editSlideContent.js index f6106d94..88480366 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/editSlideContent.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/editSlideContent.js @@ -22,7 +22,7 @@ let emptyItem = { taxDeduction: "0.00" } -@inject('cumDeductStore', "taxAgentStore") +@inject('otherDeductStore', "taxAgentStore") @observer export default class EditSlideContent extends React.Component { @@ -57,16 +57,16 @@ export default class EditSlideContent extends React.Component { } fetchCumDeductDetailList(param) { - const { cumDeductStore} = this.props; - const { getCumDeductDetailList, currentRecord } = cumDeductStore; - getCumDeductDetailList(currentRecord.id, param); + const { otherDeductStore} = this.props; + const { getOtherDeductDetailList, currentRecord } = otherDeductStore; + getOtherDeductDetailList(currentRecord.id, param); } render() { const { taxAgentStore: {taxAgentOption}} = this.props; - const { cumDeductStore } = this.props; - const { slideTableStore, currentRecord } = cumDeductStore; + const { otherDeductStore } = this.props; + const { slideTableStore, currentRecord } = otherDeductStore; const { startDate, endDate, taxAgentId } = this.state; return (
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js index 1b2af297..7729584f 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js @@ -92,10 +92,10 @@ export default class OtherDeduct extends React.Component { } onEdit = (record) => { - const { otherDeductStore: { slideVisiable, setSlideVisiable, getCumDeductDetailList, setCurrentRecord } } = this.props; + const { otherDeductStore: { slideVisiable, setSlideVisiable, getOtherDeductDetailList, setCurrentRecord } } = this.props; setSlideVisiable(true) setCurrentRecord(record) - getCumDeductDetailList(record.id); + getOtherDeductDetailList(record.id); } // 增加编辑功能,重写columns绑定事件 @@ -196,8 +196,8 @@ export default class OtherDeduct extends React.Component { } const handleButtonClick = () => { - const { otherDeductStore: {exportCumDeductList}} = this.props; - exportCumDeductList(); + const { otherDeductStore: {exportOtherDeductList}} = this.props; + exportOtherDeductList(); } const handleMenuClick = () => { @@ -205,8 +205,8 @@ export default class OtherDeduct extends React.Component { message.warning("未选择条目") return } - const { otherDeductStore: { exportCumDeductList } } = this.props; - exportCumDeductList(selectedRowKeys.join(",")) + const { otherDeductStore: { exportOtherDeductList } } = this.props; + exportOtherDeductList(selectedRowKeys.join(",")) } const handleBtnImport = () => { @@ -238,9 +238,8 @@ export default class OtherDeduct extends React.Component { message.warning("未选择条目") return } - const { otherDeductStore: { exportOtherDeductDetailList } } = this.props; + const { otherDeductStore: { exportOtherDeductDetailList, currentRecord } } = this.props; exportOtherDeductDetailList(currentRecord.id, detailSelectedRowKeys.join(",")) - } const renderBtns = () => { @@ -317,7 +316,7 @@ export default class OtherDeduct extends React.Component { measure={'%'} title={ {this.state.currentOperate == "add" ? doSave() : doUpdate()}} editable={false} diff --git a/pc4mobx/hrmSalary/stores/otherDeduct.js b/pc4mobx/hrmSalary/stores/otherDeduct.js index 9ac1cfc0..5f96bf5f 100644 --- a/pc4mobx/hrmSalary/stores/otherDeduct.js +++ b/pc4mobx/hrmSalary/stores/otherDeduct.js @@ -103,12 +103,12 @@ export class OtherDeductStore { } // 导出 - @action exportCumDeductList = (ids = "") => { - API.exportCumDeductList(ids) + @action exportOtherDeductList = (ids = "") => { + API.exportOtherDeductList(ids) } // 查询明细 - @action getCumDeductDetailList = (id, param = {}) => { + @action getOtherDeductDetailList = (id, param = {}) => { let requestParams = {"otherTaxExemptDeductionId": id}; requestParams = {...requestParams, ...param} API.getOtherDeductDetailList(requestParams).then(res => {