diff --git a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
index 742fa874..08b4e813 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
+++ b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
@@ -5,8 +5,16 @@
* Date: 2023/6/12
*/
import React, { Component } from "react";
-import { WeaCheckbox, WeaFormItem, WeaLocaleProvider, WeaSearchGroup, WeaSelect } from "ecCom";
-import { message } from "antd";
+import {
+ WeaCheckbox,
+ WeaFormItem,
+ WeaInput,
+ WeaInputNumber,
+ WeaLocaleProvider,
+ WeaSearchGroup,
+ WeaSelect
+} from "ecCom";
+import { message, Modal } from "antd";
import { getSalaryBillBaseSetForm, salaryBillBaseSetSave } from "../../apis/payroll";
import WaterMarkSetModal from "./components/waterMarkSetModal";
import "./index.less";
@@ -22,6 +30,11 @@ class TemplateBaseSettings extends Component {
wmSetting: null,
watermarkSet: {
visible: false, watermarkSetting: null
+ },
+ ackFeedbackSetting: {
+ ackStatus: "0",
+ autoAckDays: 7,
+ feedBackUrl: ""
}
};
}
@@ -34,9 +47,10 @@ class TemplateBaseSettings extends Component {
const { watermarkSet } = this.state;
getSalaryBillBaseSetForm().then(({ status, data }) => {
if (status) {
- const { watermarkStatus, watermark = "DEFAULT", watermarkSetting } = data;
+ const { watermarkStatus, watermark = "DEFAULT", watermarkSetting, ackFeedbackSetting } = data;
this.setState({
- watermark, watermarkStatus: watermarkStatus ? "1" : "0",
+ watermark, watermarkStatus: watermarkStatus ? "1" : "0", ackFeedbackSetting,
+ wmSetting: { wmSetting: watermarkSetting },
watermarkSet: {
...watermarkSet,
watermarkSetting
@@ -46,8 +60,16 @@ class TemplateBaseSettings extends Component {
});
};
salaryBillBaseSetSave = () => {
- const { watermark, watermarkStatus, wmSetting } = this.state;
- let payload = { watermarkStatus: watermarkStatus === "1" };
+ const { watermark, watermarkStatus, wmSetting, ackFeedbackSetting } = this.state;
+ const { feedBackUrl } = ackFeedbackSetting;
+ if (!feedBackUrl) {
+ Modal.warning({
+ title: getLabel(111, "信息确认"),
+ content: getLabel(111, "必要信息不完整,红色*为必填项!")
+ });
+ return;
+ }
+ let payload = { watermarkStatus: watermarkStatus === "1", ackFeedbackSetting: { ...ackFeedbackSetting } };
if (watermarkStatus === "1") payload = { ...payload, watermark };
if (!_.isNil(wmSetting)) payload = { ...payload, watermark, ...wmSetting };
this.props.onChangeLoading(true);
@@ -63,40 +85,76 @@ class TemplateBaseSettings extends Component {
};
render() {
- const { watermarkStatus, watermark, watermarkSet } = this.state;
+ const { watermarkStatus, watermark, watermarkSet, ackFeedbackSetting } = this.state;
+ const { ackStatus, autoAckDays, feedBackUrl } = ackFeedbackSetting;
return (
-