From 817f9767fc904da6e824505aed0dcc15dc686a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 30 Jan 2024 16:57:21 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.10.1.2401.01-=E5=B7=A5=E8=B5=84?=
 =?UTF-8?q?=E5=8D=95=E9=85=8D=E7=BD=AE=E5=8F=8D=E9=A6=88=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hrmSalary/pages/mobilePayroll/index.js    | 26 ++++++++-----------
 .../hrmSalary/pages/mySalary/mySalaryView.js  | 22 +++++++++-------
 .../pages/payroll/templateBaseSettings.js     | 18 +++++++++++--
 .../payrollRelease/components/conditions.js   | 11 ++++++++
 .../components/payrollTempBaseSet/index.js    | 19 +++++++++-----
 .../updatePayrollTemplateSlide/index.js       |  3 ++-
 6 files changed, 66 insertions(+), 33 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
index 98912d8a..d53d8fc7 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
@@ -201,7 +201,7 @@ export default class MobilePayroll extends React.Component {
     </div>;
     const {
       salaryTemplate, salaryGroups, employeeInformation,
-      sendTime, confirmStatus
+      sendTime, confirmStatus, showAck, showFeedback
     } = toJS(this.props.mySalaryStore.mySalaryBill);
     const salaryProps = {
       theme: salaryTemplate.theme, tip: salaryTemplate.textContent, sendTime,
@@ -215,13 +215,11 @@ export default class MobilePayroll extends React.Component {
             <Authority ecId={`${this && this.props && this.props.ecId || ""}_Authority@lulowc`}
                        store={this.props.mySalaryStore}>
               <MobileTemplate {...salaryProps} title={getLabel(111, "工资单查看")}>
-                {
-                  (_.isNil(confirmStatus) || confirmStatus === "0") &&
-                  <ConfirmBtns
-                    confirmSalaryBill={this.confirmSalaryBill}
-                    goFeedback={this.handleGoFeedback}
-                  />
-                }
+                <ConfirmBtns
+                  showAck={showAck} showFeedback={showFeedback}
+                  confirmSalaryBill={this.confirmSalaryBill}
+                  goFeedback={this.handleGoFeedback}
+                />
               </MobileTemplate>
             </Authority>
             :
@@ -229,13 +227,11 @@ export default class MobilePayroll extends React.Component {
                        store={this.props.mySalaryStore}>
               <div className="weapp-salary-my-salary-view-payroll">
                 <Content {...salaryProps}>
-                  {
-                    (_.isNil(confirmStatus) || confirmStatus === "0") &&
-                    <ConfirmBtns
-                      confirmSalaryBill={this.confirmSalaryBill}
-                      goFeedback={this.handleGoFeedback}
-                    />
-                  }
+                  <ConfirmBtns
+                    showAck={showAck} showFeedback={showFeedback}
+                    confirmSalaryBill={this.confirmSalaryBill}
+                    goFeedback={this.handleGoFeedback}
+                  />
                 </Content>
               </div>
             </Authority>
diff --git a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
index 0ddd835d..5fa76f93 100644
--- a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
+++ b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
@@ -96,13 +96,11 @@ class MySalaryView extends Component {
                    store={this.props.mySalaryStore}>
           <div className="weapp-salary-my-salary-view-payroll">
             <Content {...salaryProps}>
-              {
-                (_.isNil(mySalaryStore.confirmStatus) || mySalaryStore.confirmStatus === "0") &&
-                <ConfirmBtns
-                  confirmSalaryBill={this.confirmSalaryBill}
-                  goFeedback={this.handleGoFeedback}
-                />
-              }
+              <ConfirmBtns
+                showAck={mySalaryStore.showAck} showFeedback={mySalaryStore.showFeedback}
+                confirmSalaryBill={this.confirmSalaryBill}
+                goFeedback={this.handleGoFeedback}
+              />
             </Content>
           </div>
         </Authority>
@@ -120,7 +118,13 @@ export default MySalaryView;
 
 export const ConfirmBtns = (props) => {
   return <div className="space">
-    <Button type="primary" onClick={props.confirmSalaryBill}>{getLabel(111, "确认")}</Button>
-    <Button type="ghost" onClick={props.goFeedback}>{getLabel(111, "反馈")}</Button>
+    {
+      props.showAck === "1" &&
+      <Button type="primary" onClick={props.confirmSalaryBill}>{getLabel(111, "确认")}</Button>
+    }
+    {
+      props.showFeedback === "1" &&
+      <Button type="ghost" onClick={props.goFeedback}>{getLabel(111, "反馈")}</Button>
+    }
   </div>;
 };
diff --git a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
index f64ad003..d8a1eeb2 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
+++ b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
@@ -34,6 +34,7 @@ class TemplateBaseSettings extends Component {
       },
       ackFeedbackSetting: {
         ackStatus: "0",
+        feedbackStatus: "0",
         autoAckDays: 7,
         feedBackUrl: "",
         mobileFeedbackUrl: ""
@@ -97,7 +98,7 @@ class TemplateBaseSettings extends Component {
 
   render() {
     const { watermarkStatus, watermark, watermarkSet, ackFeedbackSetting, salaryBillViewingLimitSetting } = this.state;
-    const { ackStatus, autoAckDays, feedBackUrl, mobileFeedbackUrl } = ackFeedbackSetting;
+    const { ackStatus, feedbackStatus, autoAckDays, feedBackUrl, mobileFeedbackUrl } = ackFeedbackSetting;
     const { limitMonth = 0 } = salaryBillViewingLimitSetting;
     return (
       <React.Fragment>
@@ -156,9 +157,22 @@ class TemplateBaseSettings extends Component {
                   })}/>
                 <WeaHelpfulTip
                   title={getLabel(111, "开启后，还需在计划任务中配置定时任务，执行自动确认任务；邮箱端查看工资单暂不支持确认及反馈；")}
-                  style={{ marginLeft: 10 }}
+                  style={{ marginLeft: 5 }}
                   placement="top" width={200}/>
               </WeaFormItem>
+            </React.Fragment>
+          }
+          <WeaFormItem label={getLabel(111, "启用工资单反馈")} labelCol={{ span: 2 }} wrapperCol={{ span: 4 }}>
+            <WeaCheckbox value={feedbackStatus} display="switch"
+                         onChange={feedbackStatus => this.setState({
+                           ackFeedbackSetting: {
+                             ...ackFeedbackSetting, feedbackStatus
+                           }
+                         })}/>
+          </WeaFormItem>
+          {
+            feedbackStatus === "1" &&
+            <React.Fragment>
               <WeaFormItem label={getLabel(111, "PC端反馈流程地址")} labelCol={{ span: 2 }} wrapperCol={{ span: 4 }}>
                 <WeaInput
                   value={feedBackUrl} viewAttr={3}
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js
index dc8797e1..1bbae152 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js
@@ -202,6 +202,17 @@ export const tempBaseSetFbConditions = [
         hide: false,
         rules: "required"
       },
+      {
+        colSpan: 1,
+        conditionType: "SWITCH",
+        domkey: ["feedbackStatus"],
+        fieldcol: 2,
+        label: "启用工资单反馈",
+        lanId: 111,
+        labelcol: 6,
+        value: "1",
+        viewAttr: 2
+      },
       {
         colSpan: 1,
         conditionType: "INPUT",
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempBaseSet/index.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempBaseSet/index.js
index 770c1665..99817be5 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempBaseSet/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempBaseSet/index.js
@@ -132,7 +132,7 @@ class Index extends Component {
                   } else if (getKey(o) === "feedbackUrl" || getKey(o) === "mobileFeedbackUrl") {
                     return {
                       ...o,
-                      hide: _.isNil(fieldsEchoData["ackFeedbackStatus"]) ? o.hide : !fieldsEchoData["ackFeedbackStatus"]
+                      hide: _.isNil(fieldsEchoData["feedbackStatus"]) ? o.hide : !fieldsEchoData["feedbackStatus"]
                     };
                   }
                   return { ...o };
@@ -171,7 +171,7 @@ class Index extends Component {
             }
           });
           _.map(tempBaseSetFbDomkeys, it => {
-            if (it === "ackFeedbackStatus") {
+            if (it === "ackFeedbackStatus" || it === "feedbackStatus") {
               payrollTempFeedbackForm.updateFields({ [it]: fieldsEchoData[it] ? "1" : "0" });
             } else {
               payrollTempFeedbackForm.updateFields({ [it]: !_.isNil(fieldsEchoData[it]) ? fieldsEchoData[it].toString() : "/" });
@@ -292,15 +292,19 @@ class Index extends Component {
   handleFbChange = (params) => {
     const { payrollStore: { payrollTempFeedbackForm, setHasBeenModify } } = this.props;
     const key = _.keys(params)[0];
-    if (key === "ackFeedbackStatus") {
+    if (key === "ackFeedbackStatus" || key === "feedbackStatus") {
       this.setState({
         fbConditions: _.map(this.state.fbConditions, it => {
           if (it.title === getLabel(544092, "工资单确认反馈设置")) {
             return {
               ...it, items: _.map(it.items, o => {
-                if (getKey(o) === "autoAckDays" || getKey(o) === "feedbackUrl" || getKey(o) === "mobileFeedbackUrl") {
+                if (getKey(o) === "autoAckDays") {
                   return {
-                    ...o, hide: params[key].value === "0"
+                    ...o, hide: key === "ackFeedbackStatus" && params["ackFeedbackStatus"].value === "0"
+                  };
+                } else if (getKey(o) === "feedbackUrl" || getKey(o) === "mobileFeedbackUrl") {
+                  return {
+                    ...o, hide: key === "feedbackStatus" && params["feedbackStatus"].value === "0"
                   };
                 }
                 return { ...o };
@@ -312,8 +316,11 @@ class Index extends Component {
       }, () => {
         payrollTempFeedbackForm.initFormFields(this.state.fbConditions);
         const ackFeedbackStatus = payrollTempFeedbackForm.getFormParams().ackFeedbackStatus;
+        const feedbackStatus = payrollTempFeedbackForm.getFormParams().feedbackStatus;
         if (ackFeedbackStatus === "0") payrollTempFeedbackForm.updateFields({
-          autoAckDays: "7",
+          autoAckDays: "7"
+        });
+        if (feedbackStatus === "0") payrollTempFeedbackForm.updateFields({
           feedbackUrl: "/",
           mobileFeedbackUrl: "/"
         });
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/updatePayrollTemplateSlide/index.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/updatePayrollTemplateSlide/index.js
index ac2cb87c..9b0a1c53 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/updatePayrollTemplateSlide/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/updatePayrollTemplateSlide/index.js
@@ -46,11 +46,12 @@ class Index extends Component {
       const {
           replenishRule, autoSendStatus, emailStatus, msgStatus, smsStatus, ...extraBs
         } = payrollTempForm.getFormParams(),
-        { ackFeedbackStatus, autoAckDays, ...extraFb } = payrollTempFeedbackForm.getFormParams(),
+        { ackFeedbackStatus, feedbackStatus, autoAckDays, ...extraFb } = payrollTempFeedbackForm.getFormParams(),
         { formData, smsSettingDialog } = this.tmpBaseSetRef.state;
       const payload = {
         ...toJS(tmplDataSource), ...extraFb, ...formData, ...extraBs,
         ackFeedbackStatus: ackFeedbackStatus === "1",
+        feedbackStatus: feedbackStatus === "1",
         autoSendStatus: autoSendStatus === "1",
         emailStatus: emailStatus === "1",
         msgStatus: msgStatus === "1",