diff --git a/src/pages/atdTable/components/antdTable.tsx b/src/pages/atdTable/components/antdTable.tsx index 8eb8de7..a1cb4ce 100644 --- a/src/pages/atdTable/components/antdTable.tsx +++ b/src/pages/atdTable/components/antdTable.tsx @@ -48,25 +48,36 @@ const AntdTable: FC = (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" }); setShowSumrow(confCode.data.status && confCode.data.data === "1"); if (confCode.data.status && confCode.data.data === "1") { - const sumRowlist: any = await API.CalculateService.getAcctresultsum({...extraParams["queryParams"]}); + const sumRowlist: any = await API.CalculateService.getAcctresultsum({ ...extraParams["queryParams"] }); if (sumRowlist.data.status && !_.isEmpty(sumRowlist.data.data.sumRow)) { setSumRow(sumRowlist.data.data.sumRow); } @@ -80,7 +91,7 @@ const AntdTable: FC = (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 = (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 = (props) => { }; }); } - - if (index < 3) { + if (index < 4 && _.isEmpty(result.children)) { result.fixed = "left"; result.render = (text: string) => { return {text}; @@ -289,7 +310,18 @@ const AntdTable: FC = (props) => { }}>编辑; } }); - 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([]);