Merge branch 'hotfix/v2-1114' into develop

pc4mobx/hrmSalary/pages/calculate/index.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { inject, observer } from "mobx-react";
-import { Button, DatePicker, Dropdown, Menu, Modal, message } from "antd";
+import { Button, DatePicker, Dropdown, Menu, message, Modal } from "antd";
 import { WeaInputSearch, WeaRightMenu, WeaTop } from "ecCom";
 import { renderNoright } from "../../util"; // 渲染form数据的方法：因为多个页面都会使用，所以抽的公共方法在util中
 import CustomTab from "../../components/customTab";
@@ -112,26 +112,34 @@ export default class Calculate extends React.Component {
   // 列表项归档回调
   handleFile(record) {
     const { calculateStore: { fileSalaryAcct } } = this.props;
+    this.setState({
+      progressVisible: true
+    }, () => {
+      this.timer = setInterval(() => {
+        if (this.state.progress !== 100) {
+          this.setState({
+            progress: this.state.progress + 1
+          });
+        } else {
+          clearInterval(this.timer);
+          this.setState({
+            progressVisible: false,
+            progress: 0
+          }, () => {
+            message.success("归档成功");
+            this.handleSearch(this.state.searchValue);
+          });
+        }
+      }, 800);
+    });
     fileSalaryAcct(record.id).then(() => {
+      clearInterval(this.timer);
       this.setState({
-        progressVisible: true
+        progressVisible: false,
+        progress: 0
       }, () => {
-        this.timer = setInterval(() => {
-          if (this.state.progress !== 100) {
-            this.setState({
-              progress: this.state.progress + 10
-            });
-          } else {
-            clearInterval(this.timer);
-            this.setState({
-              progressVisible: false,
-              progress: 0
-            }, () => {
-              message.success("归档成功");
-              this.handleSearch(this.state.searchValue);
-            });
-          }
-        }, 800);
+        message.success("归档成功");
+        this.handleSearch(this.state.searchValue);
       });
     });
   }
@@ -370,7 +378,7 @@ export default class Calculate extends React.Component {
           {/* 收藏功能: 配置之后显示 收藏、帮助、显示页面地址 这3个功能 */}
           <WeaTop
             title="薪资核算" // 文字
-            icon={<i className="icon-coms-fa" />} // 左侧图标
+            icon={<i className="icon-coms-fa"/>} // 左侧图标
             iconBgcolor="#F14A2D" // 左侧图标背景色
             showDropIcon={false} // 是否显示下拉按钮
             dropMenuDatas={rightMenu} // 下拉菜单（和页面的右键菜单相同）
@@ -401,6 +409,7 @@ export default class Calculate extends React.Component {
           {
             this.state.progressVisible &&
             <ProgressModal
+              title="正在归档请稍后"
               visible={this.state.progressVisible}
               onCancel={() => {
                 this.setState({ progressVisible: false, progress: 0 });

pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js

@@ -126,7 +126,7 @@ export default class SalaryDetail extends React.Component {
       this.timerLock = setInterval(() => {
         if (this.state.progress !== 100) {
           this.setState({
-            progress: this.state.progress + 10
+            progress: this.state.progress + 1
           });
         } else {
           clearInterval(this.timerLock);
@@ -137,21 +137,27 @@ export default class SalaryDetail extends React.Component {
             message.success("操作成功");
           });
         }
-      }, 800);
+      }, 500);
     });
     updateLockStatus(module).then(({ status, errormsg }) => {
       if (status) {
-        const childFrameObj = document.getElementById("atdTable");
-        const payload = {
-          type: "PR",
-          listType: "",
-          url: "/api/bs/hrmsalary/salaryacct/acctresult/list",
-          queryParams: {
-            salaryAcctRecordId,
-            employeeName: this.props.employeeName
-          }
-        };
-        childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
+        clearInterval(this.timerLock);
+        this.setState({
+          progressVisible: false,
+          progress: 0
+        }, () => {
+          const childFrameObj = document.getElementById("atdTable");
+          const payload = {
+            type: "PR",
+            listType: "",
+            url: "/api/bs/hrmsalary/salaryacct/acctresult/list",
+            queryParams: {
+              salaryAcctRecordId,
+              employeeName: this.props.employeeName
+            }
+          };
+          childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
+        });
       } else {
         message.error(errormsg || "操作失败");
       }
@@ -238,6 +244,7 @@ export default class SalaryDetail extends React.Component {
         {
           this.state.progressVisible &&
           <ProgressModal
+            title="正在加锁/解锁请稍后"
             visible={this.state.progressVisible}
             onCancel={() => {
               this.setState({ progressVisible: false, progress: 0 });