|
@@ -1,7 +1,7 @@
|
|
import { delProject, getProjectList } from '@/services/api/project'
|
|
import { delProject, getProjectList } from '@/services/api/project'
|
|
import ProTable from '@ant-design/pro-table'
|
|
import ProTable from '@ant-design/pro-table'
|
|
import type { ProColumnType, ActionType } from '@ant-design/pro-table'
|
|
import type { ProColumnType, ActionType } from '@ant-design/pro-table'
|
|
-import { Button, Popconfirm } from 'antd'
|
|
|
|
|
|
+import { Button, Popconfirm, Tag } from 'antd'
|
|
import consts from '@/utils/consts'
|
|
import consts from '@/utils/consts'
|
|
import { useRef, useState, useEffect } from 'react'
|
|
import { useRef, useState, useEffect } from 'react'
|
|
import { connect, useRequest } from 'umi'
|
|
import { connect, useRequest } from 'umi'
|
|
@@ -98,22 +98,29 @@ const List: React.FC<ListProps> = ({ schema, dispatch, pTypeList }) => {
|
|
}, {})
|
|
}, {})
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- dataIndex: 'created',
|
|
|
|
- key: 'created',
|
|
|
|
- title: '创建人'
|
|
|
|
|
|
+ dataIndex: 'createdID',
|
|
|
|
+ key: 'createdID',
|
|
|
|
+ title: '创建人',
|
|
|
|
+ renderText: (_, record) => record?.created?.name
|
|
},
|
|
},
|
|
{
|
|
{
|
|
dataIndex: 'reportAccount',
|
|
dataIndex: 'reportAccount',
|
|
key: 'reportAccount',
|
|
key: 'reportAccount',
|
|
- title: '数据上报',
|
|
|
|
- renderText: (_, record) => record.reportAccount?.name
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- dataIndex: 'approval',
|
|
|
|
- key: 'approval',
|
|
|
|
- title: '审批流程',
|
|
|
|
- renderText: (_, record) => record.approval?.name
|
|
|
|
|
|
+ title: '编辑者',
|
|
|
|
+ renderText: (_, record) => (
|
|
|
|
+ <div>
|
|
|
|
+ {record.reportAccount?.map(item => (
|
|
|
|
+ <Tag key={item.ID}>{item.name}</Tag>
|
|
|
|
+ ))}
|
|
|
|
+ </div>
|
|
|
|
+ )
|
|
},
|
|
},
|
|
|
|
+ // {
|
|
|
|
+ // dataIndex: 'approval',
|
|
|
|
+ // key: 'approval',
|
|
|
|
+ // title: '审批流程',
|
|
|
|
+ // renderText: (_, record) => record.approval?.name
|
|
|
|
+ // },
|
|
{
|
|
{
|
|
title: '操作',
|
|
title: '操作',
|
|
dataIndex: 'operation',
|
|
dataIndex: 'operation',
|