From b3f9ddcd113474723edf69e27b24bea43f7f54db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Fri, 25 Nov 2022 13:46:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=B7=AE=E5=88=A0=E9=99=A4=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standingBookDetail/components/regList.js | 8 ++++---- .../standingBookDetail/components/regression.js | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js index 2bb8d60f..94d6ebad 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js @@ -41,7 +41,7 @@ class RegList extends Component { handleResetSelectRowKeys = (selectedRowKeys) => { this.setState({ selectedRowKeys }); }; - recessionList = (userName = "") => { + recessionList = (module = {}) => { const { loading, pageInfo } = this.state; const billMonth = getQueryString("billMonth"); const paymentOrganization = getQueryString("paymentOrganization"); @@ -49,9 +49,9 @@ class RegList extends Component { const paymentStatus = "3"; const payload = { billMonth, paymentStatus, - creator, userName, - paymentOrganization, - ...pageInfo + creator, paymentOrganization, + ...pageInfo, + ...module }; this.setState({ loading: { ...loading, query: true } }); API.recessionList(payload).then(({ status, data }) => { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js index 2b91f51b..ac795562 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js @@ -11,6 +11,7 @@ import RegList from "./regList"; import RegAddEmployee from "./regAddEmployee"; import RegEditDetial from "./regEditDetial"; import { getQueryString } from "../../../../util/url"; +import { calcPageNo } from "../../../../util"; import * as API from "../../../../apis/standingBook"; import "./index.less"; @@ -40,8 +41,8 @@ class Regression extends Component { API.delRecession(selectKey).then(({ status, errormsg }) => { if (status) { message.success("删除成功"); - - this.regListRef.recessionList(); + const current = calcPageNo(this.regListRef.state.pageInfo.total, this.regListRef.state.pageInfo.current, 10, selectKey.length); + this.regListRef.recessionList({ current }); this.regListRef.handleResetSelectRowKeys([]); this.setState({ selectKey: [] }); } else { @@ -95,7 +96,7 @@ class Regression extends Component { window.open(url, "_self"); break; case "search": - this.regListRef.recessionList(name); + this.regListRef.recessionList({ userName: name }); break; default: break;