diff --git a/src/api/admin/data-contracts.ts b/src/api/admin/data-contracts.ts index 4864a62..2c7d4a2 100644 --- a/src/api/admin/data-contracts.ts +++ b/src/api/admin/data-contracts.ts @@ -5583,6 +5583,8 @@ export interface UserAddInput { orgId?: number /** 密码 */ password?: string | null + /** 团队 */ + team?: number /** 启用 */ enabled?: boolean @@ -6104,6 +6106,10 @@ export interface UserUpdateInput { * @minLength 1 */ userName: string + + /** 团队 */ + team?: number + /** * 姓名 * @minLength 1 diff --git a/src/api/admin/enum-contracts.ts b/src/api/admin/enum-contracts.ts index ee16265..833532c 100644 --- a/src/api/admin/enum-contracts.ts +++ b/src/api/admin/enum-contracts.ts @@ -25,6 +25,12 @@ export const Sex = { Female: { name: 'Female', value: 2, desc: '女' }, } +export const Team = { + All: { name: '全部', value: 5, desc: '全部' }, + USP: { name: '上游', value: 1, desc: '上游' }, + DSP: { name: '下游', value: 3, desc: '下游' }, +} + /** 角色类型 */ export const RoleType = { Group: { name: 'Group', value: 1, desc: '分组' }, diff --git a/src/api/types/preBatchType.ts b/src/api/types/preBatchType.ts index 5cf52e6..eeb1f94 100644 --- a/src/api/types/preBatchType.ts +++ b/src/api/types/preBatchType.ts @@ -28,6 +28,8 @@ export interface PreBatchPageDto { preBatchNo: string /** 项目ID */ projectId?: number | null + /** 项目负责人 */ + projectUserName?: string /** 创建用户真实姓名 */ createdUserRealName?: string /** 创建时间 */ @@ -50,6 +52,8 @@ export interface PreBatchDto { isDown?: boolean | null /** 滴度 */ titer?: number | null + + projectUserName?: string } export type PreBatchPageInput = ServiceRequestPage diff --git a/src/views/admin/dspbatch/index.vue b/src/views/admin/dspbatch/index.vue index fad6040..c37b6ac 100644 --- a/src/views/admin/dspbatch/index.vue +++ b/src/views/admin/dspbatch/index.vue @@ -66,28 +66,31 @@ {{ getProjectName(row.projectId) }} + @@ -238,19 +241,33 @@ const getProjectName = (projectId: number) => { \ No newline at end of file diff --git a/src/views/admin/user/components/user-form.vue b/src/views/admin/user/components/user-form.vue index 3a43a01..a40a9dd 100644 --- a/src/views/admin/user/components/user-form.vue +++ b/src/views/admin/user/components/user-form.vue @@ -113,11 +113,12 @@ - - + + + + - @@ -158,7 +159,7 @@ import { validatorPwd } from '/@/utils/validators' import eventBus from '/@/utils/mitt' import { FormInstance } from 'element-plus' import { verifyCnAndSpace } from '/@/utils/toolsValidate' -import { Sex } from '/@/api/admin/enum-contracts' +import { Sex, Team } from '/@/api/admin/enum-contracts' import { toOptionsByValue } from '/@/utils/enum' // 引入组件 @@ -186,6 +187,7 @@ const state = reactive({ orgTreeData: [] as OrgGetListOutput[], roleTreeData: [] as RoleGetListOutput[], sexList: toOptionsByValue(Sex), + teamList: toOptionsByValue(Team), }) const { form } = toRefs(state) diff --git a/src/views/admin/user/components/user-update-form.vue b/src/views/admin/user/components/user-update-form.vue index 88d8d47..c971e25 100644 --- a/src/views/admin/user/components/user-update-form.vue +++ b/src/views/admin/user/components/user-update-form.vue @@ -64,8 +64,10 @@ - - + + + + @@ -104,7 +106,7 @@ import { listToTree } from '/@/utils/tree' import { isMobile, testMobile, testEmail } from '/@/utils/test' import eventBus from '/@/utils/mitt' import { FormInstance } from 'element-plus' -import { Sex } from '/@/api/admin/enum-contracts' +import { Sex, Team } from '/@/api/admin/enum-contracts' import { toOptionsByValue } from '/@/utils/enum' // 引入组件 @@ -125,9 +127,11 @@ const state = reactive({ sureLoading: false, form: { roleIds: [] as any, + team: 5, } as UserAddInput & UserUpdateInput, roleTreeData: [] as RoleGetListOutput[], sexList: toOptionsByValue(Sex), + teamList: toOptionsByValue(Team), }) const { form } = toRefs(state) diff --git a/src/views/admin/uspbatch/index.vue b/src/views/admin/uspbatch/index.vue index a8aeaa3..5b0714f 100644 --- a/src/views/admin/uspbatch/index.vue +++ b/src/views/admin/uspbatch/index.vue @@ -44,8 +44,7 @@ 查询 - 重置 - 新增 + 新增 @@ -58,20 +57,15 @@ row-key="id" border > - - + + - - - - + + @@ -80,24 +74,26 @@ @@ -117,7 +113,7 @@ - + @@ -129,7 +125,7 @@ import type { UspBatchDto, UspBatchPageInput, UspBatchPageDto } from '/@/api/typ import { auth } from '/@/utils/authFunction' // 引入组件 -const UspBatchForm = defineAsyncComponent(() => import('./components/uspbatch-form.vue')) +const UspbatchForm = defineAsyncComponent(() => import('./components/uspbatch-form.vue')) const { proxy } = getCurrentInstance() as any @@ -248,19 +244,33 @@ const getProjectName = (projectId: number) => { \ No newline at end of file