From 1c7ad4e8715cf302f5fb3868117da43d086c94de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 18 Sep 2023 16:59:21 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.9.42309.01-=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E6=A0=B8=E7=AE=97=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=94=B9=E9=80=A0=EF=BC=88=E9=A1=B5=E9=9D=A2=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doCalc/components/salaryEditCalc/editCalcTable.js       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
index deb70763..e5f8e66f 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
@@ -115,7 +115,8 @@ class EditCalcTable extends Component {
       "锁定的项目值": getLabel(543647, "锁定的项目值"),
       "当前状态锁定，点击解锁": getLabel(111, "当前状态锁定，点击解锁"),
       "当前状态未锁定，点击锁定": getLabel(111, "当前状态未锁定，点击锁定"),
-      "共": getLabel(18609, "共"), "条": getLabel(18256, "条")
+      "共": getLabel(18609, "共"), "条": getLabel(18256, "条"),
+      "总计": getLabel(523, "总计")
     };
     const childFrameObj = document.getElementById("atdTable");
     childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
@@ -139,8 +140,9 @@ class EditCalcTable extends Component {
         const { list: dataSource, pageNum: current, pageSize, total } = list;
         this.setState({ pageInfo: { ...pageInfo, current, pageSize, total } }, () => {
           const { pageInfo, selectedRowKeys } = this.state;
+          const sumRowlistUrl = this.props.showTotalCell ? "/api/bs/hrmsalary/salaryacct/acctresult/sum" : "";
           this.postMessageToChild({
-            dataSource, pageInfo, selectedRowKeys, showTotalCell: this.props.showTotalCell,
+            dataSource, pageInfo, selectedRowKeys, showTotalCell: this.props.showTotalCell, sumRowlistUrl, payload,
             columns: _.map(traverse(columns), (it, idx) => ({ ...it, fixed: idx < 2 ? "left" : false }))
           });
         });