Browse Source

feat: 修改项目管理列表创建人、编辑者以及其表单项设置创建人为必填

lanjianrong 3 years ago
parent
commit
bca0908842

+ 6 - 2
src/pages/Project/Created/index.tsx

@@ -140,8 +140,12 @@ const Created = () => {
       >
         {state.modalType === CreatedModalType.ADD ? (
           <>
-            <p className="mb-4">创建人可在前台创建项目、上传项目数据、编制项目等</p>
-            <Form.Item name="ID">
+            {/* <p className="mb-4">创建人可在前台创建项目、上传项目数据、编制项目等</p> */}
+            <Form.Item
+              name="ID"
+              label="创建人可在前台创建项目、上传项目数据、编制项目等"
+              rules={[{ required: true, message: '请选择创建人' }]}
+            >
               <TreeNodeSelect params={{ isCreated: '0' }} />
             </Form.Item>
             {/* <ProFormSelect

+ 1 - 0
src/pages/Project/Management/components/Detail.tsx

@@ -206,6 +206,7 @@ const DetailModal: React.FC<ProjectModalProps> = ({
           <Form.Item
             label="创建人:创建项目、管理编辑者、上传项目数据、编制项目、添加批注"
             name="createdID"
+            rules={[{ required: true, message: '请选择创建人' }]}
           >
             <TreeNodeSelect params={{ isCreated: '1' }} />
           </Form.Item>

+ 19 - 12
src/pages/Project/Management/index.tsx

@@ -1,7 +1,7 @@
 import { delProject, getProjectList } from '@/services/api/project'
 import ProTable 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 { useRef, useState, useEffect } from 'react'
 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',
       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: '操作',
       dataIndex: 'operation',