From 4acdff060c7a0af91ecf62ae7397e14108a63d13 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, 30 Oct 2023 08:55:15 +0800
Subject: [PATCH] hotfix/2.9.42310.02

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

diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
index 36198c34..5a3e2aa3 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
@@ -152,7 +152,10 @@ class EditCalcTable extends Component {
           const sumRowlistUrl = this.props.showTotalCell ? "/api/bs/hrmsalary/salaryacct/acctresult/sum" : "";
           this.postMessageToChild({
             dataSource, pageInfo, selectedRowKeys, showTotalCell: this.props.showTotalCell, sumRowlistUrl, payload,
-            columns: _.map(traverse(columns), (it, idx) => ({ ...it, fixed: idx < 2 ? "left" : false }))
+            columns: _.every(traverse(columns), (it, idx) => !it.fixed) ? _.map(traverse(columns), (it, idx) => ({
+              ...it,
+              fixed: idx < 2 ? "left" : false
+            })) : traverse(columns)
           });
         });
       }
@@ -201,11 +204,12 @@ const traverse = (arr) => {
     if (!_.isEmpty(item.children)) {
       return {
         title: item.text, width: item.width + "px", ellipsis: true,
-        dataIndex: item.column, children: traverse(item.children)
+        dataIndex: item.column, children: traverse(item.children),
+        fixed: item.fixed || false
       };
     } else {
       return {
-        title: item.text, width: item.width + "px",
+        title: item.text, width: item.width + "px", fixed: item.fixed || false,
         dataIndex: item.column, ellipsis: true, lockStatus: item.lockStatus
       };
     }