From 967d0bacd18296404f14b8dcd673352918a1c5fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Mon, 23 Oct 2023 18:28:29 +0800 Subject: [PATCH] =?UTF-8?q?feature/2.9.42310.01-=E7=A4=BE=E4=BF=9D?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../archives/operateLogDialog/index.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/operateLogDialog/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/operateLogDialog/index.js index d7f65def..6f1ab4ed 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/operateLogDialog/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/operateLogDialog/index.js @@ -43,10 +43,10 @@ class Index extends Component { } } - getAdjustHistoryList = () => { + getAdjustHistoryList = (extra = {}) => { const { pageInfo } = this.state; const { archivesStore: { logForm } } = this.props; - const payload = { ...pageInfo, ...logForm.getFormParams() }; + const payload = { ...pageInfo, ...logForm.getFormParams(), ...extra }; this.setState({ loading: true }); getAdjustHistoryList(payload).then(({ status, data }) => { this.setState({ loading: false }); @@ -65,7 +65,6 @@ class Index extends Component { }).catch(() => this.setState({ loading: false })); }; - render() { const { loading, dataSource, columns, pageInfo, conditions } = this.state; const { archivesStore: { logForm } } = this.props; @@ -103,7 +102,7 @@ class Index extends Component { }} >