diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
index d52797f0..7818af09 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
@@ -306,7 +306,6 @@ export default class PayrollGrant extends React.Component {
const { selectedKey, showFeedbackColumn } = this.state;
const { payrollStore } = this.props;
const { salaryGrantTableStore: columns, salarySendDetailBaseInfo } = payrollStore;
- const notShowGrantOrWithdraw = salarySendDetailBaseInfo.haveBackCalc === 1 && salarySendDetailBaseInfo.salaryAcctType === "0";
return _.map([
..._.filter(toJS(columns), it => ((selectedKey === "0" && it.dataIndex !== "billReadStatus" && it.dataIndex !== "billConfirmStatus") || (selectedKey === "1" && !showFeedbackColumn && it.dataIndex !== "billReadStatus" && it.dataIndex !== "billConfirmStatus") || (selectedKey === "1" && showFeedbackColumn))),
{
@@ -315,14 +314,37 @@ export default class PayrollGrant extends React.Component {
dataIndex: "",
display: true,
render: (text, record) => {
- if (record.sendStatus === "1" && salarySendDetailBaseInfo.canSend) {
- return (
- this.handleWithdraw({ ids: [record.id] })}>
- 撤回
-
- );
+ if (record.sendStatus === "1") {
+ if (salarySendDetailBaseInfo.canSend) {
+ return (
+
+ this.handleWithdraw({ ids: [record.id] })}>
+ 撤回
+
+ {
+ window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/send/exportPdf?id=${record.id}`, "_blank");
+ }}>
+ {getLabel(111, "导出PDF")}
+
+
+ );
+ } else {
+ return (
+
+ {
+ window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/send/exportPdf?id=${record.id}`, "_blank");
+ }}>
+ {getLabel(111, "导出PDF")}
+
+
+ );
+ }
} else if (salarySendDetailBaseInfo.canSend) {
return (
{
switch (e.key) {
@@ -360,6 +381,9 @@ export default class PayrollGrant extends React.Component {
case "4":
this.handleExportSelect();
break;
+ case "5":
+ window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/send/exportPdf?salarySendId=${getQueryString("id")}`, "_blank");
+ break;
default:
break;
}
@@ -368,6 +392,10 @@ export default class PayrollGrant extends React.Component {
);
let btnDom = [