diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
index e077a08f..8618f667 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
@@ -6,7 +6,6 @@
*/
import React, { Component } from "react";
import { WeaHelpfulTip, WeaLocaleProvider } from "ecCom";
-import { Alert } from "antd";
import { getColumnDesc, getSalarySobCycle } from "../../../../../apis/calculate";
import { sysConfCodeRule } from "../../../../../apis/ruleconfig";
import EditCalcAdvanceSearchPannel from "./editCalcAdvanceSearchPannel";
@@ -52,14 +51,10 @@ class Index extends Component {
render() {
const { salarySobCycle, showSearchAd, formulaTd, columnDesc, showTotalCell } = this.state;
- const { accountExceptInfo, routeParams: { salaryAcctRecordId } } = this.props;
+ const { routeParams: { salaryAcctRecordId } } = this.props;
const formulaObj = _.get(columnDesc, [formulaTd]) || {};
return (
- {
- accountExceptInfo &&
-
- }
{getLabel(542604, "薪资所属月")}:
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
index 17480945..d8a8d78e 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
@@ -130,7 +130,7 @@ class Index extends Component {
}
};
renderReqBtns = () => {
- const { selectedKey } = this.state;
+ const { selectedKey, accountExceptInfo } = this.state;
let reqBtns = [];
switch (selectedKey) {
case "calc":
@@ -155,21 +155,32 @@ class Index extends Component {
this.calc.openAdvanceSearch()}
onAdvanceSearch={() => this.calc.onAdSearch(false)}/>
];
+ accountExceptInfo && reqBtns.unshift( this.downloadTxtfile(accountExceptInfo)}/>);
break;
default:
break;
}
return reqBtns;
};
+ 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();
+ };
renderContent = () => {
- const { selectedKey, accountExceptInfo } = this.state;
+ const { selectedKey } = this.state;
let dom = null;
switch (selectedKey) {
case "person":
dom = ;
break;
case "calc":
- dom = this.calc = dom}/>;
+ dom = this.calc = dom}/>;
break;
default:
break;
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.less b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.less
index b64a4dad..90c0839b 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.less
@@ -5,6 +5,13 @@
height: 100%;
background: #f6f6f6;
+ .icon-jinggao {
+ color: red;
+ font-size: 20px;
+ margin-right: 10px;
+ cursor: pointer;
+ }
+
.wea-new-top-req {
z-index: 0 !important;
}