Merge branch 'fenquan' into liys_dev

pc4mobx/hrmSalary/components/customTable/index.js

@@ -1,20 +1,32 @@
-import React from 'react'
-import { WeaTable } from 'ecCom'
-import { Spin } from 'antd'
+/*
+ * Author: 黎永顺
+ * Description: 
+ * Date: 2022-06-21 14:27:29
+ * LastEditTime: 2022-06-21 15:05:12
+ */
+import React from "react";
+import { WeaTable } from "ecCom";
+import { Spin, Table } from "antd";
+import "./index.less";
 
 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>
-        )
-    }
-}
+          : isWeaTable
+            ? <WeaTable {...this.props} />
+            : <Table
+                {...this.props}
+                size="middle"
+                className="wea-new-table antd-wrap"
+                bordered
+              />}
+      </div>
+    );
+  }
+}

pc4mobx/hrmSalary/components/customTable/index.less

@@ -0,0 +1,11 @@
+.antd-wrap {
+  .ant-table-tbody {
+    tr {
+      td {
+        white-space: nowrap;
+        height: 41px !important;
+        border-bottom: 1px solid #e2e2e2 !important;
+      }
+    }
+  }
+}

pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js

@@ -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)

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}

pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/editSlideContent.js

@@ -213,7 +213,7 @@ export default class EditSlideContent extends React.Component {
             dataSource={slideTableDataSource}
             pagination={pagination}
             loading={slideLoading}
-            scroll={{ x: 900 }}
+            scroll={{ x:  newColumns ? newColumns.length * 150 : 900}}
           />
         </div>
       </div>