From ded1cf800875c8fa7a1ee07b520222d8ecf955d1 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Mon, 11 Nov 2024 10:56:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/home/hsgl/index.ts | 107 +++++++++++++++-------------- src/views/Home/hsgl/HsglCreate.vue | 9 ++- 2 files changed, 62 insertions(+), 54 deletions(-) diff --git a/src/api/home/hsgl/index.ts b/src/api/home/hsgl/index.ts index 37400f9..b939e73 100644 --- a/src/api/home/hsgl/index.ts +++ b/src/api/home/hsgl/index.ts @@ -1,53 +1,54 @@ -import request from '@/config/axios' - -// 会议室管理 VO -export interface HsglVO { - id: number // 会议室管理id - title: string // 标题 - name: string // 会议室名 - location: string // 会议室地址 - roomType: number // 会议室类型 - manager: string // 会议室管理员 - roomMax: string // 会议室大小 - capacity: number // 容纳人数 - facilities: string // 会议室设备 - roomStatus: number // 使用状态 - photo: string // 会议室照片 - remark: string // 备注 - status: number // 审批状态 - userId: number // 申请人id - processInstanceId: string // 流程实例的编号 -} - -// 会议室管理 API -export const HsglApi = { - // 查询会议室管理分页 - getHsglPage: async (params: any) => { - return await request.get({ url: `/home/hsgl/page`, params }) - }, - - // 查询会议室管理详情 - getHsgl: async (id: number) => { - return await request.get({ url: `/home/hsgl/get?id=` + id }) - }, - - // 新增会议室管理 - createHsgl: async (data: HsglVO) => { - return await request.post({ url: `/home/hsgl/create`, data }) - }, - - // 修改会议室管理 - updateHsgl: async (data: HsglVO) => { - return await request.put({ url: `/home/hsgl/update`, data }) - }, - - // 删除会议室管理 - deleteHsgl: async (id: number) => { - return await request.delete({ url: `/home/hsgl/delete?id=` + id }) - }, - - // 导出会议室管理 Excel - exportHsgl: async (params) => { - return await request.download({ url: `/home/hsgl/export-excel`, params }) - }, -} \ No newline at end of file +import request from '@/config/axios' + +// 会议室管理 VO +export interface HsglVO { + id: number // 会议室管理id + deptId: number + title: string // 标题 + name: string // 会议室名 + location: string // 会议室地址 + roomType: number // 会议室类型 + manager: string // 会议室管理员 + roomMax: string // 会议室大小 + capacity: number // 容纳人数 + facilities: string // 会议室设备 + roomStatus: number // 使用状态 + photo: string // 会议室照片 + remark: string // 备注 + status: number // 审批状态 + userId: number // 申请人id + processInstanceId: string // 流程实例的编号 +} + +// 会议室管理 API +export const HsglApi = { + // 查询会议室管理分页 + getHsglPage: async (params: any) => { + return await request.get({ url: `/home/hsgl/page`, params }) + }, + + // 查询会议室管理详情 + getHsgl: async (id: number) => { + return await request.get({ url: `/home/hsgl/get?id=` + id }) + }, + + // 新增会议室管理 + createHsgl: async (data: HsglVO) => { + return await request.post({ url: `/home/hsgl/create`, data }) + }, + + // 修改会议室管理 + updateHsgl: async (data: HsglVO) => { + return await request.put({ url: `/home/hsgl/update`, data }) + }, + + // 删除会议室管理 + deleteHsgl: async (id: number) => { + return await request.delete({ url: `/home/hsgl/delete?id=` + id }) + }, + + // 导出会议室管理 Excel + exportHsgl: async (params) => { + return await request.download({ url: `/home/hsgl/export-excel`, params }) + }, +} diff --git a/src/views/Home/hsgl/HsglCreate.vue b/src/views/Home/hsgl/HsglCreate.vue index f0caee7..7a46ec6 100644 --- a/src/views/Home/hsgl/HsglCreate.vue +++ b/src/views/Home/hsgl/HsglCreate.vue @@ -93,6 +93,7 @@ import { HsglApi, HsglVO } from '@/api/home/hsgl' import * as DefinitionApi from '@/api/bpm/definition' import * as UserApi from '@/api/system/user' import {useTagsViewStore} from "@/store/modules/tagsView"; +import {getUserProfile} from "@/api/system/user/profile"; /** 会议室管理 表单 */ defineOptions({ name: 'HsglCreate' }) @@ -109,6 +110,7 @@ const formData = ref({ title: undefined, name: undefined, location: undefined, + deptId: undefined, roomType: undefined, manager: undefined, roomMax: undefined, @@ -158,9 +160,14 @@ const submitForm = async () => { formLoading.value = false } } - +// 获取用户部门 +const getUserInfo = async () => { + const user = await getUserProfile(); + formData.value.deptId = formData.value.deptId || user.dept.id; +}; /** 初始化 */ onMounted(async () => { + await getUserInfo() const processDefinitionDetail = await DefinitionApi.getProcessDefinition( undefined, processDefineKey