diff --git a/public/index.html b/public/index.html index f3a0d2e..aff494e 100644 --- a/public/index.html +++ b/public/index.html @@ -5,7 +5,7 @@ - 淮安市机关事务服务平台管理系统 + 淮安市行政中心智慧后勤服务平台 <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %> @@ -18,11 +18,11 @@
-

Pro

+

淮安市行政中心智慧后勤服务平台

-
ICS Ant
+
淮安市机关事务局
diff --git a/src/api/admin/meeting/meetingReservation.js b/src/api/admin/meeting/meetingReservation.js index f73a719..42d002e 100644 --- a/src/api/admin/meeting/meetingReservation.js +++ b/src/api/admin/meeting/meetingReservation.js @@ -86,6 +86,16 @@ export function cancelOrder(parameter) { }) } +// 会议室-删除预约 +export function approveOrderDel(parameter) { + return axios({ + // url: '/api/roomContent/cancelOrder', + url: api.meetingReservation + '/delete', + method: 'post', + data: parameter + }) +} + // 获取预约信息 export function getOrderInfo(parameter) { return axios({ diff --git a/src/config/defaultSettings.js b/src/config/defaultSettings.js index 3235057..bed9267 100644 --- a/src/config/defaultSettings.js +++ b/src/config/defaultSettings.js @@ -23,7 +23,7 @@ export default { menu: { locale: true }, - title: '淮安市机关事务服务平台', + title: '行政中心智慧后勤服务平台', pwa: false, iconfontUrl: '', production: process.env.NODE_ENV === 'production' && process.env.VUE_APP_PREVIEW !== 'true' diff --git a/src/layouts/UserLayout.vue b/src/layouts/UserLayout.vue index 8920501..466a555 100644 --- a/src/layouts/UserLayout.vue +++ b/src/layouts/UserLayout.vue @@ -5,7 +5,7 @@
- 淮安市机关事务服务平台管理系统 + 淮安市行政中心智慧后勤服务平台
diff --git a/src/views/admin/meeting/MeetingMangerList.vue b/src/views/admin/meeting/MeetingMangerList.vue index fb9dd4a..d4cee17 100644 --- a/src/views/admin/meeting/MeetingMangerList.vue +++ b/src/views/admin/meeting/MeetingMangerList.vue @@ -80,7 +80,7 @@ - + {{ item.text }} @@ -142,6 +142,7 @@ + 请在08:30~17:30内进行预约会议
有问题请联系工作人员:陆成俊 83605343
@@ -200,7 +201,7 @@ export default { } }, created() { - + this.openNotification() }, mounted() { let rId = this.$route.query.rId @@ -231,7 +232,7 @@ export default { pick( this.mdl, 'loginName', - 'password', + 'password' ) ) }) @@ -249,6 +250,34 @@ export default { this.getAllRoomList() }, methods: { + // 会议系统 + openNotification() { + this.$notification.open({ + message: '提醒', + description: '会议服务热线:83605343', + duration: 0 + }) + this.$notification.open({ + message: '提醒', + description: (h) => { + const msg = '1、此系统分配的账号仅用于会议室申请预约,请各单位专人扎口负责会议预定管理工作。;' + + '2、系统提示“预约提交成功”后请及时关注预约进度,若有疑问请随时拨打会议服务热线:83605343。;' + + '3、会议开始前如需调整会议,请及时通过系统操作或电话告知,已预约成功的会议室可能因临时重大会议取消或调剂,请理解配合。' + // 将反馈信息使用;分割为数组 + const splitText = msg?.split(';') ?? [] + // 数组中每项反馈信息都转为VNode + const res = _.map(splitText, (item) => { + return h('p', { + style: { + 'margin-bottom': 0 + } + }, item) + }) + // 返回总的VNode,子元素为所有反馈信息 + return h('p', {}, res) + } + }) + }, chooseDate(date, dateString) { this.nowDate = dateString }, diff --git a/src/views/admin/meeting/MeetingReservationList.vue b/src/views/admin/meeting/MeetingReservationList.vue index 12e7435..c707ee1 100644 --- a/src/views/admin/meeting/MeetingReservationList.vue +++ b/src/views/admin/meeting/MeetingReservationList.vue @@ -136,7 +136,7 @@ 查看 - 取消预约 + 取消预约 修改信息 @@ -193,7 +193,7 @@ import { cancelOrder, approveOrder, expMRByDate, - expMRByMonth, getAllRoom + expMRByMonth, getAllRoom, approveOrderDel } from '@/api/admin/meeting/meetingReservation' import { checkPermission } from '@/utils/permissions' @@ -310,7 +310,7 @@ export default { if (statusValue == 4) { // 占用,可以修改 showEdit = true - // showCancel = true + showCancel = true // showStaff = true } if (statusValue == 5) { @@ -433,10 +433,36 @@ export default { * 取消预约 * @param id */ - cancelConfirm(id) { + cancelConfirm(id, status) { + let _this = this this.cancelId = id - this.showCancelReason = true - this.cancelReason = '' + if (status == 4 && this.isAdmin) { + // 占用状态取消,则为删除 + this.$confirm({ + title: '确认', + content: '取消后不可撤销,是否确认?', + okText: '是', + okType: 'success', + cancelText: '否', + onOk() { + approveOrderDel({ + id: id + }).then(res => { + if (res.code === 0) { + _this.$message.success('已取消!') + _this.handleOk() + } else { + _this.$message.error(res.msg) + } + }) + }, + onCancel() { + } + }) + } else { + this.showCancelReason = true + this.cancelReason = '' + } }, onCloseCancel() { this.cancelId = '' diff --git a/src/views/admin/meeting/modules/RoomOrderModal.vue b/src/views/admin/meeting/modules/RoomOrderModal.vue index b9b9edb..a69c256 100644 --- a/src/views/admin/meeting/modules/RoomOrderModal.vue +++ b/src/views/admin/meeting/modules/RoomOrderModal.vue @@ -348,8 +348,9 @@ export default { if (this.timeRange == 4) { this.timeRangeText = '全天' } - this.depId = res.mr.userOrgId - this.dep = res.mr.userOrg + // 占用时候获取不到,给默认值为空字符串 + this.depId = res.mr.userOrgId || '' + this.dep = res.mr.userOrg || '' this.depList = [{ id: this.depId.toString(), name: this.dep diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue index ec4c560..c83d9f2 100644 --- a/src/views/dashboard/Analysis.vue +++ b/src/views/dashboard/Analysis.vue @@ -1,5 +1,5 @@