diff --git a/src/views/Home/hygl/HyglCreate.vue b/src/views/Home/hygl/HyglCreate.vue
index 350e33e..51cc47f 100644
--- a/src/views/Home/hygl/HyglCreate.vue
+++ b/src/views/Home/hygl/HyglCreate.vue
@@ -27,6 +27,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -39,40 +67,6 @@
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -92,6 +86,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -100,63 +106,46 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
确 定
@@ -170,6 +159,7 @@
import * as DefinitionApi from '@/api/bpm/definition'
import * as UserApi from '@/api/system/user'
import {useTagsViewStore} from "@/store/modules/tagsView";
+ import {HysglApi, HysglVO} from "@/api/home/hysgl";
/** 会议管理 表单 */
defineOptions({ name: 'HyglCreate' })
@@ -181,27 +171,24 @@
// const dialogTitle = ref('') // 弹窗的标题
// const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
- // const listHsgl = ref([]) // 列表的数据
- // const queryParamsHsgl = reactive({
- // pageNo: 1,
- // pageSize: 30,
- // id: undefined,
- // title: undefined,
- // name: undefined,
- // location: undefined,
- // roomType: undefined,
- // manager: undefined,
- // roomMax: undefined,
- // capacity: undefined,
- // facilities: undefined,
- // roomStatus: 1,
- // photo: undefined,
- // remark: undefined,
- // status: 0,
- // userId: undefined,
- // processInstanceId: undefined,
- // createTime: [],
- // })
+ const listHysgl = ref([]) // 列表的数据
+ const queryParamsHysgl = reactive({
+ pageNo: 1,
+ pageSize: 20,
+ id: undefined,
+ title: undefined,
+ name: undefined,
+ location: undefined,
+ roomType: undefined,
+ manager: undefined,
+ roomMax: undefined,
+ capacity: undefined,
+ facilities: undefined,
+ roomStatus: 1,
+ photo: undefined,
+ remark: undefined,
+ createTime: [],
+ })
const formData = ref({
id: undefined,
title: undefined,
@@ -210,6 +197,7 @@
deptName: undefined,
deptId: undefined,
time: Date.now(),
+ photo: undefined,
depict: undefined,
type: undefined,
theme: undefined,
@@ -284,36 +272,36 @@
}
}
/** 查询会议室列表 */
- // const getList = async () => {
- // // 提交请求
- // formLoading.value = true
- // try {
- // const dataHsgl = await HsglApi.getHsglPage(queryParamsHsgl)
- // listHsgl.value = dataHsgl.list
- // } finally {
- // formLoading.value = false
- // }
- // }
+ const getList = async () => {
+ // 提交请求
+ formLoading.value = true
+ try {
+ const dataHysgl = await HysglApi.getHysglPage(queryParamsHysgl)
+ listHysgl.value = dataHysgl.list
+ } finally {
+ formLoading.value = false
+ }
+ }
- // const getAddress = async (id:number|undefined)=>{
- // // 提交请求
- // formLoading.value = true
- // try {
- // if (id !== undefined) {
- // queryParamsHsgl.id = !id;
- // }
- // console.log("queryParamsHsgl",queryParamsHsgl)
- // const dataHsgl = await HsglApi.getHsglPage(queryParamsHsgl)
- // formData.value.roomAddress = dataHsgl.list[0].location
- // } finally {
- // formLoading.value = false
- // }
- // }
+ const getAddress = async (id:number)=>{
+ // 提交请求
+ formLoading.value = true
+ try {
+ if (id == undefined) {
+ return
+ }
+ const dataHysgl = await HysglApi.getHysgl(id)
+ formData.value.roomAddress = dataHysgl.location
+ formData.value.photo = dataHysgl.photo
+ } finally {
+ formLoading.value = false
+ }
+ }
/** 初始化 */
onMounted(async () => {
await getUserInfo()
- // await getList()
+ await getList()
const processDefinitionDetail = await DefinitionApi.getProcessDefinition(
undefined,
processDefineKey
diff --git a/src/views/Home/hygl/HyglDetail.vue b/src/views/Home/hygl/HyglDetail.vue
index 67751f1..689ca08 100644
--- a/src/views/Home/hygl/HyglDetail.vue
+++ b/src/views/Home/hygl/HyglDetail.vue
@@ -27,30 +27,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
@@ -94,68 +88,67 @@
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -163,9 +156,10 @@