From 8cdc711e71d8e16a065b4a46f3a143d46ac34ba2 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 22 Oct 2024 11:47:02 +0800
Subject: [PATCH] =?UTF-8?q?custom/=E9=A2=86=E6=82=A6=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../socialSecurityBenefits/standingBook/standingBook.js   | 4 ++--
 .../variableSalary/components/salaryFileList/index.js     | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
index be80202c..ca615429 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
@@ -79,7 +79,7 @@ class StandingBook extends Component {
                   this.setState({
                     accountDialog: { ...this.state.accountDialog, visible: false }
                   }, () => {
-                    this.wfListRef.wrappedInstance.getWelfareRecordList();
+                    this.wfListRef.getWelfareRecordList();
                     const calcPayload = { ...payload, creator };
                     window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/socialSecurityBenefits/standingBookDetail?${convertToUrlString(calcPayload)}`);
                   });
@@ -138,7 +138,7 @@ class StandingBook extends Component {
           onSearch={(payload) => {
             this.setState({
               queryForm: { ...queryForm, ...payload }
-            }, () => this.wfListRef.wrappedInstance.getWelfareRecordList());
+            }, () => this.wfListRef.getWelfareRecordList());
           }}
           onPutAccountOptions={options => this.setState({ accountDialog: { ...accountDialog, options } })}
         />
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
index 92ef5b94..701cb7d3 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
@@ -69,7 +69,7 @@ class Index extends Component {
   componentWillReceiveProps(nextProps, nextContext) {
     if (nextProps.isQuery !== this.props.isQuery) this.setState({
       pageInfo: { ...this.state.pageInfo, current: 1 }
-    }, () => this.getVariableSalaryList(nextProps));
+    }, () => this.getVariableSalaryList());
   }
 
   handleReceive = async ({ data }) => {
@@ -180,7 +180,11 @@ class Index extends Component {
                            onAdvanceSearch={() => this.getVariableSalaryList()}/>
         </div>
         <div className={cs("searchAdvanced-condition-container", { "searchAdvanced-condition-hide": !showSearchAd })}>
-          <SearchPannel onCancel={() => this.setState({ showSearchAd: false })} onAdSearch={this.handleAdvanceSearch}/>
+          <SearchPannel onCancel={() => this.setState({ showSearchAd: false })}
+                        onAdSearch={() => {
+                          this.openAdvanceSearch();
+                          this.getVariableSalaryList();
+                        }}/>
         </div>
         <div style={{ height: height + "px" }}>
           <Spin spinning={loading}>