From 0e531839588679106e33202de677329d2b5e88bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 7 Dec 2022 17:43:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=8F=91=E6=94=BE=E5=92=8C=E9=83=A8=E5=88=86=E6=92=A4=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/payroll/payrollGrant/index.js       | 48 +++++++++++--------
 .../payroll/payrollGrant/payrollPartTable.js  |  4 +-
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
index 6bf91113..f20f1570 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
@@ -5,7 +5,7 @@ import { WeaDropdown, WeaHelpfulTip, WeaTab, WeaTop } from "ecCom";
 import { Button, Dropdown, Menu, message } from "antd";
 import "./index.less";
 import { getQueryString } from "../../../util/url";
-import { getSearchs } from "../../../util";
+import { getSearchs, renderLoading } from "../../../util";
 import CustomPaginationTable from "../../../components/customPaginationTable";
 import PayrollPartTable from "./payrollPartTable";
 
@@ -56,7 +56,9 @@ export default class PayrollGrant extends React.Component {
     }).then(() => {
       getInfoList({
         salarySendId: this.state.currentId,
-        isGranted: selectedKey !== "0"
+        isGranted: selectedKey !== "0",
+        current: this.pageInfo.current,
+        pageSize: this.pageInfo.pageSize
       });
       this.handleClose();
     });
@@ -73,7 +75,10 @@ export default class PayrollGrant extends React.Component {
     }).then(() => {
       getInfoList({
         salarySendId: currentId,
-        isGranted: selectedKey !== "0"
+        isGranted: selectedKey !== "0",
+        current: this.pageInfo.current,
+        pageSize: this.pageInfo.pageSize
+
       });
       this.handleClose();
     });
@@ -466,23 +471,26 @@ export default class PayrollGrant extends React.Component {
           </div>
         </div>
         <div className="tableWrapper">
-          <CustomPaginationTable
-            rowKey="id"
-            rowSelection={rowSelection}
-            dataSource={salaryGrantDataSource}
-            columns={this.getColumns()}
-            total={salaryGrantPageInfo.total}
-            current={salaryGrantPageInfo.pageNum}
-            pageSize={this.pageInfo.pageSize}
-            onPageChange={value => {
-              this.pageInfo.current = value;
-              this.handleDataPageChange(value);
-            }}
-            onShowSizeChange={(current, pageSize) => {
-              this.pageInfo = { current, pageSize };
-              this.handleShowSizeChange(this.pageInfo);
-            }}
-          />
+          {
+            !_.isEmpty(this.getColumns()) ?
+              <CustomPaginationTable
+                rowKey="id"
+                rowSelection={rowSelection}
+                dataSource={salaryGrantDataSource}
+                columns={this.getColumns()}
+                total={salaryGrantPageInfo.total}
+                current={salaryGrantPageInfo.pageNum}
+                pageSize={this.pageInfo.pageSize}
+                onPageChange={value => {
+                  this.pageInfo.current = value;
+                  this.handleDataPageChange(value);
+                }}
+                onShowSizeChange={(current, pageSize) => {
+                  this.pageInfo = { current, pageSize };
+                  this.handleShowSizeChange(this.pageInfo);
+                }}
+              /> : renderLoading()
+          }
         </div>
         <PayrollPartTable
           {...payrollPartModalParams}
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/payrollPartTable.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/payrollPartTable.js
index e7b6588d..552a7122 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/payrollPartTable.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/payrollPartTable.js
@@ -57,8 +57,8 @@ class PayrollPartTable extends Component {
           pageInfo: { ...pageInfo, current, pageSize, total },
           dataSource: _.map(dataSource, it => ({
             ...it,
-            includeObj: _.map(it.includeObj, child => child.targetName).join(","),
-            excludeObj: _.map(it.excludeObj, child => child.targetName).join(",")
+            includeObj: _.map(it.includeObj, child => child.targetName || child.targetTypeName).join(","),
+            excludeObj: _.map(it.excludeObj, child => child.targetName || child.targetTypeName).join(",")
           })),
           columns
         });