Merge branch 'release/3.0.0.2403.01' into release/3.0.0.2403.01-个税
This commit is contained in:
commit
e4a80a0724
|
|
@ -40,7 +40,7 @@ class TemplateBaseSettings extends Component {
|
||||||
mobileFeedbackUrl: ""
|
mobileFeedbackUrl: ""
|
||||||
},
|
},
|
||||||
salaryBillViewingLimitSetting: {
|
salaryBillViewingLimitSetting: {
|
||||||
limitMonth: 0
|
limitMonth: 0, burningAfterReadingMin: null
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -106,7 +106,7 @@ class TemplateBaseSettings extends Component {
|
||||||
render() {
|
render() {
|
||||||
const { watermarkStatus, watermark, watermarkSet, ackFeedbackSetting, salaryBillViewingLimitSetting } = this.state;
|
const { watermarkStatus, watermark, watermarkSet, ackFeedbackSetting, salaryBillViewingLimitSetting } = this.state;
|
||||||
const { ackStatus, feedbackStatus, autoAckDays, feedBackUrl, mobileFeedbackUrl } = ackFeedbackSetting;
|
const { ackStatus, feedbackStatus, autoAckDays, feedBackUrl, mobileFeedbackUrl } = ackFeedbackSetting;
|
||||||
const { limitMonth } = salaryBillViewingLimitSetting;
|
const { limitMonth, burningAfterReadingMin } = salaryBillViewingLimitSetting;
|
||||||
return (
|
return (
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
<WeaSearchGroup title={getLabel(111, "水印设置")} showGroup needTigger className="waterMarkWrapper">
|
<WeaSearchGroup title={getLabel(111, "水印设置")} showGroup needTigger className="waterMarkWrapper">
|
||||||
|
|
@ -216,6 +216,20 @@ class TemplateBaseSettings extends Component {
|
||||||
style={{ marginLeft: 10 }}
|
style={{ marginLeft: 10 }}
|
||||||
placement="top"/>
|
placement="top"/>
|
||||||
</div>
|
</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>
|
</WeaSearchGroup>
|
||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -231,7 +231,7 @@ class SalaryFiles extends Component {
|
||||||
message.warning(getLabel(543345, "请选择需要导出的数据!"));
|
message.warning(getLabel(543345, "请选择需要导出的数据!"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
payload = { ids: selectedRowKeys.join(",") };
|
payload = { ids: selectedRowKeys.join(","), runStatusList };
|
||||||
}
|
}
|
||||||
window.open(`${url}?${convertToUrlString(payload)}`, "_blank");
|
window.open(`${url}?${convertToUrlString(payload)}`, "_blank");
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue