diff --git a/src/api/types/projectType.ts b/src/api/types/projectType.ts index 8787e82..2e25384 100644 --- a/src/api/types/projectType.ts +++ b/src/api/types/projectType.ts @@ -1,6 +1,7 @@ import { ServiceResponse } from './response'; import { ServiceRequestPage } from './pageInput' import { PageResponse } from './pageResponse' +import { ProjectUser, ProjectPrincipal } from './projectUserType' // 过滤条件 export interface ProjectFilter { @@ -30,8 +31,18 @@ export interface ProjectDto { status?: boolean /** 创建时间 */ createdTime?: string | null + + /** 创建人姓名 */ + createdUserName?: string | null + /** 修改时间 */ modifiedTime?: string | null + + /** 项目成员 */ + projectUsers?: ProjectUser[] + + /** 项目负责人 */ + projectPrincipals?: ProjectPrincipal[] } /** 项目添加和更新输入接口 */ @@ -48,11 +59,17 @@ export interface ProjectAddInputAndUpdateInput { principalId?: number /** 状态 */ status?: boolean + + /** 项目成员 */ + projectUsers?: ProjectUser[] + + /** 项目负责人 */ + projectPrincipals?: ProjectPrincipal[] } // API 类型定义 export type ProjectPageInput = ServiceRequestPage; -export type ProjectPageResponse = PageResponse; +export type ProjectPageResponse = ServiceResponse>; export type ProjectOutput = ServiceResponse; export type ProjectAddInput = ProjectAddInputAndUpdateInput; export type ProjectUpdateInput = ProjectAddInputAndUpdateInput; \ No newline at end of file diff --git a/src/api/types/projectUserType.ts b/src/api/types/projectUserType.ts new file mode 100644 index 0000000..ae8a48c --- /dev/null +++ b/src/api/types/projectUserType.ts @@ -0,0 +1,61 @@ +/** + * 项目用户权限类型定义 + */ + +/** + * 项目用户权限信息 + */ +export interface ProjectUser { + /** ID */ + id?: number; + + /** 项目ID */ + projectId?: number; + + /** 所属组ID */ + groupId?: number; + + /** 用户ID */ + userId: number; + + /** 用户过期时间 */ + limitToDate?: string; + + /** 上传权限 */ + upload: boolean; + + /** 撤回上传权限 */ + revokeUpload: boolean; + + /** 审核权限 */ + review: boolean; + + /** 撤回审核权限 */ + revokeReview: boolean; + + /** 签名权限 */ + signature: boolean; + + /** 撤回签名权限 */ + revokeSignature: boolean; + + /** 审核(二)权限 */ + verify: boolean; + + /** 撤回审核(二)权限 */ + revokeVerify: boolean; +} + +/** + * 项目负责人信息 + */ +export interface ProjectPrincipal { + /** ID */ + id?: number; + + /** 项目ID */ + projectId?: number; + + /** 用户ID */ + userId: number; +} \ No newline at end of file diff --git a/src/views/admin/project/components/project-form.vue b/src/views/admin/project/components/project-form.vue index a63b66a..1ab71f7 100644 --- a/src/views/admin/project/components/project-form.vue +++ b/src/views/admin/project/components/project-form.vue @@ -1,43 +1,128 @@ \ No newline at end of file diff --git a/src/views/admin/project/index.vue b/src/views/admin/project/index.vue index 009025d..aa1db25 100644 --- a/src/views/admin/project/index.vue +++ b/src/views/admin/project/index.vue @@ -1,37 +1,27 @@