From 7c908c81dba21f3b24557e12a29d84d3f50e8916 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 13 Jul 2023 09:37:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B3=87=E6=A0=B8?=
 =?UTF-8?q?=E7=AE=97=E6=A0=B8=E7=AE=97=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=B8=A6=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E7=BF=BB?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=B8=8D=E9=94=99=E7=9A=84bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hrmSalary/pages/calculateDetail/index.js  |  2 +-
 .../pages/calculateDetail/salaryDetail.js     |  8 ++++----
 .../pages/calculateDetail/userSure.js         | 20 +++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/index.js b/pc4mobx/hrmSalary/pages/calculateDetail/index.js
index 1bc1e55a..72ce7a6b 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/index.js
@@ -394,7 +394,7 @@ export default class CalculateDetail extends React.Component {
           />
           {selectedKey == 0 && <UserSure/>}
           {selectedKey == 1 && <SalaryDetail onChangeAccountIds={(ids) => this.setState({ accountIds: ids })}
-                                             employeeName={this.state.searchValue}/>}
+                                             employeeName={this.state.searchItemsValue}/>}
           {acctResultImportVisiable &&
             <AcctResultImportModal
               visiable={acctResultImportVisiable}
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
index 0ff9d20c..bbcdaad6 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
@@ -94,7 +94,7 @@ export default class SalaryDetail extends React.Component {
           url: "/api/bs/hrmsalary/salaryacct/acctresult/list",
           queryParams: {
             salaryAcctRecordId,
-            employeeName: this.props.employeeName,
+            ...this.props.employeeName,
             current, pageSize
           }
         };
@@ -109,7 +109,7 @@ export default class SalaryDetail extends React.Component {
         url: "/api/bs/hrmsalary/salaryacct/acctresult/list",
         queryParams: {
           salaryAcctRecordId,
-          employeeName: this.props.employeeName
+          ...this.props.employeeName
         }
       };
       type && childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
@@ -158,7 +158,7 @@ export default class SalaryDetail extends React.Component {
             url: "/api/bs/hrmsalary/salaryacct/acctresult/list",
             queryParams: {
               salaryAcctRecordId,
-              employeeName: this.props.employeeName
+              ...this.props.employeeName
             }
           };
           childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
@@ -192,7 +192,7 @@ export default class SalaryDetail extends React.Component {
         url: "/api/bs/hrmsalary/salaryacct/acctresult/list",
         queryParams: {
           salaryAcctRecordId,
-          employeeName: this.props.employeeName
+          ...this.props.employeeName
         }
       };
       childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js b/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
index 6ef24cbb..89f77d11 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
@@ -120,7 +120,7 @@ export default class UserSure extends React.Component {
           url: "/api/bs/hrmsalary/salaryacct/acctemployee/list",
           queryParams: {
             salaryAcctRecordId,
-            employeeName: this.state.userListSearchValue
+            ...this.state.searchItemsValue,
           }
         };
         childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*"); //window.postMessage
@@ -140,7 +140,7 @@ export default class UserSure extends React.Component {
             url: "/api/bs/hrmsalary/salaryacct/acctemployee/list",
             queryParams: {
               salaryAcctRecordId,
-              employeeName: this.state.userListSearchValue,
+              ...this.state.searchItemsValue,
               current,
               pageSize
             }
@@ -153,7 +153,7 @@ export default class UserSure extends React.Component {
             url: this.state.selectedKey === "1" ? "/api/bs/hrmsalary/salaryacct/reducedemployee/list" : "/api/bs/hrmsalary/salaryacct/addedemployee/list",
             queryParams: {
               salaryAcctRecordId,
-              employeeName: this.state.userListSearchValue,
+              ...this.state.searchItemsValue,
               current, pageSize
             }
           };
@@ -180,7 +180,7 @@ export default class UserSure extends React.Component {
           url: "/api/bs/hrmsalary/salaryacct/acctemployee/list",
           queryParams: {
             salaryAcctRecordId,
-            employeeName: this.state.userListSearchValue,
+            ...this.state.searchItemsValue,
             ...this.pageInfo
           }
         };
@@ -227,7 +227,7 @@ export default class UserSure extends React.Component {
             url: "/api/bs/hrmsalary/salaryacct/acctemployee/list",
             queryParams: {
               salaryAcctRecordId,
-              employeeName: this.state.userListSearchValue,
+              ...this.state.searchItemsValue,
               ...this.pageInfo,
               current: 1
             }
@@ -258,7 +258,7 @@ export default class UserSure extends React.Component {
             url: "/api/bs/hrmsalary/salaryacct/acctemployee/list",
             queryParams: {
               salaryAcctRecordId,
-              employeeName: this.state.userListSearchValue,
+              ...this.state.searchItemsValue,
               ...this.pageInfo
             }
           };
@@ -284,7 +284,7 @@ export default class UserSure extends React.Component {
         url: "/api/bs/hrmsalary/salaryacct/acctemployee/list",
         queryParams: {
           salaryAcctRecordId,
-          employeeName: this.state.userListSearchValue,
+          ...this.state.searchItemsValue,
           ...this.pageInfo
         }
       };
@@ -430,7 +430,7 @@ export default class UserSure extends React.Component {
                     url: "/api/bs/hrmsalary/salaryacct/acctemployee/list",
                     queryParams: {
                       salaryAcctRecordId,
-                      employeeName: this.state.userListSearchValue
+                      ...this.state.searchItemsValue,
                     }
                   };
                   childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*"); //window.postMessage
@@ -460,7 +460,7 @@ export default class UserSure extends React.Component {
                     url: "/api/bs/hrmsalary/salaryacct/reducedemployee/list",
                     queryParams: {
                       salaryAcctRecordId,
-                      employeeName: this.state.userListSearchValue
+                      ...this.state.searchItemsValue,
                     }
                   };
                   childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
@@ -490,7 +490,7 @@ export default class UserSure extends React.Component {
                     url: "/api/bs/hrmsalary/salaryacct/addedemployee/list",
                     queryParams: {
                       salaryAcctRecordId,
-                      employeeName: this.state.userListSearchValue
+                      ...this.state.searchItemsValue,
                     }
                   };
                   childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");