diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/editSlideContent.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/editSlideContent.js index 37ea5920..dee64cb5 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/editSlideContent.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/editSlideContent.js @@ -86,27 +86,32 @@ export default class EditSlideContent extends React.Component { }; render() { - const { - taxAgentStore: { taxAgentOption } - } = this.props; const { cumDeductStore } = this.props; const { - slideTableStore, currentRecord, slideColumns, slidePageObj, slideTableDataSource, setSlidePageObj, - slideLoading + slideLoading, + getCumDeductDetailList } = cumDeductStore; const { startDate, endDate, taxAgentId } = this.state; - + const declareMonth = [startDate, endDate]; const pagination = { + current: slidePageObj.current, + pageSize: slidePageObj.pageSize, total: slidePageObj.total, showTotal: (total) => `共 ${total} 条`, showSizeChanger: true, onShowSizeChange(current, pageSize) { setSlidePageObj({ ...slidePageObj, current, pageSize }); + getCumDeductDetailList(currentRecord.id, { + ...slidePageObj, + current, + pageSize, + declareMonth: _.filter(declareMonth, item => item) + }); }, onChange(current) { setSlidePageObj({ @@ -114,6 +119,10 @@ export default class EditSlideContent extends React.Component { current, pageSize: slidePageObj.pageSize }); + getCumDeductDetailList(currentRecord.id, { + ...slidePageObj, current, + declareMonth: _.filter(declareMonth, item => item) + }); } }; const newColumns = _.map([...slideColumns], (item) => ({ ...item })); @@ -169,19 +178,6 @@ export default class EditSlideContent extends React.Component { - {/**/} - {/* 个税扣缴义务人*/} - {/* {*/} - {/* this.setState({ taxAgentId: v });*/} - {/* this.handleFetchCumDeductDetailList(startDate, endDate, v);*/} - {/* }}*/} - {/* />*/} - {/**/}
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/editSlideContent.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/editSlideContent.js index 0c374c99..fc9b430a 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/editSlideContent.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/editSlideContent.js @@ -86,12 +86,10 @@ export default class EditSlideContent extends React.Component { }; render() { - const { - taxAgentStore: { taxAgentOption } - } = this.props; const { cumSituationStore } = this.props; + const { startDate, endDate, taxAgentId } = this.state; const { - slideTableStore, + getCumDeductDetailList, currentRecord, slideColumns, slidePageObj, @@ -99,14 +97,22 @@ export default class EditSlideContent extends React.Component { setSlidePageObj, slideLoading } = cumSituationStore; - const { startDate, endDate, taxAgentId } = this.state; + const declareMonth = [startDate, endDate]; const pagination = { + current: slidePageObj.current, + pageSize: slidePageObj.pageSize, total: slidePageObj.total, showTotal: (total) => `共 ${total} 条`, showSizeChanger: true, onShowSizeChange(current, pageSize) { setSlidePageObj({ ...slidePageObj, current, pageSize }); + getCumDeductDetailList(currentRecord.id, { + ...slidePageObj, + current, + pageSize, + declareMonth: _.filter(declareMonth, item => item) + }); }, onChange(current) { setSlidePageObj({ @@ -114,6 +120,12 @@ export default class EditSlideContent extends React.Component { current, pageSize: slidePageObj.pageSize }); + getCumDeductDetailList(currentRecord.id, { + ...slidePageObj, + current, + pageSize, + declareMonth: _.filter(declareMonth, item => item) + }); } }; const newColumns = _.map([...slideColumns], (item) => ({ ...item })); @@ -170,22 +182,6 @@ export default class EditSlideContent extends React.Component {
- {/**/} - {/* 个税扣缴义务人*/} - {/* {*/} - {/* this.setState({ taxAgentId: v });*/} - {/* this.fetchCumDeductDetailList({*/} - {/* declareMonth: [startDate, endDate],*/} - {/* taxAgentId: v,*/} - {/* });*/} - {/* }}*/} - {/* />*/} - {/**/}
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/editSlideContent.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/editSlideContent.js index 3079fa7b..6f464d9e 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/editSlideContent.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/editSlideContent.js @@ -92,12 +92,9 @@ export default class EditSlideContent extends React.Component { }; render() { - const { - taxAgentStore: { taxAgentOption }, - } = this.props; const { otherDeductStore } = this.props; const { - slideTableStore, + getOtherDeductDetailList, currentRecord, slideColumns, slidePageObj, @@ -106,13 +103,22 @@ export default class EditSlideContent extends React.Component { slideLoading, } = otherDeductStore; const { startDate, endDate, taxAgentId } = this.state; + const declareMonth = [startDate, endDate]; const pagination = { + current: slidePageObj.current, + pageSize: slidePageObj.pageSize, total: slidePageObj.total, showTotal: (total) => `共 ${total} 条`, showSizeChanger: true, onShowSizeChange(current, pageSize) { setSlidePageObj({ ...slidePageObj, current, pageSize }); + getOtherDeductDetailList(currentRecord.id, { + ...slidePageObj, + current, + pageSize, + declareMonth: _.filter(declareMonth, item => item) + }); }, onChange(current) { setSlidePageObj({ @@ -120,6 +126,11 @@ export default class EditSlideContent extends React.Component { current, pageSize: slidePageObj.pageSize, }); + getOtherDeductDetailList(currentRecord.id, { + ...slidePageObj, + current, + declareMonth: _.filter(declareMonth, item => item) + }); }, }; const newColumns = _.map([...slideColumns], (item) => ({ ...item })); diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js index 4e552d4e..ba3322ff 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js @@ -472,7 +472,7 @@ class Index extends Component { ...item, width: item.oldWidth, render: (text) => { - return {text} + return {text}; } }; }); @@ -526,7 +526,8 @@ class Index extends Component { let arrList = []; if (showOperateBtn && isShow === "true" && selectedKey === "fixed") { arrList.push(); } if (showOperateBtn && selectedKey === "fixed") { diff --git a/pc4mobx/hrmSalary/stores/cumDeduct.js b/pc4mobx/hrmSalary/stores/cumDeduct.js index b276dd0b..44b46552 100644 --- a/pc4mobx/hrmSalary/stores/cumDeduct.js +++ b/pc4mobx/hrmSalary/stores/cumDeduct.js @@ -191,7 +191,7 @@ export class CumDeductStore { pageSize }); } else { - this.setSlideTableDataSource(list); + this.setSlideTableDataSource([]); this.setSlidePageObj({ ...this.slidePageObj, total: 0