diff --git a/src/api/home/hsgl/index.ts b/src/api/home/hsgl/index.ts
new file mode 100644
index 0000000..b939e73
--- /dev/null
+++ b/src/api/home/hsgl/index.ts
@@ -0,0 +1,54 @@
+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/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("文件不可预览");
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/utils/dict.ts b/src/utils/dict.ts
index b0c76b8..2d7f394 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/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/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
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 d642b18..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: {
@@ -272,7 +272,7 @@ const handleExport = async () => {
}
/** 初始化 **/
-onMounted(() => {
- getList()
+onMounted(async () => {
+ await getList()
})
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() // 消息弹窗
diff --git a/src/views/Home/hsgl/HsglCreate.vue b/src/views/Home/hsgl/HsglCreate.vue
new file mode 100644
index 0000000..7a46ec6
--- /dev/null
+++ b/src/views/Home/hsgl/HsglCreate.vue
@@ -0,0 +1,207 @@
+
+
+
+ 创建会议室管理流程
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确 定
+
+
+
+
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
new file mode 100644
index 0000000..1fbec23
--- /dev/null
+++ b/src/views/Home/hsgl/HsglForm.vue
@@ -0,0 +1,197 @@
+
+
+
+ 创建会议室管理流程
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确 定
+
+
+
+
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 @@
+
+
+
+
+
+//---------------------------------------------------------------------
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+ 新增
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/Home/hsgl/index.vue b/src/views/Home/hsgl/index.vue
new file mode 100644
index 0000000..8a0568f
--- /dev/null
+++ b/src/views/Home/hsgl/index.vue
@@ -0,0 +1,369 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+ 发起流程
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+ 进度
+
+
+
+
+
+
+
+
+
+
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()
})