From e4d272481c93ac2c88335b95fef9e7424e9c74b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Mon, 11 Mar 2024 17:19:20 +0800 Subject: [PATCH] =?UTF-8?q?hotfix/3.0.0.2403.01=20=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E5=8D=95=E8=AE=BE=E7=BD=AE=E6=B7=BB=E5=8A=A0=E5=A4=B1=E6=95=88?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/payroll/templateBaseSettings.js | 18 ++++++++++++++++-- .../pages/payrollFiles/salaryFiles.js | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js index 059b9aa3..ec910237 100644 --- a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js +++ b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js @@ -40,7 +40,7 @@ class TemplateBaseSettings extends Component { mobileFeedbackUrl: "" }, salaryBillViewingLimitSetting: { - limitMonth: 0 + limitMonth: 0, burningAfterReadingMin: null } }; } @@ -106,7 +106,7 @@ class TemplateBaseSettings extends Component { render() { const { watermarkStatus, watermark, watermarkSet, ackFeedbackSetting, salaryBillViewingLimitSetting } = this.state; const { ackStatus, feedbackStatus, autoAckDays, feedBackUrl, mobileFeedbackUrl } = ackFeedbackSetting; - const { limitMonth } = salaryBillViewingLimitSetting; + const { limitMonth, burningAfterReadingMin } = salaryBillViewingLimitSetting; return ( @@ -216,6 +216,20 @@ class TemplateBaseSettings extends Component { style={{ marginLeft: 10 }} placement="top"/> +
+ {getLabel(111, "首次查看")} + this.setState({ + salaryBillViewingLimitSetting: { + ...salaryBillViewingLimitSetting, burningAfterReadingMin + } + })}/> + {getLabel(111, "分钟后无法查看工资单")} + +
); diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js b/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js index 8ef3c6df..3c670d5c 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js @@ -224,7 +224,7 @@ class SalaryFiles extends Component { message.warning(getLabel(543345, "请选择需要导出的数据!")); return; } - payload = { ids: selectedRowKeys.join(",") }; + payload = { ids: selectedRowKeys.join(","), runStatusList }; } window.open(`${url}?${convertToUrlString(payload)}`, "_blank"); };