From 095a83308416006cd1499ebcc6e0154c352afa58 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, 29 Jan 2024 10:39:12 +0800
Subject: [PATCH] release/2.10.1.2401.01

---
 .../pages/payrollFiles/components/salaryFileList/index.js     | 2 +-
 .../welfareArchive/components/welfareTableList/index.js       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js
index 1e95c5ec..bf3cfc17 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js
@@ -172,7 +172,7 @@ class Index extends Component {
     const columns = _.map(_.filter(toJS(tableStore.columns), (item) => item.display === "true"), (it, idx) => ({
       dataIndex: it.dataIndex, title: it.title, align: "left",
       width: (it.dataIndex === "taxAgentName" || it.dataIndex === "operate") ? 185 : 150,
-      fixed: it.dataIndex === "username" ? "left" : it.dataIndex === "operate" ? "right" : "",
+      fixed: it.dataIndex === "username" ? "left" : it.dataIndex === "operate" ? "right" : it.fixed ? it.fixed : false,
       ellipsis: true
     }));
     if (!_.isEmpty(columns)) {
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js
index 17bb4629..05a7381a 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js
@@ -167,14 +167,14 @@ class Index extends Component {
         this.setState({
           pageInfo: { ...pageInfo, current, pageSize, total }, dataSource,
           columns: _.map(columns, o => {
-            const { column: dataIndex, text: title, width } = o;
+            const { column: dataIndex, text: title, width, fixed } = o;
             if (dataIndex === "employeeName") {
               return {
                 dataIndex, title, width, fixed: "left", ellipsis: true
               };
             }
             return {
-              dataIndex, title, width, ellipsis: true
+              dataIndex, title, width, ellipsis: true, fixed: fixed || false
             };
           })
         }, () => {