From 0754316e770568dcd0dc2c8ddfa96ffab1c6af84 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, 11 Oct 2024 17:13:19 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.15.2.2409.01-=E8=96=AA=E9=85=AC?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=96=AA=E8=B5=84=E6=98=8E=E7=BB=86=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=98=BE=E7=A4=BA=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/salaryDetails.js                        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
index aeafccb6..ef85c253 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
@@ -30,8 +30,7 @@ class SalaryDetails extends Component {
       showTotalCell: false, updateSum: true,
       transferDialog: {
         visible: false, searchParamsKey: "name", dataParams: { page: "salary_details_report" },
-        completeURL: "/api/bs/hrmsalary/common/pageList/get/setting"
-        // convertDatasource: null
+        completeURL: "/api/bs/hrmsalary/common/pageList/get/setting", convertDatasource: null
       }
     };
   }
@@ -137,7 +136,12 @@ class SalaryDetails extends Component {
     return [];
   };
   handleSetDefCols = () => {
-    this.setState({ transferDialog: { ...this.state.transferDialog, visible: true } });
+    this.setState({
+      transferDialog: {
+        ...this.state.transferDialog, visible: true,
+        convertDatasource: datas => _.map(datas.setting, o => ({ id: o.id, name: o.name }))
+      }
+    });
   };
 
   render() {