From 8af1f0a79a58ed712790bfc3b745e88ffeff6d18 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, 19 Mar 2024 17:55:37 +0800 Subject: [PATCH] =?UTF-8?q?hotfix/2.12.1.2403.02=20=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doCalc/components/salaryEditCalcImport/index.js | 2 +- .../dataAcquisition/attendance/components/importDialog.js | 5 ++++- .../payrollFiles/components/salaryFileImportDialog/index.js | 2 +- .../components/standingBookCalcImportDialog.js | 2 +- .../components/welfareArchivesImportDialog/index.js | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js index 463c7df4..ce58c616 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js @@ -63,7 +63,7 @@ class Index extends Component { this.setState({ importDialog: { ...this.state.importDialog, link: this.handleExportTemp, - visible: nextProps.visible, title: nextProps.title + visible: nextProps.visible, title: nextProps.title, importResult: {} } }); } diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/importDialog.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/importDialog.js index bf67e4b2..72df9bde 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/importDialog.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/importDialog.js @@ -29,7 +29,10 @@ class Index extends Component { const { hasData, importDialog } = this.state; const { params, previewUrl } = nextProps; this.setState({ - importDialog: { ...importDialog, link: this.handleExportTemp, params, previewUrl, extraPreview: params } + importDialog: { + ...importDialog, importResult: {}, link: this.handleExportTemp, + params, previewUrl, extraPreview: params + } }); } diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileImportDialog/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileImportDialog/index.js index 1a60b901..313a8675 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileImportDialog/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileImportDialog/index.js @@ -51,7 +51,7 @@ class Index extends Component { if (isExtEmp) payload = { ...payload, extSalaryArchiveList: true }; this.setState({ importDialog: { - ...this.state.importDialog, extraPreview, + ...this.state.importDialog, extraPreview, importResult: {}, link: `/api/bs/hrmsalary/salaryArchive/downloadTemplate?${convertToUrlString(payload)}` } }); diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/standingBookCalcImportDialog.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/standingBookCalcImportDialog.js index 0dc97e42..fb4a2db8 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/standingBookCalcImportDialog.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/standingBookCalcImportDialog.js @@ -33,7 +33,7 @@ class StandingBookCalcImportDialog extends Component { const { data } = await API[fieldUrl](); this.setState({ importDialog: { - ...this.state.importDialog, link: this.handleExportTemp, title: getLabel(24023, "数据导入") + ...this.state.importDialog, importResult: {}, link: this.handleExportTemp, title: getLabel(24023, "数据导入") }, headerFieldsDialog: { ...this.state.headerFieldsDialog, itemsByGroup: data, diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareArchivesImportDialog/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareArchivesImportDialog/index.js index 149a304c..b61a17c2 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareArchivesImportDialog/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareArchivesImportDialog/index.js @@ -35,7 +35,7 @@ class Index extends Component { }; this.setState({ importDialog: { - ...this.state.importDialog, + ...this.state.importDialog, importResult: {}, link: `/api/bs/hrmsalary/scheme/template/export?${convertToUrlString(payload)}` } });