diff --git a/pc4mobx/hrmSalary/pages/salaryFile/index.js b/pc4mobx/hrmSalary/pages/salaryFile/index.js index 1263be7d..99f77a3d 100644 --- a/pc4mobx/hrmSalary/pages/salaryFile/index.js +++ b/pc4mobx/hrmSalary/pages/salaryFile/index.js @@ -161,8 +161,7 @@ export default class SalaryFile extends React.Component { // 页面跳转 handlePageChange = (value) => { const { salaryFileStore: {getTableDatas, form}} = this.props; - form.updateFields({ current: value }) - getTableDatas() + getTableDatas({ current: value }) } // 搜索 diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js index e9ff8c93..c588c522 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js @@ -147,6 +147,12 @@ export default class StandingBook extends React.Component { window.open( `/spa/hrmSalary/static/index.html#/main/hrmSalary/socialSecurityBenefits/standingBookDetail?billMonth=${billMonth}` ); + setTimeout(() => { + this.getCommonList({ + ...this.state.tableParams, + current: this.state.current, + }); + }, 3000) }; handleOperate = (payload) => { const { siaccountFile, siaccountDelete, deleteLoading } = diff --git a/pc4mobx/hrmSalary/stores/salaryFile.js b/pc4mobx/hrmSalary/stores/salaryFile.js index 846b391c..3784b7e7 100644 --- a/pc4mobx/hrmSalary/stores/salaryFile.js +++ b/pc4mobx/hrmSalary/stores/salaryFile.js @@ -78,7 +78,7 @@ export class salaryFileStore { getTableDatas = (params) => { this.loading = true; const formParams = this.form.getFormParams() || {}; - params = params || formParams; + params = {...formParams, ...params} API.getArchiveList(params).then(action(res => { if (res.status) { // 接口请求成功/失败处理 this.tableStore.getDatas(res.data.dataKey.datas); // table 请求数据