fix(协同办公): 会议申请/审批/发布/总结的参会人员改为取系统用户,与系统管理-用户保持一致
| | |
| | | import {ElMessage} from 'element-plus' |
| | | import {Plus, Document, Promotion, Bell} from '@element-plus/icons-vue' |
| | | import {getRoomEnum, saveMeetingApplication} from '@/api/collaborativeApproval/meeting.js' |
| | | import {getStaffOnJob} from "@/api/personnelManagement/onboarding.js"; |
| | | import {userListNoPageByTenantId} from "@/api/system/user.js"; |
| | | |
| | | // 当前申请类型 |
| | | const currentType = ref('department') // approval: 审批流程, department: 部门级, notification: 通知发布 |
| | |
| | | getRoomEnum().then(res => { |
| | | meetingRooms.value = res.data |
| | | }) |
| | | getStaffOnJob().then(res => { |
| | | employees.value = res.data.sort((a, b) => a.postJob.localeCompare(b.postJob)) |
| | | // 参会人员改为取「系统管理-用户管理」中的用户(当前租户下全部用户) |
| | | userListNoPageByTenantId().then(res => { |
| | | employees.value = (res.data || []) |
| | | .map(u => ({ ...u, id: u.userId, staffName: u.nickName || u.userName, postJob: u.userName })) |
| | | .sort((a, b) => String(a.postJob).localeCompare(String(b.postJob))) |
| | | }) |
| | | }) |
| | | </script> |
| | |
| | | import {ElMessage, ElMessageBox} from 'element-plus' |
| | | import Pagination from '@/components/Pagination/index.vue' |
| | | import {getRoomEnum, getExamineList,saveMeetingApplication} from '@/api/collaborativeApproval/meeting.js' |
| | | import {getStaffOnJob} from "@/api/personnelManagement/onboarding.js"; |
| | | import {userListNoPageByTenantId} from "@/api/system/user.js"; |
| | | import dayjs from "dayjs"; |
| | | |
| | | // 数据列表加载状态 |
| | |
| | | |
| | | // 页面加载时获取数据 |
| | | onMounted(async () => { |
| | | const [resp1, resp2]= await Promise.all([getRoomEnum(), getStaffOnJob()]) |
| | | const [resp1, resp2]= await Promise.all([getRoomEnum(), userListNoPageByTenantId()]) |
| | | roomEnum.value = resp1.data |
| | | staffList.value = resp2.data |
| | | staffList.value = (resp2.data || []).map(u => ({ ...u, id: u.userId, staffName: u.nickName || u.userName, postJob: u.userName })) |
| | | |
| | | await getList() |
| | | }) |
| | |
| | | import {ElMessage, ElMessageBox} from 'element-plus' |
| | | import Pagination from '@/components/Pagination/index.vue' |
| | | import {getRoomEnum, getMeetingPublish,saveMeetingApplication} from '@/api/collaborativeApproval/meeting.js' |
| | | import {getStaffOnJob} from "@/api/personnelManagement/onboarding.js"; |
| | | import {userListNoPageByTenantId} from "@/api/system/user.js"; |
| | | import dayjs from "dayjs"; |
| | | |
| | | // 数据列表加载状态 |
| | |
| | | |
| | | // 页面加载时获取数据 |
| | | onMounted(async () => { |
| | | const [resp1, resp2]= await Promise.all([getRoomEnum(), getStaffOnJob()]) |
| | | const [resp1, resp2]= await Promise.all([getRoomEnum(), userListNoPageByTenantId()]) |
| | | roomEnum.value = resp1.data |
| | | staffList.value = resp2.data |
| | | staffList.value = (resp2.data || []).map(u => ({ ...u, id: u.userId, staffName: u.nickName || u.userName, postJob: u.userName })) |
| | | |
| | | await getList() |
| | | }) |
| | |
| | | import Pagination from '@/components/Pagination/index.vue' |
| | | import Editor from '@/components/Editor/index.vue' |
| | | import { getRoomEnum, getMeetingPublish ,getMeetingMinutesByMeetingId,saveMeetingMinutes} from '@/api/collaborativeApproval/meeting.js' |
| | | import { getStaffOnJob } from "@/api/personnelManagement/onboarding.js" |
| | | import { userListNoPageByTenantId } from "@/api/system/user.js" |
| | | import dayjs from "dayjs" |
| | | |
| | | // 数据列表加载状态 |
| | |
| | | try { |
| | | const [resp1, resp2] = await Promise.all([ |
| | | getRoomEnum().catch(() => ({ data: [] })), |
| | | getStaffOnJob().catch(() => ({ data: [] })) |
| | | userListNoPageByTenantId().catch(() => ({ data: [] })) |
| | | ]) |
| | | roomEnum.value = (resp1 && resp1.data) || [] |
| | | staffList.value = (resp2 && resp2.data) || [] |
| | | staffList.value = ((resp2 && resp2.data) || []).map(u => ({ ...u, id: u.userId, staffName: u.nickName || u.userName, postJob: u.userName })) |
| | | } catch (e) { |
| | | roomEnum.value = [] |
| | | staffList.value = [] |