qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hotfix/2.12.1.2404.02

This commit is contained in:
黎永顺 2024-05-11 15:06:47 +08:00
parent 78142d32fe
commit 8f582ad3dd
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pc4mobx/hrmSalary/apis/payroll.js
View File

@ -240,3 +240,7 @@ export const salaryBillBaseSetPreviewWaterMark = (params) => {
export const getSmsSalaryItemSet = (params) => {
return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/template/getSmsSalaryItemSet", "GET", params);
};
// 工资单导出PDF-检查
export const genPdfBeforeExport = (params) => {
return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/genPdfBeforeExport", "GET", params);
};

20
pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
View File

@ -8,7 +8,7 @@ import { getQueryString } from "../../../util/url";
import { getSearchs, renderLoading } from "../../../util";
import CustomPaginationTable from "../../../components/customPaginationTable";
import PayrollPartTable from "./payrollPartTable";
import { getPayrollIssuanceProgressBar } from "../../../apis/payroll";
import { genPdfBeforeExport, getPayrollIssuanceProgressBar } from "../../../apis/payroll";
import ProgressModal from "../../../components/progressModal";
const getLabel = WeaLocaleProvider.getLabel;
@ -328,7 +328,14 @@ export default class PayrollGrant extends React.Component {
<a
href="javascript:void(0);"
onClick={() => {
window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/exportPdf?id=${record.id}&salarySendId=${getQueryString("id")}`, "_blank");
genPdfBeforeExport({ id: record.id, salarySendId: getQueryString("id") })
.then(({ status, errormsg }) => {
if (status) {
window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/exportPdf?id=${record.id}&salarySendId=${getQueryString("id")}`, "_blank");
} else {
message.error(errormsg);
}
});
}}>
{getLabel(111, "导出PDF")}
</a>
@ -343,7 +350,14 @@ export default class PayrollGrant extends React.Component {
<a
href="javascript:void(0);"
onClick={() => {
window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/exportPdf?id=${record.id}&salarySendId=${getQueryString("id")}`, "_blank");
genPdfBeforeExport({ id: record.id, salarySendId: getQueryString("id") })
.then(({ status, errormsg }) => {
if (status) {
window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/exportPdf?id=${record.id}&salarySendId=${getQueryString("id")}`, "_blank");
} else {
message.error(errormsg);
}
});
}}>
{getLabel(111, "导出PDF")}
</a>