From c365d2eb564fd450a0bca9b56c91f1135413d364 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, 7 Oct 2023 16:37:44 +0800 Subject: [PATCH] =?UTF-8?q?feature/2.9.42310.01-=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E5=8D=95=E6=97=B6=E6=95=88=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/payroll/index.less | 12 +++++++ .../pages/payroll/templateBaseSettings.js | 32 ++++++++++++++++--- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/payroll/index.less b/pc4mobx/hrmSalary/pages/payroll/index.less index f760536f..2c05bd82 100644 --- a/pc4mobx/hrmSalary/pages/payroll/index.less +++ b/pc4mobx/hrmSalary/pages/payroll/index.less @@ -19,4 +19,16 @@ margin-top: -10px; } } + + .agingBox { + display: flex; + align-items: center; + padding: 5px 16px; + border-bottom: 1px solid #e5e5e5; + + .wea-input-number { + width: inherit !important; + margin: 0 10px; + } + } } diff --git a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js index 2d876674..f894b6b3 100644 --- a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js +++ b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js @@ -36,6 +36,9 @@ class TemplateBaseSettings extends Component { ackStatus: "0", autoAckDays: 7, feedBackUrl: "" + }, + salaryBillViewingLimitSetting: { + limitMonth: 0 } }; } @@ -48,9 +51,12 @@ class TemplateBaseSettings extends Component { const { watermarkSet } = this.state; getSalaryBillBaseSetForm().then(({ status, data }) => { if (status) { - const { watermarkStatus, watermark = "DEFAULT", watermarkSetting, ackFeedbackSetting } = data; + const { + watermarkStatus, watermark = "DEFAULT", watermarkSetting, + ackFeedbackSetting, salaryBillViewingLimitSetting = {} + } = data; this.setState({ - watermark, watermarkStatus: watermarkStatus ? "1" : "0", ackFeedbackSetting, + watermark, watermarkStatus: watermarkStatus ? "1" : "0", ackFeedbackSetting, salaryBillViewingLimitSetting, wmSetting: { wmSetting: watermarkSetting }, watermarkSet: { ...watermarkSet, @@ -61,7 +67,7 @@ class TemplateBaseSettings extends Component { }); }; salaryBillBaseSetSave = () => { - const { watermark, watermarkStatus, wmSetting, ackFeedbackSetting } = this.state; + const { watermark, watermarkStatus, wmSetting, ackFeedbackSetting, salaryBillViewingLimitSetting } = this.state; const { feedBackUrl } = ackFeedbackSetting; if (!feedBackUrl) { Modal.warning({ @@ -70,7 +76,10 @@ class TemplateBaseSettings extends Component { }); return; } - let payload = { watermarkStatus: watermarkStatus === "1", ackFeedbackSetting: { ...ackFeedbackSetting } }; + let payload = { + watermarkStatus: watermarkStatus === "1", ackFeedbackSetting: { ...ackFeedbackSetting }, + salaryBillViewingLimitSetting: { ...salaryBillViewingLimitSetting } + }; if (watermarkStatus === "1") payload = { ...payload, watermark }; if (!_.isNil(wmSetting)) payload = { ...payload, watermark, ...wmSetting }; this.props.onChangeLoading(true); @@ -86,8 +95,9 @@ class TemplateBaseSettings extends Component { }; render() { - const { watermarkStatus, watermark, watermarkSet, ackFeedbackSetting } = this.state; + const { watermarkStatus, watermark, watermarkSet, ackFeedbackSetting, salaryBillViewingLimitSetting } = this.state; const { ackStatus, autoAckDays, feedBackUrl } = ackFeedbackSetting; + const { limitMonth = 0 } = salaryBillViewingLimitSetting; return ( @@ -160,6 +170,18 @@ class TemplateBaseSettings extends Component { } + + + {getLabel(111, "仅可查看")} + this.setState({ + salaryBillViewingLimitSetting: { + ...salaryBillViewingLimitSetting, limitMonth + } + })}/> + {getLabel(111, "个月内的工资单")} + + ); }