From 64bfb456182b373459f8accd98ef982964564eff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Sun, 28 Apr 2024 13:48:20 +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=E4=BF=AE=E6=94=B9=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hrmSalary/pages/reportView/components/reportContent.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
index 37700a22..a7808410 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
@@ -98,11 +98,11 @@ class ReportContent extends Component {
           countResult,
           columns: _.map(columns, it => ({
             ...it,
-            dataIndex: it.column, width: 150,
+            dataIndex: it.column, width: it.width ? it.width + "px" : 150,
             title: it.text, align: "center",
             children: !_.isNil(it.children) ? _.map(it.children, child => ({
               ...child,
-              dataIndex: child.column, width: 150,
+              dataIndex: child.column, width: child.width ? child.width + "px" : 150,
               title: child.text, align: "center"
             })) : []
           })),