Merge branch 'master' into custom-新弘农业/V2-薪资核算表格添加序号列

# Conflicts:
#	src/pages/commonTable/index.tsx
#	src/pages/payrollFilesTable/index.tsx

src/pages/atdTable/components/antdTable.tsx

@@ -48,19 +48,30 @@ const AntdTable: FC<ITableProps> = (props) => {
         if (type === "PC") {
           if (listType === "SA") {
             const { columns = [], list = [], total, pageSize: size, pageNum } = dataCopy;
-            setColumns(getUserListColumns(columns));
+            setColumns(getUserListColumns(columns, size, pageNum));
             setDataSource(list);
             setPageParams({ ...pageParams, total, size, pageNum });
           } else if (listType === "MA") {
             const { columns = [], list = [], total, pageSize: size, pageNum } = dataCopy;
-            setColumns(columns);
+            setColumns([
+              {
+                title: "序号",
+                dataIndex: "index",
+                width: 50,
+                fixed: "left",
+                render: (text: any, record: any, index: number) => {
+                  return (pageNum - 1) * size + index + 1;
+                }
+              },
+              ...columns
+            ]);
             setDataSource(list);
             setPageParams({ ...pageParams, total, size, pageNum });
           }
         } else {
           const { columns = [], pageInfo = {} } = dataCopy;
           const { list = [], total, pageSize: size, pageNum } = pageInfo;
-          setColumns(getColumns(columns, hasOperate));
+          setColumns(getColumns(columns, hasOperate, size, pageNum));
           setDataSource(list);
           setPageParams({ ...pageParams, total, size, pageNum });
           const confCode: any = await API.CalculateService.getSysconfcode({ code: "OPEN_ACCT_RESULT_SUM" });
@@ -80,7 +91,7 @@ const AntdTable: FC<ITableProps> = (props) => {
       }
     });
   };
-  const getUserListColumns = (acctemployeeListColumns: any) => {
+  const getUserListColumns = (acctemployeeListColumns: any, pageSize: any, pageNum: any) => {
     let tmpColumns = [...acctemployeeListColumns, {
       key: "cz",
       title: "操作",
@@ -126,10 +137,21 @@ const AntdTable: FC<ITableProps> = (props) => {
       }
       return { ...item, ellipsis: true };
     });
-    return tmpColumns;
+    return [
+      {
+        title: "序号",
+        dataIndex: "index",
+        width: 50,
+        fixed: "left",
+        render: (text: any, record: any, index: number) => {
+          return (pageNum - 1) * pageSize + index + 1;
+        }
+      },
+      ...tmpColumns
+    ];
   };
   //薪资核算页面列表
-  const getColumns = (column: any, hasOperate: boolean = true) => {
+  const getColumns = (column: any, hasOperate: boolean = true, pageSize: any, pageNum: any) => {
     let tmpColumns = [...column];
     tmpColumns = tmpColumns.filter(item => item.hide == "FALSE").map((item, index) => {
       let result = { ...item };
@@ -262,8 +284,7 @@ const AntdTable: FC<ITableProps> = (props) => {
           };
         });
       }
-
+      if (index < 4 && _.isEmpty(result.children)) {
-      if (index < 3) {
         result.fixed = "left";
         result.render = (text: string) => {
           return <span title={text}>{text}</span>;
@@ -289,7 +310,18 @@ const AntdTable: FC<ITableProps> = (props) => {
         }}>编辑</Button>;
       }
     });
-    return tmpColumns;
+    return [
+      {
+        title: "序号",
+        dataIndex: "index",
+        width: 50,
+        fixed: "left",
+        render: (text: any, record: any, index: number) => {
+          return (pageNum - 1) * pageSize + index + 1;
+        }
+      },
+      ...tmpColumns
+    ];
   };
   const receiveMessageFromIndex = (event: any) => {
     setDataSource([]);

src/pages/commonTable/index.tsx

@@ -59,7 +59,18 @@ const CommonTable: FC = (props) => {
   return <Table
     rowKey="id"
     className={styles.tableWrapper}
-    columns={columns}
+    columns={[
+      {
+        title: "序号",
+        dataIndex: "index",
+        width: 50,
+        fixed: "left",
+        render: (text: any, record: any, index: number) => {
+          return (pageInfo.pageNum - 1) * pageInfo.size + index + 1;
+        }
+      },
+      ...columns
+    ]}
     dataSource={dataSource}
     bordered
     size="small"

src/pages/payrollFilesTable/index.tsx

@@ -236,7 +236,19 @@ const payrollFilesTable: FC = (props) => {
       [styles.tableWrapper]: true,
       [styles.tableTotalWrapper]: true
     })}
-    columns={!_.isEmpty(columns) && convertColumns(columns, _.findIndex(columns, ["dataIndex", "operate"]), Object.keys(columns).length)}
+    // @ts-ignore
+    columns={!_.isEmpty(columns) && [
+      {
+        title: "序号",
+        dataIndex: "index",
+        width: 50,
+        fixed: "left",
+        render: (text: any, record: any, index: number) => {
+          return (pageInfo.pageNum - 1) * pageInfo.size + index + 1;
+        }
+      },
+      ...convertColumns(columns, _.findIndex(columns, ["dataIndex", "operate"]), Object.keys(columns).length)
+    ]}
     dataSource={dataSource}
     size="small"
     rowSelection={rowSelection}