fix: conclusion table layout

src/pages/Admin/Conclusion/conclusionItem.ts

@@ -3,6 +3,7 @@ export type ConclusionItem = {
   time: string;
   week: string;
   shift: string;
+  detail: string;
 };
 
 const weekMap: { [key: string]: string } = {

src/pages/Admin/Conclusion/index.tsx

@@ -1,5 +1,5 @@
 import { PageContainer, ProList } from '@ant-design/pro-components';
-import { Card } from 'antd';
+import { Card, Space, Tag } from 'antd';
 import moment from 'moment';
 import request from 'umi-request';
 import transConclusion, { ConclusionItem } from './conclusionItem';
@@ -33,21 +33,42 @@ const Logs: React.FC = () => {
               dataIndex: 'avatar',
               search: false,
             },
+            subTitle: {
+              dataIndex: ['week', 'shift'],
+              render: (_, row) => {
+                return (
+                  <Space size={0}>
+                    <Tag color="blue" key={row.op}>
+                      {transConclusion(row.week, row.shift)}
+                    </Tag>
+                  </Space>
+                );
+              },
+              title: '值班时间',
+              search: false,
+            },
             description: {
-              dataIndex: ['time', 'week', 'shift'],
+              dataIndex: 'detail',
               search: false,
               render: (_, row) => {
                 return (
                   <div>
-                    {'于 ' +
-                      moment(row.time).format('YYYY-M-D HH:mm:ss') +
-                      ' 上传了' +
-                      transConclusion(row.week, row.shift) +
-                      '值班总结'}
+                    {row.detail}
                   </div>
                 );
               },
             },
+            extra: {
+              dataIndex: 'time',
+              render: (_: React.ReactNode, row: ConclusionItem) => {
+                return (
+                  <div style={{ marginLeft: '3vh' }}>
+                    {moment(row.time).format('YYYY-M-D HH:mm:ss')}
+                  </div>
+                );
+              },
+              search: false,
+            },
             actions: {
               render: () => [
                 <a href="" target="_blank" rel="noopener noreferrer" key="view">