yudao-team/oa-ui
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新会议管理

Browse Source
This commit is contained in:
XaoLi717 2024-11-13 14:47:06 +08:00
parent db08642273
commit 0174ee45a0
2 changed files with 228 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

256
src/views/Home/hygl/HyglCreate.vue
View File

@ -27,6 +27,34 @@
<el-form-item label="会议标题" prop="title">
<el-input v-model="formData.title" placeholder="请输入会议标题" />
</el-form-item>
<el-form-item label="会议主题" prop="theme">
<el-input v-model="formData.theme" placeholder="请输入会议主题" />
</el-form-item>
<el-form-item label="会议目标" prop="target">
<el-input v-model="formData.target" placeholder="请输入会议目标" />
</el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="会议开始时间" prop="startDate">
<el-date-picker
v-model="formData.startDate"
type="datetime"
value-format="x"
placeholder="选择会议开始时间"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="会议结束时间" prop="endDate">
<el-date-picker
v-model="formData.endDate"
type="datetime"
value-format="x"
placeholder="选择会议结束时间"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="申请时间" prop="time">
@ -39,40 +67,6 @@
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="预计时间(小时)" prop="duration">
<el-input v-model="formData.duration" placeholder="请输入预计时间" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="会议开始时间" prop="startDate">
<el-date-picker
v-model="formData.startDate"
type="date"
value-format="x"
placeholder="选择会议开始时间"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="会议结束时间" prop="endDate">
<el-date-picker
v-model="formData.endDate"
type="date"
value-format="x"
placeholder="选择会议结束时间"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="描述" prop="depict">
<el-input v-model="formData.depict" placeholder="请输入描述" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="会议类型" prop="type">
<el-select v-model="formData.type" placeholder="请选择会议类型">
@ -92,6 +86,18 @@
<el-input v-model="formData.organizer" placeholder="请输入组织者" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="主讲人" prop="speaker">
<el-input v-model="formData.speaker" placeholder="请输入主讲人" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="记录人员" prop="meetingTaker">
<el-input v-model="formData.meetingTaker" placeholder="请输入记录人员" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="参会人数" prop="number">
<el-input v-model.number="formData.number" placeholder="请输入参会人数" />
@ -100,63 +106,46 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="主讲人" prop="speaker">
<el-input v-model="formData.speaker" placeholder="请输入主讲人" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="记录人员" prop="meetingTaker">
<el-input v-model="formData.meetingTaker" placeholder="请输入记录人员" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="会议主题" prop="theme">
<el-input v-model="formData.theme" placeholder="请输入会议主题" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="会议目标" prop="target">
<el-input v-model="formData.target" placeholder="请输入会议目标" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="会议室" prop="roomName">
<!-- <el-select-->
<!-- v-model="formData.roomId"-->
<!-- placeholder="请选择会议室"-->
<!-- @change="getAddress(formData.roomId)"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="dict in listHsgl"-->
<!-- :key="dict.id"-->
<!-- :label="dict.name"-->
<!-- :value="dict.id"-->
<!-- />-->
<!-- </el-select>-->
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="会议室地址" prop="roomAddress">
<el-input v-model="formData.roomAddress" placeholder="请输入会议室地址" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="设备需求" prop="equipmentList">
<el-input v-model="formData.equipmentList" placeholder="请输入设备需求" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="网络需求" prop="network">
<el-input v-model="formData.network" placeholder="请输入网络需求" />
<el-form-item label="会议室" prop="roomId">
<el-select
v-model="formData.roomId"
placeholder="请选择会议室"
@change="getAddress(formData.roomId)"
>
<el-option
v-for="dict in listHysgl"
:key="dict.id"
:label="dict.name"
:value="dict.id"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item v-if="formData.photo" label="会议室图片" prop="photo">
<el-image
style="width: 150px;height: 150px;"
:src="formData.photo"
fit="scale-down"
/>
</el-form-item>
<el-form-item v-if="formData.roomAddress" label="会议室地址" prop="roomAddress">
<el-input
type="textarea"
v-model="formData.roomAddress"
placeholder="请输入会议室地址"
disabled
/>
</el-form-item>
<el-form-item label="描述" prop="depict">
<el-input type="textarea" v-model="formData.depict" placeholder="请输入描述" />
</el-form-item>
<el-form-item label="设备需求" prop="equipmentList">
<el-input type="textarea" v-model="formData.equipmentList" placeholder="请输入设备需求" />
</el-form-item>
<el-form-item label="网络需求" prop="network">
<el-input type="textarea" v-model="formData.network" placeholder="请输入网络需求" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@ -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<HsglVO[]>([]) // 列表的数据
// 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<HysglVO[]>([]) // 列表的数据
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

205
src/views/Home/hygl/HyglDetail.vue
View File

@ -27,30 +27,18 @@
<el-form-item label="会议标题" prop="title">
<el-input v-model="formData.title" placeholder="请输入会议标题" disabled />
</el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="申请时间" prop="time">
<el-date-picker
v-model="formData.time"
type="date"
value-format="x"
placeholder="选择申请时间"
disabled
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="预计时间(小时)" prop="duration">
<el-input v-model="formData.duration" placeholder="请输入预计时间" disabled />
</el-form-item>
</el-col>
</el-row>
<el-form-item label="会议主题" prop="theme">
<el-input v-model="formData.theme" placeholder="请输入会议主题" disabled />
</el-form-item>
<el-form-item label="会议目标" prop="target">
<el-input v-model="formData.target" placeholder="请输入会议目标" disabled />
</el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="会议开始时间" prop="startDate">
<el-date-picker
v-model="formData.startDate"
type="date"
type="datetime"
value-format="x"
placeholder="选择会议开始时间"
disabled
@ -61,7 +49,7 @@
<el-form-item label="会议结束时间" prop="endDate">
<el-date-picker
v-model="formData.endDate"
type="date"
type="datetime"
value-format="x"
placeholder="选择会议结束时间"
disabled
@ -71,8 +59,14 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="描述" prop="depict">
<el-input v-model="formData.depict" placeholder="请输入描述" disabled />
<el-form-item label="申请时间" prop="time">
<el-date-picker
v-model="formData.time"
type="date"
value-format="x"
placeholder="选择申请时间"
disabled
/>
</el-form-item>
</el-col>
<el-col :span="12">
@ -94,68 +88,67 @@
<el-input v-model="formData.organizer" placeholder="请输入组织者" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="参会人数" prop="number">
<el-input v-model="formData.number" placeholder="请输入参会人数" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="主讲人" prop="speaker">
<el-input v-model="formData.speaker" placeholder="请输入主讲人" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="记录人员" prop="meetingTaker">
<el-input v-model="formData.meetingTaker" placeholder="请输入记录人员" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="会议主题" prop="theme">
<el-input v-model="formData.theme" placeholder="请输入会议主题" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="会议目标" prop="target">
<el-input v-model="formData.target" placeholder="请输入会议目标" disabled />
<el-form-item label="参会人数" prop="number">
<el-input v-model.number="formData.number" placeholder="请输入参会人数" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="会议室名字" prop="roomName">
<!-- <el-select v-model="formData.roomId" placeholder="请选择会议室" disabled>-->
<!-- <el-option-->
<!-- v-for="dict in listHsgl"-->
<!-- :key="dict.id"-->
<!-- :label="dict.name"-->
<!-- :value="dict.id"-->
<!-- disabled-->
<!-- />-->
<!-- </el-select>-->
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="会议室地址" prop="roomAddress">
<el-input v-model="formData.roomAddress" placeholder="请输入会议室地址" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="设备需求" prop="equipmentList">
<el-input v-model="formData.equipmentList" placeholder="请输入设备需求" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="网络需求" prop="network">
<el-input v-model="formData.network" placeholder="请输入网络需求" disabled />
<el-form-item label="会议室" prop="roomId">
<el-select
v-model="formData.roomId"
placeholder="请选择会议室"
@change="getAddress()"
disabled
>
<el-option
v-for="dict in listHysgl"
:key="dict.id"
:label="dict.name"
:value="dict.id"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item v-if="formData.photo" label="会议室图片" prop="photo">
<el-image
style="width: 150px;height: 150px;"
:src="formData.photo"
fit="scale-down"
/>
</el-form-item>
<el-form-item v-if="formData.roomAddress" label="会议室地址" prop="roomAddress">
<el-input
type="textarea"
v-model="formData.roomAddress"
placeholder="请输入会议室地址"
disabled
/>
</el-form-item>
<el-form-item label="描述" prop="depict">
<el-input type="textarea" v-model="formData.depict" placeholder="请输入描述" disabled />
</el-form-item>
<el-form-item label="设备需求" prop="equipmentList">
<el-input type="textarea" v-model="formData.equipmentList" placeholder="请输入设备需求" disabled />
</el-form-item>
<el-form-item label="网络需求" prop="network">
<el-input type="textarea" v-model="formData.network" placeholder="请输入网络需求" disabled />
</el-form-item>
</el-form>
<template #footer>
</template>
@ -163,9 +156,10 @@
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { HyglApi, HyglVO } from '@/api/home/hygl'
import { HyglApi, } from '@/api/home/hygl'
import {getUserProfile} from "@/api/system/user/profile";
import {propTypes} from "@/utils/propTypes";
import {HysglApi, HysglVO} from "@/api/home/hysgl";
/** 会议管理 表单 */
defineOptions({ name: 'HyglDetail' })
@ -193,6 +187,7 @@ const formData = ref({
endDate: undefined,
duration: undefined,
roomId: undefined,
photo: undefined,
roomName: undefined,
roomAddress: undefined,
organizer: undefined,
@ -236,43 +231,55 @@ const getUserInfo = async () => {
deptInfo.value = formData.value.deptName ?? '';
userInfo.value = formData.value.userName ?? '';
};
// const listHsgl = ref<HsglVO[]>([]) // 列表的数据
// 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: undefined,
// userId: undefined,
// processInstanceId: undefined,
// createTime: [],
// })
const listHysgl = ref<HysglVO[]>([]) // 列表的数据
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 getList = async () => {
// // 提交请求
// formLoading.value = true
// try {
// const dataHsgl = await HsglApi.getHsglPage(queryParamsHsgl)
// listHsgl.value = dataHsgl.list
// console.log("listHsgl",listHsgl.value)
// } 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 ()=>{
// 提交请求
formLoading.value = true
try {
if (formData.value.roomId == undefined) {
return
}
const dataHysgl = await HysglApi.getHysgl(formData.value.roomId)
formData.value.roomAddress = dataHysgl.location
formData.value.photo = dataHysgl.photo
} finally {
formLoading.value = false
}
}
onMounted(async ()=>{
await getUserInfo()
await getInfo()
// await getList()
await getList()
await getAddress()
})
const formRules = reactive({
title: [{ required: true, message: '会议标题不能为空', trigger: 'blur' }],