diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json index b2461e0..f5a419d 100644 --- a/.eslintrc-auto-import.json +++ b/.eslintrc-auto-import.json @@ -310,6 +310,7 @@ "watchWithFilter": true, "whenever": true, "DataTableColumns": true, - "useWorkPlatform": true + "useWorkPlatform": true, + "FormInst": true } } diff --git a/auto-imports.d.ts b/auto-imports.d.ts index 56a7c6e..8484703 100644 --- a/auto-imports.d.ts +++ b/auto-imports.d.ts @@ -304,7 +304,7 @@ declare global { // @ts-ignore export type { RouteRecordRaw, RouteLocationRaw, LocationQuery, NavigationFailure, RouteParams, RouteLocationNormalizedLoaded, RouteRecordName, NavigationGuard } from 'vue-router' // @ts-ignore - export type { DataTableColumns } from 'naive-ui' + export type { DataTableColumns, FormInst } from 'naive-ui' } // for vue template auto import import { UnwrapRef } from 'vue' diff --git a/src/modules/MemberTeam/data/index.ts b/src/modules/MemberTeam/data/index.ts index 7499b05..4cccdc5 100644 --- a/src/modules/MemberTeam/data/index.ts +++ b/src/modules/MemberTeam/data/index.ts @@ -6,25 +6,38 @@ function getRandomValueFromArray(arr: Array): T { return arr[randomIndex] } + + // 级别映射表 export const userRankMap = [ { - value: 'junior', + value: 'junior_development', label: '初级开发', type: 'info' }, { - value: 'middle', + value: 'middle_development', label: '中级开发', type: 'success' }, { - value: 'senior', + value: 'senior_development', label: '高级开发', type: 'error' } ] +/** + * 查询目标【级别映射】 + */ +export const findUserRankMapByRankName = (targetRank) => { + return userRankMap.find( + rankItem => rankItem.value === targetRank + )! +} + + + // 角色映射表 export const userRoleMap = [ { @@ -50,23 +63,39 @@ export const userRoleMap = [ ] /** - * 查询目标【级别映射】 + * 查询目标【角色映射】 */ -export const findUserRankMapByRankName = (targetRank) => { - return userRankMap.find( - rankItem => rankItem.value === targetRank +export const findUserRoleMapByRankName = (targetRole) => { + return userRoleMap.find( + roleItem => roleItem.value === targetRole )! } + + +// 状态映射表 +export const userStatusMap = [ + { + value: 1, + label: '活跃' + }, + { + value: 0, + label: '停用' + } +] + /** - * 查询目标【角色映射】 + * 查询目标【状态映射】 */ -export const findUserRoleMapByRankName = (targetRole) => { - return userRoleMap.find( - roleItem => roleItem.value === targetRole +export const findUserStatusMapByRankName = (targetStatus) => { + return userStatusMap.find( + statusItem => statusItem.value === targetStatus )! } + + export interface TypeMemberPerson { username: string roleId: string @@ -74,6 +103,8 @@ export interface TypeMemberPerson { email: string phone: string rank: string + // 1活跃, 0停用 + memberStatus: number | null | undefined } /** @@ -91,7 +122,8 @@ export const memberTeamList = Array.from({ length: 100 }).map((_, index) => { roleId: roleItem.value, rank: rankItem.value, phone: 10000000000 + _index + '', - email: `${userId}@admin.com` + email: `${userId}@admin.com`, + memberStatus: Math.random() > 0.5 ? 0 : 1 } as TypeMemberPerson }) diff --git a/src/modules/MemberTeam/pages/index.vue b/src/modules/MemberTeam/pages/index.vue index 2d96e1c..84f0257 100755 --- a/src/modules/MemberTeam/pages/index.vue +++ b/src/modules/MemberTeam/pages/index.vue @@ -55,7 +55,7 @@ const pagination = reactive({ const columns: DataTableColumns = [ { - title: '姓名', + title: '成员名称', key: 'username', width: 80, fixed: 'left' @@ -67,7 +67,7 @@ const columns: DataTableColumns = [ width: 60 }, { - title: '角色', + title: '项目角色', key: 'roleId', align: 'center', width: 100, @@ -112,12 +112,6 @@ const columns: DataTableColumns = [ align: 'center', width: 150 }, - { - title: '手机号', - key: 'phone', - align: 'center', - width: 80 - }, { title: '操作列', key: 'actions', diff --git a/src/modules/MemberTeam/pages/preview.vue b/src/modules/MemberTeam/pages/preview.vue index 3e3e1af..bbe4273 100644 --- a/src/modules/MemberTeam/pages/preview.vue +++ b/src/modules/MemberTeam/pages/preview.vue @@ -49,12 +49,11 @@