From e0b6dc4585dc87b362536921296c11c169c8f60f 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, 17 Jun 2024 16:47:08 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.14.4.2406.02-=E5=B7=A5=E8=B5=84?=
 =?UTF-8?q?=E5=8D=95=E5=8F=91=E6=94=BE=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/payroll/payrollGrant/index.js       | 45 +++++++------------
 pc4mobx/hrmSalary/stores/payroll.js           |  4 +-
 2 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
index 52bb065c..95141435 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
@@ -538,7 +538,8 @@ export default class PayrollGrant extends React.Component {
       grantListCondition,
       setGrantListShowSearchAd,
       salaryGrantPageInfo,
-      getInfoList
+      getInfoList,
+      loading
     } = payrollStore;
     const { selectedRowKeys, selectedKey, currentId, payrollPartModalParams } = this.state;
     const rowSelection = {
@@ -569,35 +570,19 @@ export default class PayrollGrant extends React.Component {
     ];
     return (
       <div className="payrollGrant_new">
-        <WeaTop
-          title="工资单发放" // 文字
-          icon={<i className="icon-coms-meeting"/>} // 左侧图标
-          iconBgcolor="#F14A2D" // 左侧图标背景色
-          showDropIcon={true} // 是否显示下拉按钮
-          buttons={this.getSearchsAdQuick()}
-        />
-
+        <WeaTop title="工资单发放" icon={<i className="icon-coms-meeting"/>} iconBgcolor="#F14A2D"
+                showDropIcon={true} buttons={this.getSearchsAdQuick()}/>
         <WeaTab
-          datas={topTab}
-          keyParam="viewcondition"
-          selectedKey={selectedKey}
-          onChange={v =>
-            this.setState({ selectedKey: v }, () => {
-              getInfoList({
-                salarySendId: currentId,
-                isGranted: v !== "0"
-              });
-            })
-          }
-          searchType={["base", "advanced"]} // base：基础搜索框 advanced：显示高级搜索按钮
-          searchsBasePlaceHolder="请输入姓名"
-          showSearchAd={grantListShowSearchAd} // 是否展开高级搜索面板
-          setShowSearchAd={bool => setGrantListShowSearchAd(bool)} //高级搜索面板受控
-          searchsAd={getSearchs(grantListConditionForm, toJS(grantListCondition), 2)} // 高级搜索内部数据
-          buttonsAd={adBtn} // 高级搜索内部按钮
-          onSearch={() => this.handleSearch()} // 点搜索按钮时的回调
-          onSearchChange={v => grantListConditionForm.updateFields({ username: v })} // 在搜索框中输入的文字改变时的回调: 这里需要同步高级搜索和外部搜索框的值
-          searchsBaseValue={grantListConditionForm.getFormParams().username} // 外部input搜索值受控: 这里和高级搜索的requestname同步
+          datas={topTab} keyParam="viewcondition" selectedKey={selectedKey} searchType={["base", "advanced"]}
+          onChange={v => this.setState({ selectedKey: v }, () => {
+            getInfoList({ salarySendId: currentId, isGranted: v !== "0" });
+          })}
+          searchsBasePlaceHolder="请输入姓名" showSearchAd={grantListShowSearchAd} buttonsAd={adBtn}
+          setShowSearchAd={bool => setGrantListShowSearchAd(bool)}
+          searchsAd={getSearchs(grantListConditionForm, toJS(grantListCondition), 2)}
+          onSearch={() => this.handleSearch()}
+          onSearchChange={v => grantListConditionForm.updateFields({ username: v })}
+          searchsBaseValue={grantListConditionForm.getFormParams().username}
         />
         <div className="titleBar">
           <div className="titleBarLeft">
@@ -626,7 +611,7 @@ export default class PayrollGrant extends React.Component {
         </div>
         <div className="tableWrapper">
           {
-            !_.isEmpty(this.getColumns()) ?
+            !loading ?
               <CustomPaginationTable
                 rowKey="id"
                 rowSelection={rowSelection}
diff --git a/pc4mobx/hrmSalary/stores/payroll.js b/pc4mobx/hrmSalary/stores/payroll.js
index 4da841d0..ef1e46a1 100644
--- a/pc4mobx/hrmSalary/stores/payroll.js
+++ b/pc4mobx/hrmSalary/stores/payroll.js
@@ -458,7 +458,9 @@ export class payrollStore {
       departmentIds: form.departmentIds ? form.departmentIds.split(",") : [],
       subCompanyIds: form.subCompanyIds ? form.subCompanyIds.split(",") : []
     };
+    this.loading = true;
     API.getInfoList(params).then(res => {
+      this.loading = false;
       if (res.status) {
         this.salaryGrantTableStore = res.data.columns;
         this.salaryGrantDataSource = res.data.list;
@@ -470,7 +472,7 @@ export class payrollStore {
       } else {
         message.error(res.errormsg || "获取失败");
       }
-    });
+    }).catch(() => this.loading = false);
   };
 
   // 工资单-工资单发放详情列表