diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/baseInfo.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/baseInfo.js
index c12b35e7..f2ed7354 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/baseInfo.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/baseInfo.js
@@ -31,7 +31,7 @@ class BaseInfo extends Component {
     if (salaryInfo.status && salarySobCycle.status) {
       this.setState({
         salaryInfo: salaryInfo.data, salarySobCycle: salarySobCycle.data
-      });
+      }, () => this.props.onSetFormInfo(salaryInfo.data.formDTO.msg));
     }
   };
 
@@ -72,4 +72,4 @@ class BaseInfo extends Component {
   }
 }
 
-export default BaseInfo;
+export default BaseInfo;
\ No newline at end of file
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
index a8280592..78c50ee2 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
@@ -5,7 +5,7 @@
  * Date: 2023/9/13
  */
 import React, { Component } from "react";
-import { WeaLocaleProvider, WeaReqTop } from "ecCom";
+import { WeaHelpfulTip, WeaLocaleProvider, WeaReqTop } from "ecCom";
 import { Button, Dropdown, Menu, message, Modal } from "antd";
 import { inject, observer } from "mobx-react";
 import Layout from "./layout";
@@ -30,6 +30,7 @@ class Index extends Component {
       selectedKey: "person", progressVisible: false, progress: 0, loading: { calcTax: false, feedback: false },
       customExpDialog: { visible: false, salaryAcctRecordId: "", checkItems: [], itemsByGroup: [] },
       salaryImpDialog: { visible: false, title: "", salaryAcctRecordId: "" },
+      formMsg: "",//薪资核算提示信息,
       approvalInfo: {},//审批信息,
       accountExceptInfo: "" //核算报错信息,
 
@@ -210,7 +211,7 @@ class Index extends Component {
   };
   renderReqBtns = () => {
     const { routeParams: { salaryAcctRecordId } } = this.props;
-    const { selectedKey, accountExceptInfo, approvalInfo, loading } = this.state;
+    const { selectedKey, accountExceptInfo, approvalInfo, loading, formMsg } = this.state;
     const { isOpenApproval, approvalWorkflowUrl, canEdit } = approvalInfo;
     let reqBtns = [];
     switch (selectedKey) {
@@ -249,6 +250,7 @@ class Index extends Component {
         accountExceptInfo && reqBtns.unshift(<i className="iconfont icon-jinggao"
                                                 title={getLabel(111, "存在异常信息，点击下载！")}
                                                 onClick={() => this.downloadTxtfile(accountExceptInfo)}/>);
+        formMsg && reqBtns.unshift(<WeaHelpfulTip width={200} title={formMsg} placement="topLeft"/>);
         break;
       default:
         break;
@@ -269,7 +271,8 @@ class Index extends Component {
     let dom = null;
     switch (selectedKey) {
       case "person":
-        dom = <SalaryCalcPersonConfirm calcDetail={!canEdit} {...this.props}/>;
+        dom = <SalaryCalcPersonConfirm calcDetail={!canEdit} {...this.props}
+                                       onSetFormInfo={v => this.setState({ formMsg: v })}/>;
         break;
       case "calc":
         dom = <SalaryEditCalc {...this.props} calcDetail={!canEdit} ref={dom => this.calc = dom}/>;
@@ -326,4 +329,4 @@ class Index extends Component {
   }
 }
 
-export default Index;
+export default Index;
\ No newline at end of file
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/grantTableList/index.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/grantTableList/index.js
index 794b8105..2c09e96a 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/grantTableList/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/grantTableList/index.js
@@ -96,7 +96,7 @@ class Index extends Component {
         batAPI[key]({ salarySendIds: this.state.selectedRowKeys }).then(({ status, data, errormsg }) => {
           this.setState({ batLoading: false });
           if (status) {
-            message.success(data ?? getLabel(111, "操作成功！"));
+            message.success(data || getLabel(111, "操作成功！"));
             this.getPayrollList(this.props);
           } else {
             message.error(errormsg);