From c15fc127d28122dede6b23b41c88f992d508286d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 7 Jun 2023 15:35:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84=E5=8D=95?=
 =?UTF-8?q?=E5=8F=91=E6=94=BE=E6=B7=BB=E5=8A=A0=E8=BF=9B=E5=BA=A6=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js      | 6 +++---
 pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
index 3a3b42f1..aae01241 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
@@ -92,7 +92,7 @@ export default class PayrollGrant extends React.Component {
               progressVisible: false,
               progress: 0
             });
-            message.success(getLabel(111, "发放成功"));
+            message.success(data.message);
             getInfoList({
               salarySendId: currentId,
               isGranted: selectedKey !== "0",
@@ -211,7 +211,7 @@ export default class PayrollGrant extends React.Component {
               progressVisible: false,
               progress: 0
             });
-            message.success(getLabel(111, "发放成功"));
+            message.success(data.message);
             getInfoList({
               salarySendId: currentId,
               isGranted: selectedKey !== "0"
@@ -248,7 +248,7 @@ export default class PayrollGrant extends React.Component {
               progressVisible: false,
               progress: 0
             });
-            message.success(getLabel(111, "发放成功"));
+            message.success(data.message);
             getInfoList({
               salarySendId: currentId,
               isGranted: selectedKey !== "0"
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
index f57f0b21..69ebf94e 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
@@ -33,6 +33,7 @@ export default class BaseInformForm extends React.Component {
           }, ...toJS(data.salarySobOptions)],
           request: {
             ...data.templateBaseData,
+            msgStatus: !this.props.id ? "1" : data.templateBaseData.msgStatus,
             reissueRule: data.templateBaseData.replenishRule ? "1" : "0",
             ...JSON.parse(templateBaseData)
           }
@@ -156,7 +157,7 @@ export default class BaseInformForm extends React.Component {
         <WeaSearchGroup title={getLabel(111, "发送设置")} items={[]} needTigger showGroup col={1}
                         className="payrollBaseInfoWrapper">
           <WeaFormItem label={getLabel(111, "系统消息")} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
-            <WeaCheckbox value={(msgStatus || !this.props.id) ? "1" : "0"} display="switch"
+            <WeaCheckbox value={msgStatus ? "1" : "0"} display="switch"
                          onChange={value => this.hanldeChange({ msgStatus: value === "1" })}/>
           </WeaFormItem>
           <WeaFormItem label={getLabel(111, "邮件")} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>