From 7c13ddb970c0292fc543f22e87be205b51ba530b Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Mon, 25 Nov 2024 18:08:50 +0800
Subject: [PATCH] release/2.17.1.2411.01

---
 .../analysisOfSalaryStatistics/components/salaryDetails.js  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
index b982d9fe..26713bd3 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
@@ -51,7 +51,7 @@ class SalaryDetails extends Component {
     this.setState({
       showTotalCell: confCode === "1"
     }, () => {
-      this.getSalaryList(this.props);
+      // this.getSalaryList(this.props);
       this.getPageListTemplatelist();
     });
     window.addEventListener("message", this.handleReceive, false);
@@ -85,7 +85,8 @@ class SalaryDetails extends Component {
     const { type, payload: { id, params } = {} } = data;
     const { pageInfo } = this.state;
     if (type === "init") {
-      this.getColumns();
+      // this.getColumns();
+      this.getSalaryList(this.props);
     } else if (type === "turn") {
       if (id === "PAGEINFO") {
         const { pageNum: current, size: pageSize } = params;
@@ -129,6 +130,7 @@ class SalaryDetails extends Component {
           columns, dataSource, pageInfo: { ...pageInfo, current, total, pageSize }, payload
         }, () => {
           // tableStore.getDatas(dataKey.datas)
+          this.getColumns();
         });
       }
     }).catch(() => this.setState({ loading: false }));