From 62921ad80ff338297b42da61c88888296b65d8e7 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, 28 Aug 2023 16:22:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E7=A8=8E-=E4=BA=BA=E5=91=98=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=8A=A5=E9=80=81=E5=88=97=E8=A1=A8=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=88=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hrmSalary/pages/employeedeclareDetail/index.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
index 73539c8d..7280fec4 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
@@ -178,7 +178,7 @@ class Index extends Component {
           pageInfo: { ...pageInfo, current, pageSize, total }
         }, () => {
           const payload = {
-            dataSource, selectedRowKeys,
+            dataSource, selectedRowKeys, selectedKey,
             pageInfo: this.state.pageInfo,
             columns: _.map(columns, it => {
               if (it.dataIndex === "employeeName" || it.dataIndex === "subCompanyName") {
@@ -208,7 +208,6 @@ class Index extends Component {
     };
     this.setState({ loading: { ...this.state.loading, refresh: true } });
     employeedeclareRefresh(payload).then(async ({ status, data, errormsg }) => {
-      this.setState({ loading: { ...this.state.loading, refresh: false } });
       if (status) {
         message.destroy();
         message.loading(getLabel(111, "刷新中..."), 0);
@@ -217,12 +216,14 @@ class Index extends Component {
           const { status: rateStatus, finish, msg } = result;
           if (resStatus && rateStatus) {
             if (finish) {
+              this.setState({ loading: { ...this.state.loading, refresh: false } });
               clearInterval(this.timer);
               message.destroy();
               message.success(getLabel(111, "刷新成功！"));
               this.queryEmployeeList();
             }
           } else {
+            this.setState({ loading: { ...this.state.loading, refresh: false } });
             clearInterval(this.timer);
             message.destroy();
             message.warning(msg || getLabel(111, "刷新失败！"));
@@ -230,6 +231,7 @@ class Index extends Component {
           }
         }, 1000);
       } else {
+        this.setState({ loading: { ...this.state.loading, refresh: false } });
         clearInterval(this.timer);
         message.destroy();
         message.error(errormsg);
@@ -253,7 +255,6 @@ class Index extends Component {
     };
     this.setState({ loading: { ...this.state.loading, feedback: true } });
     getDeclareFeedback(payload).then(async ({ status, data, errormsg }) => {
-      this.setState({ loading: { ...this.state.loading, feedback: false } });
       if (status) {
         message.destroy();
         message.loading(getLabel(111, "获取报送中..."), 0);
@@ -262,12 +263,14 @@ class Index extends Component {
           const { status: rateStatus, finish, msg } = result;
           if (resStatus && rateStatus) {
             if (finish) {
+              this.setState({ loading: { ...this.state.loading, feedback: false } });
               clearInterval(this.timer);
               message.destroy();
               message.success(getLabel(111, "获取报送结果成功！"));
               this.queryEmployeeList();
             }
           } else {
+            this.setState({ loading: { ...this.state.loading, feedback: false } });
             clearInterval(this.timer);
             message.destroy();
             message.warning(msg || getLabel(111, "获取失败！"));
@@ -275,6 +278,7 @@ class Index extends Component {
           }
         }, 1000);
       } else {
+        this.setState({ loading: { ...this.state.loading, feedback: false } });
         clearInterval(this.timer);
         message.destroy();
         message.error(errormsg);
@@ -324,7 +328,6 @@ class Index extends Component {
     };
     this.setState({ loading: { ...this.state.loading, declare: true } });
     employeedeclareDeclare(payload).then(async ({ status, data, errormsg }) => {
-      this.setState({ loading: { ...this.state.loading, declare: false } });
       if (status) {
         message.destroy();
         message.loading(getLabel(111, "报送中..."), 0);
@@ -333,12 +336,14 @@ class Index extends Component {
           const { status: rateStatus, finish, msg } = result;
           if (resStatus && rateStatus) {
             if (finish) {
+              this.setState({ loading: { ...this.state.loading, declare: false } });
               clearInterval(this.timer);
               message.destroy();
               message.success(getLabel(111, "全部报送成功！"));
               this.queryEmployeeList();
             }
           } else {
+            this.setState({ loading: { ...this.state.loading, declare: false } });
             clearInterval(this.timer);
             message.destroy();
             message.warning(msg || getLabel(111, "报送失败！"));
@@ -346,6 +351,7 @@ class Index extends Component {
           }
         }, 1000);
       } else {
+        this.setState({ loading: { ...this.state.loading, declare: false } });
         clearInterval(this.timer);
         message.destroy();
         message.error(errormsg);