From 6aed11a4110ee6aef719b6a7389fba0df189d510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 31 Oct 2023 15:45:15 +0800 Subject: [PATCH] hotfix/2.9.42310.02 --- .../components/salaryEditCalcImport/index.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js index c41f294f..e0df44cb 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js @@ -88,7 +88,8 @@ class Index extends Component { if (!selectItems) { message.error(getLabel(111, "请选择表头字段")); } else { - window.open(exportTempUrl, "_blank"); + console.log(exportTempUrl); + // window.open(exportTempUrl, "_blank"); } }; handleSelectedField = () => { @@ -155,7 +156,20 @@ class Index extends Component { } }, () => { const { selectItems: salaryItems } = this.state.headerFieldsDialog; - cacheImportField({ salaryItems: salaryItems ? salaryItems.split(",") : [] }).then(); + cacheImportField({ salaryItems: salaryItems ? salaryItems.split(",") : [] }) + .then(({ status, errormsg }) => { + if (status) { + const payload = { + exportData: getURLParameters(exportTempUrl).exportData, + salaryAcctRecordId, salaryItemIds: salaryItems + }; + this.setState(({ + exportTempUrl: `/api/bs/hrmsalary/salaryacct/acctresult/importtemplate/export?${convertToUrlString(payload)}` + })); + } else { + message.error(errormsg); + } + }); })} />