Merge branch 'hotfix/2.10.1.2402.01' into release/3.0.0.2403.01

This commit is contained in:
黎永顺 2024-03-12 09:37:44 +08:00
commit 20796bc14c
2 changed files with 17 additions and 3 deletions

View File

@ -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 (
<React.Fragment>
<WeaSearchGroup title={getLabel(111, "水印设置")} showGroup needTigger className="waterMarkWrapper">
@ -216,6 +216,20 @@ class TemplateBaseSettings extends Component {
style={{ marginLeft: 10 }}
placement="top"/>
</div>
<div className="agingBox">
<span>{getLabel(111, "首次查看")}</span>
<WeaInputNumber min={0} value={burningAfterReadingMin}
onChange={burningAfterReadingMin => this.setState({
salaryBillViewingLimitSetting: {
...salaryBillViewingLimitSetting, burningAfterReadingMin
}
})}/>
<span>{getLabel(111, "分钟后无法查看工资单")}</span>
<WeaHelpfulTip
title={getLabel(111, "空代表不控制0代表只能查看一次工资单")}
style={{ marginLeft: 10 }}
placement="top"/>
</div>
</WeaSearchGroup>
</React.Fragment>
);

View File

@ -231,7 +231,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");
};