Merge branch 'feature/2.9.42310.01-工资单时效设置' into develop

This commit is contained in:
黎永顺 2023-10-08 09:02:43 +08:00
commit a01f2cc686
2 changed files with 39 additions and 5 deletions

View File

@ -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;
}
}
}

View File

@ -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 (
<React.Fragment>
<WeaSearchGroup title={getLabel(111, "水印设置")} showGroup needTigger className="waterMarkWrapper">
@ -160,6 +170,18 @@ class TemplateBaseSettings extends Component {
</React.Fragment>
}
</WeaSearchGroup>
<WeaSearchGroup title={getLabel(111, "工资单时效设置")} showGroup needTigger className="waterMarkWrapper">
<div className="agingBox">
<span>{getLabel(111, "仅可查看")}</span>
<WeaInputNumber min={0} value={limitMonth}
onChange={limitMonth => this.setState({
salaryBillViewingLimitSetting: {
...salaryBillViewingLimitSetting, limitMonth
}
})}/>
<span>{getLabel(111, "个月内的工资单")}</span>
</div>
</WeaSearchGroup>
</React.Fragment>
);
}