Merge branch 'hotfix/V2-20230505' into develop

pc4mobx/hrmSalary/pages/calculateDetail/index.js

@@ -30,10 +30,11 @@ export default class CalculateDetail extends React.Component {
       acctResultImportVisiable: false,
       progressVisible: false,
       progress: 0,
-      accountIds: []
+      accountIds: [],
+      accountExceptInfo: ""
     };
     this.id = "";
-    this.timer;
+    this.timer = null;
   }
 
   componentWillMount() {
@@ -160,7 +161,8 @@ export default class CalculateDetail extends React.Component {
                 this.timer = null;
                 this.setState({
                   progressVisible: false,
-                  accountIds: []
+                  accountIds: [],
+                  accountExceptInfo: data.message
                 });
                 message.success("核算完成");
                 // acctResultList({ salaryAcctRecordId: this.id });
@@ -181,7 +183,8 @@ export default class CalculateDetail extends React.Component {
                 this.timer = null;
                 this.setState({
                   progressVisible: false,
-                  accountIds: []
+                  accountIds: [],
+                  accountExceptInfo: data.message
                 });
                 message.error(data.message);
               }
@@ -189,8 +192,6 @@ export default class CalculateDetail extends React.Component {
             });
           }, 1000);
         });
-      },
-      onCancel() {
       }
     });
   };
@@ -249,6 +250,15 @@ export default class CalculateDetail extends React.Component {
     }
   }
 
+  downloadTxtfile = (value) => {
+    const element = document.createElement("a");
+    const file = new Blob([value], { type: "text/plain" });
+    element.href = URL.createObjectURL(file);
+    element.download = "核算异常信息.txt";
+    document.body.appendChild(element);
+    element.click();
+  };
+
   render() {
     const { selectedKey, acctResultImportVisiable, showSearchAd } = this.state;
     const menu = (
@@ -260,7 +270,8 @@ export default class CalculateDetail extends React.Component {
     );
 
     const renderRightOperation = () => {
-      return [
+      const { accountExceptInfo } = this.state;
+      let buttons = [
         <ButtonSelect
           datas={[
             { key: "ALL", show: "核算所有人", selected: true },
@@ -273,6 +284,10 @@ export default class CalculateDetail extends React.Component {
           更多
         </Dropdown.Button>
       ];
+      accountExceptInfo && buttons.unshift(<Button type="ghost" shape="circle-outline" icon="download"
+                                                   title="下载核算异常信息"
+                                                   onClick={() => this.downloadTxtfile(accountExceptInfo)}/>);
+      return buttons;
     };
 
     const topTab = [

pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js

@@ -1,4 +1,5 @@
 import React from "react";
+import { toJS } from "mobx";
 import CustomTab from "../../components/customTab";
 import { Dropdown, Menu, message } from "antd";
 import { WeaHelpfulTip, WeaInputSearch, WeaSlideModal } from "ecCom";
@@ -16,7 +17,8 @@ export default class PlaceOnFileDetail extends React.Component {
     this.state = {
       slideVisiable: false,
       selectedRowKeys: [],
-      searchValue: ""
+      searchValue: "",
+      columnIndex: ""
     };
     this.id = "";
   }
@@ -38,11 +40,11 @@ export default class PlaceOnFileDetail extends React.Component {
   handleClick = ({ data }) => {
     const childFrameObj = document.getElementById("atdTable");
     const salaryAcctRecordId = getQueryString("id");
-    const { type, data: { id, data: record } = {} } = data;
+    const { type, data: { id, data: record, extraId = "" } = {} } = data;
     if (type === "PR") {
       if (id === "BATCHDELETE") {
         this.setState({ selectedRowKeys: record });
-      }else if (id === "PAGEINFO") {
+      } else if (id === "PAGEINFO") {
         const { pageNum: current, size: pageSize } = record;
         this.pageInfo = { current, pageSize };
         const payload = {
@@ -57,6 +59,10 @@ export default class PlaceOnFileDetail extends React.Component {
           }
         };
         childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
+      } else if (id === "COLUMNINDEX") {
+        if (!extraId) {
+          this.setState({ columnIndex: record });
+        }
       }
     } else {
       const payload = {
@@ -106,9 +112,8 @@ export default class PlaceOnFileDetail extends React.Component {
 
   render() {
     const { calculateStore } = this.props;
-    const { baseSalarySobCycle } = calculateStore;
-    const { slideVisiable } = this.state;
-
+    const { baseSalarySobCycle, columnDescList } = calculateStore;
+    const { slideVisiable, columnIndex } = this.state;
 
     const menu = (
       <Menu onClick={(e) => this.handleMenuClick(e)}>
@@ -139,7 +144,7 @@ export default class PlaceOnFileDetail extends React.Component {
             renderRightOperation()
           }
         />
-        <div className="tabWrapper">
+        <div className="tabWrapper" style={{ borderBottom: "none" }}>
           <span>薪资所属月：{baseSalarySobCycle.salaryMonth}</span>
           <WeaHelpfulTip
             width={100}
@@ -154,6 +159,10 @@ export default class PlaceOnFileDetail extends React.Component {
             placement="topLeft"
           />
         </div>
+        <div className="tabWrapper">
+          <span>公式=</span>
+          <span>{toJS(columnDescList)[columnIndex] && toJS(columnDescList)[columnIndex].formulaContent}</span>
+        </div>
         <div className="tableWrapper">
           <iframe
             style={{ border: 0, width: "100%", height: "100%" }}