Merge branch 'hotfix/2.10.1.2402.01' into release/2.10.1.2402.01

This commit is contained in:
黎永顺 2024-03-06 14:33:55 +08:00
commit 0301618fc5
1 changed files with 9 additions and 2 deletions

View File

@ -70,8 +70,15 @@ class TemplateBaseSettings extends Component {
};
salaryBillBaseSetSave = () => {
const { watermark, watermarkStatus, wmSetting, ackFeedbackSetting, salaryBillViewingLimitSetting } = this.state;
const { feedBackUrl, mobileFeedbackUrl } = ackFeedbackSetting;
if (!feedBackUrl || !mobileFeedbackUrl) {
const { feedBackUrl, mobileFeedbackUrl, feedbackStatus, autoAckDays, ackStatus } = ackFeedbackSetting;
if (ackStatus === "1" && _.isNil(autoAckDays)) {
Modal.warning({
title: getLabel(111, "信息确认"),
content: getLabel(111, "必要信息不完整,红色*为必填项!")
});
return;
}
if (feedbackStatus === "1" && (!feedBackUrl || !mobileFeedbackUrl)) {
Modal.warning({
title: getLabel(111, "信息确认"),
content: getLabel(111, "必要信息不完整,红色*为必填项!")