From 86b8b4d13cf40d8712b9e765c5cae82f6a5a1f38 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Fri, 8 Nov 2024 10:09:43 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=8A=A0=E7=8F=AD=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/Home/homeimg/imgForm.vue | 2 +-
src/views/Home/homepj/pjForm.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/Home/homeimg/imgForm.vue b/src/views/Home/homeimg/imgForm.vue
index 02c00f8..73e9fbc 100644
--- a/src/views/Home/homeimg/imgForm.vue
+++ b/src/views/Home/homeimg/imgForm.vue
@@ -94,7 +94,7 @@ import {DeptVO, getDept} from "@/api/system/dept";
import {getUserProfile} from "@/api/system/user/profile";
/** 新闻管理 表单 */
-defineOptions({ name: 'imgForm' })
+// defineOptions({ name: 'imgForm' })
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
diff --git a/src/views/Home/homepj/pjForm.vue b/src/views/Home/homepj/pjForm.vue
index 3886eed..cad100c 100644
--- a/src/views/Home/homepj/pjForm.vue
+++ b/src/views/Home/homepj/pjForm.vue
@@ -93,7 +93,7 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { pjApi, pjVO } from '@/api/home/homepj'
/** 主要用于首页的项目数据 表单 */
-defineOptions({ name: 'pjForm' })
+// defineOptions({ name: 'pjForm' })
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
From 7faa8849584a7409a18c2189fa95fa3f7e8d0329 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Fri, 8 Nov 2024 10:49:32 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/Home/clgl/ClglCreate.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/Home/clgl/ClglCreate.vue b/src/views/Home/clgl/ClglCreate.vue
index c8fffdc..a85172a 100644
--- a/src/views/Home/clgl/ClglCreate.vue
+++ b/src/views/Home/clgl/ClglCreate.vue
@@ -153,7 +153,7 @@ const formData = ref({
carRemark: undefined,
})
// 方法:验证开始时间是否小于结束时间
-const validateDate = () => {
+const validateDate = async () => {
if (formData.value.carStart && formData.value.carEnd) {
const start = formData.value.carStart
const end = formData.value.carEnd
From 34dd84d743f3cedcf15508c3e7c32494e8d2b7cb Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Fri, 8 Nov 2024 10:58:02 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/UploadFile/src/UploadFile.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index 4240b80..5ba2158 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -156,7 +156,7 @@ const colors = [
{ color: '#31ff98', percentage: 100 },
]
//根据不同值拿到不同字体颜色
-const getColor = (per:number) => {
+const getColor = async (per:number) => {
const colorObj = colors.find(c => per == c.percentage);
return colorObj ? colorObj.color : '#f56c6c';
}
@@ -254,9 +254,9 @@ const SyncFiles = async () => {
}
}
message.success("同步完成! ")
- emitUpdatePage()
+ await emitUpdatePage()
}
-const emitUpdatePage = () => {
+const emitUpdatePage =async () => {
let result:number[] = [];
for (const pe of fileList.value){
const pa = pe as UploadUserFile & {page?: number};
@@ -462,7 +462,7 @@ const handleRemove = (file: UploadFile) => {
}
//文件预览
-const handleView = (file)=> {
+const handleView = async (file)=> {
const url = file.url
if (!url) {
console.error("文件不可预览");
From c2ecda0e60d7217ebd7b3703f7ca9f0d8e05198f Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Fri, 8 Nov 2024 11:45:06 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/Home/bgyp/BgypCreate.vue | 3 +-
src/views/Home/bgyp/index.vue | 16 ++++----
src/views/Home/clgl/index.vue | 4 +-
src/views/Home/jbgl/JbglCreate.vue | 66 +++++++++++++++---------------
src/views/Home/jbgl/JbglDetail.vue | 64 ++++++++++++++---------------
src/views/Home/jbgl/index.vue | 4 +-
6 files changed, 79 insertions(+), 78 deletions(-)
diff --git a/src/views/Home/bgyp/BgypCreate.vue b/src/views/Home/bgyp/BgypCreate.vue
index a3c3e20..87e6085 100644
--- a/src/views/Home/bgyp/BgypCreate.vue
+++ b/src/views/Home/bgyp/BgypCreate.vue
@@ -49,6 +49,7 @@
type="date"
value-format="x"
placeholder="选择申请时间"
+ disabled
/>
@@ -114,7 +115,7 @@ const formData = ref({
usageQuantity: undefined,
unit: undefined,
usagePurpose: undefined,
- usageDate: undefined,
+ usageDate: Date.now(),
status: undefined,
userId: undefined,
processInstanceId: undefined,
diff --git a/src/views/Home/bgyp/index.vue b/src/views/Home/bgyp/index.vue
index 81371e1..9f59bfb 100644
--- a/src/views/Home/bgyp/index.vue
+++ b/src/views/Home/bgyp/index.vue
@@ -171,13 +171,13 @@ const getList = async () => {
}
/**发起操作 */
-const handleCreate = () => {
- router.push({ name: 'BgypCreate' })
+const handleCreate =async () => {
+ await router.push({name: 'BgypCreate'})
}
/** 审批进度 */
-const handleProcessDetail = (row) => {
- router.push({
+const handleProcessDetail =async (row) => {
+ await router.push({
name: 'BpmProcessInstanceDetail',
query: {
id: row.processInstanceId
@@ -186,8 +186,8 @@ const handleProcessDetail = (row) => {
}
/** 详情操作 */
-const handleDetail = (row: LeaveApi.LeaveVO) => {
- router.push({
+const handleDetail =async (row: LeaveApi.LeaveVO) => {
+ await router.push({
name: 'BgypDetail',
query: {
id: row.id
@@ -231,7 +231,7 @@ const handleExport = async () => {
}
/** 初始化 **/
-onMounted(() => {
- getList()
+onMounted(async () => {
+ await getList()
})
diff --git a/src/views/Home/clgl/index.vue b/src/views/Home/clgl/index.vue
index d642b18..e8a91db 100644
--- a/src/views/Home/clgl/index.vue
+++ b/src/views/Home/clgl/index.vue
@@ -272,7 +272,7 @@ const handleExport = async () => {
}
/** 初始化 **/
-onMounted(() => {
- getList()
+onMounted(async () => {
+ await getList()
})
diff --git a/src/views/Home/jbgl/JbglCreate.vue b/src/views/Home/jbgl/JbglCreate.vue
index 01cd7cc..614b1ea 100644
--- a/src/views/Home/jbgl/JbglCreate.vue
+++ b/src/views/Home/jbgl/JbglCreate.vue
@@ -30,37 +30,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -82,10 +53,40 @@
type="date"
value-format="x"
placeholder="选择申请时间"
+ disabled
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -102,7 +103,6 @@ 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";
-import {number} from "echarts";
/** 加班管理 表单 */
defineOptions({ name: 'JbglCreate' })
@@ -118,7 +118,7 @@ const formData = ref({
userId: undefined,
deptName: undefined,
deptId: undefined,
- usageDate: undefined,
+ usageDate: Date.now(),
type: undefined,
startDate: undefined,
endDate: undefined,
diff --git a/src/views/Home/jbgl/JbglDetail.vue b/src/views/Home/jbgl/JbglDetail.vue
index 6c5581a..50a303c 100644
--- a/src/views/Home/jbgl/JbglDetail.vue
+++ b/src/views/Home/jbgl/JbglDetail.vue
@@ -24,42 +24,13 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -87,6 +58,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/Home/jbgl/index.vue b/src/views/Home/jbgl/index.vue
index 68b7489..15dadc2 100644
--- a/src/views/Home/jbgl/index.vue
+++ b/src/views/Home/jbgl/index.vue
@@ -265,7 +265,7 @@ const handleExport = async () => {
}
/** 初始化 **/
-onMounted(() => {
- getList()
+onMounted(async () => {
+ await getList()
})
From 745f2beaeef8f61d9caf7092028161b024352474 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Fri, 8 Nov 2024 11:47:50 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/Home/clgl/ClglDetail.vue | 1 -
src/views/Home/clgl/index.vue | 12 ++++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/views/Home/clgl/ClglDetail.vue b/src/views/Home/clgl/ClglDetail.vue
index a2661b2..941da4d 100644
--- a/src/views/Home/clgl/ClglDetail.vue
+++ b/src/views/Home/clgl/ClglDetail.vue
@@ -199,6 +199,5 @@ const formRules = reactive({
})
const formRef = ref() // 表单 Ref
-defineExpose({ open }) // 提供 open 方法,用于打开弹窗
diff --git a/src/views/Home/clgl/index.vue b/src/views/Home/clgl/index.vue
index e8a91db..7d17553 100644
--- a/src/views/Home/clgl/index.vue
+++ b/src/views/Home/clgl/index.vue
@@ -198,12 +198,12 @@ const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
/**发起操作 */
-const handleCreate = () => {
- router.push({ name: 'ClglCreate' })
+const handleCreate =async () => {
+ await router.push({name: 'ClglCreate'})
}
/** 详情操作 */
-const handleDetail = (row: LeaveApi.LeaveVO) => {
- router.push({
+const handleDetail =async (row: LeaveApi.LeaveVO) => {
+ await router.push({
name: 'ClglDetail',
//传递id
query: {
@@ -212,8 +212,8 @@ const handleDetail = (row: LeaveApi.LeaveVO) => {
})
}
/** 审批进度 */
-const handleProcessDetail = (row) => {
- router.push({
+const handleProcessDetail =async (row) => {
+ await router.push({
name: 'BpmProcessInstanceDetail',
//传递id
query: {
From 46c1f479e736acbe8d5764fc2da17bf3941741b2 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Mon, 11 Nov 2024 07:45:04 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4=E7=AE=A1?=
=?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/home/hsgl/index.ts | 53 ++++
src/utils/dict.ts | 2 +
src/views/Home/hsgl/bk.vue | 528 +++++++++++++++++++++++++++++++++++++
3 files changed, 583 insertions(+)
create mode 100644 src/api/home/hsgl/index.ts
create mode 100644 src/views/Home/hsgl/bk.vue
diff --git a/src/api/home/hsgl/index.ts b/src/api/home/hsgl/index.ts
new file mode 100644
index 0000000..37400f9
--- /dev/null
+++ b/src/api/home/hsgl/index.ts
@@ -0,0 +1,53 @@
+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
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index feccabb..0550978 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -125,6 +125,8 @@ export enum DICT_TYPE {
BGYP_USAGE_NAME = 'bgyp_usage_name',
BGYP_UNIT = 'bgyp_unit',
JBGL_TYPE = 'jbgl_type',
+ HSGL_STATUS = 'hsgl_status',
+ HSGL_TYPE= 'hsgl_type',
// ========== SYSTEM 模块 ==========
SYSTEM_USER_SEX = 'system_user_sex',
diff --git a/src/views/Home/hsgl/bk.vue b/src/views/Home/hsgl/bk.vue
new file mode 100644
index 0000000..c970da0
--- /dev/null
+++ b/src/views/Home/hsgl/bk.vue
@@ -0,0 +1,528 @@
+
+
+
+
+
+//---------------------------------------------------------------------
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+ 新增
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
From e395cc3e660bd2828e237ebe7752e19694115a86 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Mon, 11 Nov 2024 07:55:23 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4=E7=AE=A1?=
=?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/Home/hsgl/HsglForm.vue | 196 +++++++++++++++++
src/views/Home/hsgl/index.vue | 351 +++++++++++++++++++++++++++++++
2 files changed, 547 insertions(+)
create mode 100644 src/views/Home/hsgl/HsglForm.vue
create mode 100644 src/views/Home/hsgl/index.vue
diff --git a/src/views/Home/hsgl/HsglForm.vue b/src/views/Home/hsgl/HsglForm.vue
new file mode 100644
index 0000000..477a234
--- /dev/null
+++ b/src/views/Home/hsgl/HsglForm.vue
@@ -0,0 +1,196 @@
+
+
+
+
diff --git a/src/views/Home/hsgl/index.vue b/src/views/Home/hsgl/index.vue
new file mode 100644
index 0000000..0964377
--- /dev/null
+++ b/src/views/Home/hsgl/index.vue
@@ -0,0 +1,351 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+ 新增
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
From 3e78b8a8267841dcc9a990d8558735d1f8c3159e Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Mon, 11 Nov 2024 10:14:44 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4=E7=AE=A1?=
=?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/modules/remaining.ts | 24 ++++
src/views/Home/hsgl/HsglCreate.vue | 200 +++++++++++++++++++++++++++++
src/views/Home/hsgl/HsglDetail.vue | 157 ++++++++++++++++++++++
src/views/Home/hsgl/HsglForm.vue | 15 ++-
src/views/Home/hsgl/index.vue | 98 ++++++++------
5 files changed, 447 insertions(+), 47 deletions(-)
create mode 100644 src/views/Home/hsgl/HsglCreate.vue
create mode 100644 src/views/Home/hsgl/HsglDetail.vue
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index 3614909..456759d 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -736,6 +736,30 @@ const remainingRouter: AppRouteRecordRaw[] = [
activeMenu: '/Home/jbgl/Jbglflow'
}
},
+ {
+ path: 'hsgl/HsglCreate',
+ component: () => import('@/views/Home/hsgl/HsglCreate.vue'),
+ name: 'HsglCreate',
+ meta: {
+ noCache: true,
+ hidden: true,
+ canTo: true,
+ title: '发起会议室管理流程',
+ activeMenu: '/Home/hsgl/Hsglflow'
+ }
+ },
+ {
+ path: 'hsgl/HsglDetail',
+ component: () => import('@/views/Home/hsgl/HsglDetail.vue'),
+ name: 'HsglDetail',
+ meta: {
+ noCache: true,
+ hidden: true,
+ canTo: true,
+ title: '查看会议室管理流程',
+ activeMenu: '/Home/hsgl/Hsglflow'
+ }
+ },
]
},
]
diff --git a/src/views/Home/hsgl/HsglCreate.vue b/src/views/Home/hsgl/HsglCreate.vue
new file mode 100644
index 0000000..f0caee7
--- /dev/null
+++ b/src/views/Home/hsgl/HsglCreate.vue
@@ -0,0 +1,200 @@
+
+
+
+ 创建会议室管理流程
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确 定
+
+
+
+
diff --git a/src/views/Home/hsgl/HsglDetail.vue b/src/views/Home/hsgl/HsglDetail.vue
new file mode 100644
index 0000000..b6ed3e7
--- /dev/null
+++ b/src/views/Home/hsgl/HsglDetail.vue
@@ -0,0 +1,157 @@
+
+
+
+ 会议室管理流程
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/Home/hsgl/HsglForm.vue b/src/views/Home/hsgl/HsglForm.vue
index 477a234..1fbec23 100644
--- a/src/views/Home/hsgl/HsglForm.vue
+++ b/src/views/Home/hsgl/HsglForm.vue
@@ -1,6 +1,8 @@
-
+
+ 确 定
+
+
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 9/9] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4=E7=AE=A1?=
=?UTF-8?q?=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