From c068959e73a59b51b41c97396c94e6f48b4c7b7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 31 Oct 2023 16:59:50 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.9.42310.02-=E7=A4=BE=E4=BF=9D?=
 =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=E9=A1=B5=E9=9D=A2=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/welfareTableList/index.js       | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js
index a24c4383..a87ffd25 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js
@@ -56,12 +56,11 @@ class Index extends Component {
                 dataIndex, title, width, fixed: "left",
                 render: (txt) => (<span title={txt}>{txt}</span>)
               };
-            } else {
-              return {
-                dataIndex, title, width,
-                render: (txt) => (<span title={txt}>{txt}</span>)
-              };
             }
+            return {
+              dataIndex, title, width,
+              render: (txt) => (<span title={txt}>{txt}</span>)
+            };
           })
         }, () => onChangeTopTabCount(runStatuses, total));
       }
@@ -70,7 +69,6 @@ class Index extends Component {
 
   render() {
     const { dataSource, columns, loading, pageInfo, selectedRowKeys } = this.state;
-    console.log(columns);
     const pagination = {
       ...pageInfo,
       showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
@@ -94,8 +92,12 @@ class Index extends Component {
     };
     return (
       <WeaTable
-        rowKey="employeeId" dataSource={dataSource} pagination={pagination} loading={loading}
-        columns={columns} rowSelection={rowSelection} scroll={{ x: 1200, y: `calc(100vh - 220px)` }}
+        dataSource={dataSource} pagination={pagination} loading={loading}
+        scroll={{ x: 1200, y: `calc(100vh - 220px)` }}
+        columns={[...columns, {
+          dataIndex: "operate", title: "操作", fixed: "right", width: 175,
+          render: () => (<span>123</span>)
+        }]}
       />
     );
   }