From 314ffff8ec53e3ae5c3d0e4f5039d553289a3137 Mon Sep 17 00:00:00 2001
From: liyongshun <971387674@qq.com>
Date: Tue, 21 Jun 2022 11:57:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=BA=94=E7=94=A8=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hrmSalary/components/customTable/index.js | 34 +++++++++----------
 .../pages/calculateDetail/salaryDetail.js     |  3 +-
 .../pages/calculateDetail/userSure.js         |  2 ++
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/pc4mobx/hrmSalary/components/customTable/index.js b/pc4mobx/hrmSalary/components/customTable/index.js
index cef3295f..9efade1b 100644
--- a/pc4mobx/hrmSalary/components/customTable/index.js
+++ b/pc4mobx/hrmSalary/components/customTable/index.js
@@ -1,20 +1,20 @@
-import React from 'react'
-import { WeaTable } from 'ecCom'
-import { Spin } from 'antd'
+import React from "react";
+import { WeaTable } from "ecCom";
+import { Spin, Table } from "antd";
 
 export default class CustomTable extends React.Component {
-    render() {
-        return (
-            <div>
-                {
-                    this.props.loading ? 
-                    <div style={{textAlign: 'center'}}>
-                        <Spin />
-                    </div>
-                    :
-                    <WeaTable {...this.props}/>
-                }
+  render() {
+    const { loading, isWeaTable = true } = this.props;
+    return (
+      <div>
+        {loading
+          ? <div style={{ textAlign: "center" }}>
+              <Spin />
             </div>
-        )
-    }
-}
\ No newline at end of file
+          : isWeaTable
+            ? <WeaTable {...this.props} />
+            : <Table {...this.props} size="middle" className="wea-new-table" />}
+      </div>
+    );
+  }
+}
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
index f401680f..858e2d90 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
@@ -78,7 +78,7 @@ export default class SalaryDetail extends React.Component {
             }
 
             if(result.dataIndex === "taxAgentName" || result.dataIndex === "username" || result.dataIndex === "departmentName") {
-                // result.fixed = "left"
+                result.fixed = "left"
             }
 
             return result;
@@ -162,6 +162,7 @@ export default class SalaryDetail extends React.Component {
                             this.pageInfo.current = value
                             this.handleDataPageChange(value)
                         }}
+                        isWeaTable={false}
                         onShowSizeChange={(current, pageSize) => {
                             this.pageInfo = {current, pageSize}
                             this.handleShowSizeChange(this.pageInfo)
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js b/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
index a9bb78b0..4812ed30 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
@@ -449,6 +449,7 @@ export default class UserSure extends React.Component {
                 this.pageInfo.current = value;
                 this.handleUserListPageChange(value);
               }}
+              isWeaTable={false}
               onShowSizeChange={(current, pageSize) => {
                 this.pageInfo = { current, pageSize };
                 this.handleShowSizeChange(this.pageInfo);
@@ -456,6 +457,7 @@ export default class UserSure extends React.Component {
             />}
           {this.state.selectedKey == 1 &&
             <CustomPaginationTable
+              isWeaTable={false}
               dataSource={reducedemployeeListDataSource}
               columns={reducedemployeeListColumns}
               total={reducedemployeeListPageInfo.total}