From aaf733fdd2c7cb4ff26ed72b0f29b8df7bc57191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 10 May 2024 16:33:02 +0800
Subject: [PATCH] =?UTF-8?q?hotfix/2.12.1.2404.02=20=E8=96=AA=E9=85=AC?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E5=90=88=E8=AE=A1=E8=A1=8C?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/components/captchaModal/index.js |  1 -
 .../components/salaryDetails.js                    | 14 ++++++++------
 .../mySalaryMobile/components/payrollList/index.js |  5 +++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pc4mobx/hrmSalary/components/captchaModal/index.js b/pc4mobx/hrmSalary/components/captchaModal/index.js
index 35661772..a7f00b9b 100644
--- a/pc4mobx/hrmSalary/components/captchaModal/index.js
+++ b/pc4mobx/hrmSalary/components/captchaModal/index.js
@@ -36,7 +36,6 @@ class Index extends Component {
   handleSendCaptcha = () => {
     sendMobileCode({ id: this.props.id }).then(({ status, data }) => {
       if (status) {
-        console.log(data);
         this.timeRef = setInterval(() => {
           const { time } = this.state;
           this.setState({ time: time - 1 }, () => {
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
index 7ff80bb3..280a0f46 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
@@ -26,7 +26,7 @@ class SalaryDetails extends Component {
     this.state = {
       loading: false, dataSource: [], columns: [], selectedRowKeys: [],
       pageInfo: { current: 1, pageSize: 10, total: 0 }, payload: {},
-      countResult: {}, showTotalCell: false
+      showTotalCell: false
     };
   }
 
@@ -82,14 +82,15 @@ class SalaryDetails extends Component {
     };
     this.setState({ loading: true });
     API.getSalaryList(payload).then(async ({ status, data }) => {
-      const [{ data: sumData }, { data: confCode }] = await Promise.all([API.getSalaryListSum(payload), sysConfCodeRule({ code: "OPEN_ACCT_RESULT_SUM" })]);
+      // API.getSalaryListSum(payload),
+      const [{ data: confCode }] = await Promise.all([sysConfCodeRule({ code: "OPEN_ACCT_RESULT_SUM" })]);
       this.setState({ loading: false });
       if (status) {
         const { dataKey, pageInfo: pageparams } = data;
         const { list: dataSource, pageNum: current, total, pageSize } = pageparams;
         this.setState({
           dataSource, pageInfo: { ...pageInfo, current, total, pageSize }, payload,
-          countResult: sumData.sumRow, showTotalCell: confCode === "1"
+          showTotalCell: confCode === "1"
         }, () => tableStore.getDatas(dataKey.datas));
       }
     }).catch(() => this.setState({ loading: false }));
@@ -105,12 +106,13 @@ class SalaryDetails extends Component {
   };
   getColumns = () => {
     const { attendanceStore: { tableStore } } = this.props;
-    const { dataSource, pageInfo, selectedRowKeys, countResult, showTotalCell } = this.state;
+    const { dataSource, pageInfo, selectedRowKeys, showTotalCell, payload } = this.state;
     const columns = _.filter(toJS(tableStore.columns), (item) => item.display === "true" && item.dataIndex !== "acctTimes");
+    const sumRowlistUrl = showTotalCell ? "/api/bs/hrmsalary/report/statistics/employee/salaryListSum" : "";
     if (!_.isEmpty(columns)) {
       this.postMessageToChild({
-        dataSource, pageInfo, selectedRowKeys, showTotalCell, calcDetail: true, tableScrollHeight: 154,
-        sumRow: countResult,
+        dataSource, pageInfo, selectedRowKeys, showTotalCell, calcDetail: true, tableScrollHeight: 154, payload,
+        sumRowlistUrl,
         columns: _.map(columns, (it, idx) => ({
           ...it,
           width: (it.dataIndex === "taxAgent" || it.dataIndex === "salarySob") ? 176 : it.oldWidth,
diff --git a/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js b/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js
index 8968b469..69bac121 100644
--- a/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js
+++ b/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js
@@ -27,8 +27,9 @@ class Index extends Component {
                 <span>{getLabel(111, "发放时间")}</span>
                 <span>{moment(it.sendTime).format("YYYY-MM")}</span>
               </div>
-              <a href={`/spa/hrmSalary/static/index.html#/main/hrmSalary/mobilepayroll?id=${it.id}&type=phone`}
-                 target="_blank">
+              <a
+                href={`/spa/hrmSalary/static/index.html#/main/hrmSalary/mobilepayroll?id=${it.id}&recipient=${it.employeeId}&type=phone`}
+                target="_blank">
                 {`${getLabel(33564, "查看")}>`}
               </a>
             </li>;