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 ( - - - this.setState({ watermarkStatus, watermark: "DEFAULT" })}/> - - { - watermarkStatus === "1" && - - this.setState({ watermark })} - /> - { - watermark === "CUSTOM" && - this.setState({ - watermarkSet: { - ...watermarkSet, - visible: true - } - })}>{getLabel(111, "水印设置")} - } - this.setState({ watermarkSet: { ...watermarkSet, visible: false } })} - onChange={wmSetting => this.setState({ wmSetting })} - /> + + + + this.setState({ watermarkStatus, watermark: "DEFAULT" })}/> - } - + { + watermarkStatus === "1" && + + this.setState({ watermark })} + /> + { + watermark === "CUSTOM" && + this.setState({ + watermarkSet: { + ...watermarkSet, + visible: true + } + })}>{getLabel(111, "水印设置")} + } + this.setState({ watermarkSet: { ...watermarkSet, visible: false } })} + onChange={wmSetting => this.setState({ wmSetting })} + /> + + } + + + + this.setState({ + ackFeedbackSetting: { + ...ackFeedbackSetting, ackStatus, autoAckDays: 7 + } + })}/> + + { + ackStatus === "1" && + + + this.setState({ + ackFeedbackSetting: { + ...ackFeedbackSetting, autoAckDays + } + })}/> + + + this.setState({ + ackFeedbackSetting: { + ...ackFeedbackSetting, feedBackUrl + } + })}/> + + + } + + ); } } diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/index.js b/pc4mobx/hrmSalary/pages/ruleConfig/index.js index ed293c72..535f5e87 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/index.js +++ b/pc4mobx/hrmSalary/pages/ruleConfig/index.js @@ -26,7 +26,6 @@ export default class Index extends Component { enctry: "", operateTaxDeclaration: "", matchRule: "", - salarySendFeedback: "" }, showEncryptOperationButton: "", progressVisible: false, @@ -55,7 +54,6 @@ export default class Index extends Component { isOpenEncrypt: enctry, isOpenTaxDeclaration: operateTaxDeclaration, salaryAcctEmployeeRule: matchRule, - salarySendFeedback } } = appSettings; this.setState({ @@ -63,7 +61,7 @@ export default class Index extends Component { showEncryptOperationButton, saveParams: { ...saveParams, - ascOrDesc, orderRule, rule, enctry, operateTaxDeclaration, matchRule, salarySendFeedback + ascOrDesc, orderRule, rule, enctry, operateTaxDeclaration, matchRule } }); } @@ -130,16 +128,6 @@ export default class Index extends Component { } }); }; - saveSalarySendFeedback = () => { - API.saveSalarySendFeedback({ confValue: this.state.saveParams.salarySendFeedback }) - .then(({ status, errormsg }) => { - if (status) { - message.success(getLabel(22619, "保存成功!")); - } else { - message.error(errormsg || getLabel(22620, "保存失败!")); - } - }); - }; operateTaxDeclarationFunction = () => { API.operateTaxDeclarationFunction(_.pick(this.state.saveParams, ["operateTaxDeclaration"])) .then(({ status, errormsg }) => { @@ -239,9 +227,6 @@ export default class Index extends Component { case "enctry": this.saveEncryptSetting(); break; - case "salarySendFeedback": - this.saveSalarySendFeedback(); - break; default: break; } @@ -267,7 +252,7 @@ export default class Index extends Component { employeeOptions, showEncryptOperationButton } = this.state; - const { orderRule, ascOrDesc, rule, enctry, operateTaxDeclaration, matchRule, salarySendFeedback } = saveParams; + const { orderRule, ascOrDesc, rule, enctry, operateTaxDeclaration, matchRule } = saveParams; return (
- - - this.handleChange("salarySendFeedback", val)}/> - - { this.state.progressVisible &&