From f6156ca3366f9206a273b483f17a32eb774726b2 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Fri, 28 Nov 2025 11:06:18 +0800
Subject: [PATCH] =?UTF-8?q?custom/=E9=92=B1=E6=99=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/salaryCalcPersonConfirm/baseInfo.js |  2 +-
 .../components/salaryEditCalc/editCalcTable.js     |  3 ++-
 pc4mobx/hrmSalary/pages/calculate/doCalc/index.js  | 14 ++++++++------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/baseInfo.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/baseInfo.js
index f2ed7354..215df9e5 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));
+      });
     }
   };
 
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
index 0c12752c..8e2a36ae 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
@@ -263,8 +263,9 @@ class EditCalcTable extends Component {
     acctResultList(payload).then(({ status, data }) => {
       this.setState({ loading: false });
       if (status) {
-        const { columns, pageInfo: list } = data;
+        const { columns, pageInfo: list, msg } = data;
         const { list: dataSource, pageNum: current, pageSize, total } = list;
+        this.props.onSetFormInfo(msg);
         this.setState({ pageInfo: { ...pageInfo, current, pageSize, total } }, () => {
           const { pageInfo, selectedRowKeys } = this.state;
           const sumRowlistUrl = this.props.showTotalCell ? "/api/bs/hrmsalary/salaryacct/acctresult/sum" : "";
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
index 78c50ee2..e5984c99 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
@@ -237,8 +237,11 @@ class Index extends Component {
           </Dropdown.Button>,
           <Button type="ghost" onClick={this.acctresultCalcTax}
                   loading={loading.calcTax}>{getLabel(111, "在线算税")}</Button>,
-          <Button type="ghost" loading={loading.feedback}
-                  onClick={this.calcTaxFeedback}>{getLabel(111, "获取算税结果")}</Button>,
+          <div style={{ display: "flex", alignItems: "center" }}>
+            <Button type="ghost" loading={loading.feedback} style={{ marginRight: 10 }}
+                    onClick={this.calcTaxFeedback}>{getLabel(111, "获取算税结果")}</Button>
+            {formMsg && <WeaHelpfulTip width={200} title={formMsg} placement="topLeft"/>}
+          </div>,
           <Dropdown overlay={moreMenu}><Button type="ghost">{getLabel(17499, "更多")}</Button></Dropdown>,
           <AdvanceInputBtn onOpenAdvanceSearch={() => this.calc.openAdvanceSearch()}
                            onAdvanceSearch={() => this.calc.onAdSearch(false)}/>
@@ -250,7 +253,6 @@ 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;
@@ -271,11 +273,11 @@ class Index extends Component {
     let dom = null;
     switch (selectedKey) {
       case "person":
-        dom = <SalaryCalcPersonConfirm calcDetail={!canEdit} {...this.props}
-                                       onSetFormInfo={v => this.setState({ formMsg: v })}/>;
+        dom = <SalaryCalcPersonConfirm calcDetail={!canEdit} {...this.props} />;
         break;
       case "calc":
-        dom = <SalaryEditCalc {...this.props} calcDetail={!canEdit} ref={dom => this.calc = dom}/>;
+        dom = <SalaryEditCalc {...this.props} calcDetail={!canEdit} ref={dom => this.calc = dom}
+                              onSetFormInfo={v => this.setState({ formMsg: v })}/>;
         break;
       default:
         break;