From 8f582ad3dd74cb2402e6d20463dbef544eba70d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Sat, 11 May 2024 15:06:47 +0800 Subject: [PATCH] hotfix/2.12.1.2404.02 --- pc4mobx/hrmSalary/apis/payroll.js | 4 ++++ .../pages/payroll/payrollGrant/index.js | 20 ++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/apis/payroll.js b/pc4mobx/hrmSalary/apis/payroll.js index 01048186..b78fac43 100644 --- a/pc4mobx/hrmSalary/apis/payroll.js +++ b/pc4mobx/hrmSalary/apis/payroll.js @@ -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); +}; diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js index 4e44a75f..52bb065c 100644 --- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js +++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js @@ -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 { { - 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")} @@ -343,7 +350,14 @@ export default class PayrollGrant extends React.Component { { - 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")}