diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js index 1b76cb67..f7d4a8d6 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js @@ -608,15 +608,15 @@ export default class Attendance extends React.Component { // } // }) return [ - { - title: "序号", - dataIndex: "index", - width: 80, - render: (text, record, index) => { - const { current, pageSize } = this.pageInfo; - return (current - 1) * pageSize + index + 1; - } - }, + // { + // title: "序号", + // dataIndex: "index", + // width: 80, + // render: (text, record, index) => { + // const { current, pageSize } = this.pageInfo; + // return (current - 1) * pageSize + index + 1; + // } + // }, ...newColumns ]; }; diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js index 03bd911e..18771497 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js @@ -575,20 +575,22 @@ export default class CumSituation extends React.Component { showTotal: total => `共 ${total} 条`, showSizeChanger: true, pageSizeOptions: ["10", "20", "50", "100"], - onShowSizeChange(current, pageSize) { + onShowSizeChange: (current, pageSize) => { setPageObj({ ...pageObj, current, pageSize }); getTableDatas({ current, pageSize, + taxYearMonth: this.state.monthValue + '-' + this.state.taxYearMonth, taxAgentId: taxAgentId === "All" ? "" : taxAgentId, year: monthValue }); }, - onChange(current) { + onChange: (current) => { setPageObj({ ...pageObj, current, pageSize: pageObj.pageSize }); getTableDatas({ current, pageSize: pageObj.pageSize, + taxYearMonth: this.state.monthValue + '-' + this.state.taxYearMonth, taxAgentId: taxAgentId === "All" ? "" : taxAgentId, year: monthValue }); diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js index 94264528..7aeabf71 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/index.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js @@ -157,21 +157,23 @@ export default class SalaryItem extends React.Component { } }); } - return [{ - title: "序号", - dataIndex: "index", - align: "left", - width: 60, - render: (text, record, index) => { - const { current, pageSize } = this.state.searchParams; - return (current - 1) * pageSize + index + 1; - } - }, ...columns]; + return [ + // { + // title: "序号", + // dataIndex: "index", + // align: "left", + // width: 60, + // render: (text, record, index) => { + // const { current, pageSize } = this.state.searchParams; + // return (current - 1) * pageSize + index + 1; + // } + // }, + ...columns]; }; handleSearch(value) { const { salaryItemStore: { getTableDatas } } = this.props; - getTableDatas({ ...this.state.searchParams,current: 1, name: value }).then(res => { + getTableDatas({ ...this.state.searchParams, current: 1, name: value }).then(res => { this.setState({ searchParams: { ...this.state.searchParams, @@ -184,7 +186,7 @@ export default class SalaryItem extends React.Component { handlePageChange(value) { const { salaryItemStore: { getTableDatas } } = this.props; - getTableDatas({ ...this.state.searchParams, current: value }).then(res => { + getTableDatas({ ...this.state.searchParams, name: this.state.searchValue, current: value }).then(res => { this.setState({ searchParams: { ...this.state.searchParams, @@ -201,7 +203,11 @@ export default class SalaryItem extends React.Component { } render() { - const { salaryItemStore, salaryFileStore, taxAgentStore: { showOperateBtn, showSalaryItemBtn, taxAgentAdminOption } } = this.props; + const { + salaryItemStore, + salaryFileStore, + taxAgentStore: { showOperateBtn, showSalaryItemBtn, taxAgentAdminOption } + } = this.props; const { userStatusList } = salaryFileStore; const { selectedRowKeys } = this.state; const { @@ -403,7 +409,7 @@ export default class SalaryItem extends React.Component { pageSize } }, () => { - this.handleShowSizeChange(this.state.searchParams); + this.handleShowSizeChange({ name: this.state.searchValue, ...this.state.searchParams }); }); }} /> diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js index 30ddc0d1..a61e6cc7 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js @@ -125,16 +125,16 @@ export default class Archives extends React.Component { }; }); return tmpV.length > 0 ? [ - { - title: "序号", - dataIndex: "index", - width: 60, - fixed: "left", - render: (text, record, index) => { - const { current, pageSize } = pageInfo; - return (current - 1) * pageSize + index + 1; - } - }, + // { + // title: "序号", + // dataIndex: "index", + // width: 60, + // fixed: "left", + // render: (text, record, index) => { + // const { current, pageSize } = pageInfo; + // return (current - 1) * pageSize + index + 1; + // } + // }, ...tmpV, { title: "操作", dataIndex: "operate",