From cb3747ad0f8ac908c1d347cbc1cae5f1b7296efd Mon Sep 17 00:00:00 2001
From: chendaze <1824191732@qq.com>
Date: Thu, 7 Mar 2024 09:41:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=88=BF=E9=97=B4?=
=?UTF-8?q?=E4=B8=BB=E4=BD=93=E7=9A=84PC=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/admin/meeting/reservationPerson.js | 2 +-
src/api/admin/meeting/roomContent.js | 83 ++++
.../admin/meeting/ReservationPersonList.vue | 47 ++-
src/views/admin/meeting/RoomContentList.vue | 367 +++++++++++------
.../modules/ReservationPersonModal.vue | 17 +-
.../meeting/modules/RoomContentModal.vue | 389 +++++++++++++++---
.../admin/meeting/modules/RoomServeModal.vue | 3 +-
7 files changed, 706 insertions(+), 202 deletions(-)
diff --git a/src/api/admin/meeting/reservationPerson.js b/src/api/admin/meeting/reservationPerson.js
index 10fc465..7b8943e 100644
--- a/src/api/admin/meeting/reservationPerson.js
+++ b/src/api/admin/meeting/reservationPerson.js
@@ -1,7 +1,7 @@
import { axios } from '@/utils/request'
const api = {
- reservationPerson: '/meeting/visitorPerson'
+ reservationPerson: '/meeting/reservationPerson'
}
export function getReservationPersonList (parameter) {
diff --git a/src/api/admin/meeting/roomContent.js b/src/api/admin/meeting/roomContent.js
index 940b722..663577c 100644
--- a/src/api/admin/meeting/roomContent.js
+++ b/src/api/admin/meeting/roomContent.js
@@ -12,6 +12,15 @@ export function getRoomContentList (parameter) {
})
}
+export function get (id) {
+ return axios({
+ url: api.roomContent + '/get/'+id,
+ method: 'get',
+ params: {}
+ })
+}
+
+
export function selectSearchInfoByType (parameter) {
return axios({
url: api.roomContent + '/searchInfo/1',
@@ -47,6 +56,80 @@ export function saveRoomContent (parameter) {
})
}
+export function addRoomServe (parameter) {
+ return axios({
+ url: api.roomContent + '/addRoomServe',
+ method: 'post',
+ data: parameter,
+ headers: {
+ 'Content-Type': 'application/json;charset=UTF-8'
+ }
+ })
+}
+
+export function addRoomItem (parameter) {
+ return axios({
+ url: api.roomContent + '/addRoomItem',
+ method: 'post',
+ data: parameter,
+ headers: {
+ 'Content-Type': 'application/json;charset=UTF-8'
+ }
+ })
+}
+
+//根据会议室id 获取服务列表
+export function selectRoomServeByRoom (parameter) {
+ return axios({
+ url: api.roomContent + '/selectRoomServeByRoom',
+ method: 'post',
+ data: parameter,
+ headers: {
+ 'Content-Type': 'application/json;charset=UTF-8'
+ }
+ })
+}
+
+
+export function getFloorList (parameter) {
+ return axios({
+ url: api.roomContent + '/getFloorList',
+ method: 'get',
+ params: parameter
+ })
+}
+
+
+export function selectRoomById (parameter) {
+ return axios({
+ url: api.roomContent + '/selectRoomById',
+ method: 'get',
+ params: parameter
+ })
+}
+
+
+export function getRoomListByFloorId (parameter) {
+ return axios({
+ url: api.roomContent + '/getRoomListByFloorId',
+ method: 'get',
+ params: parameter
+ })
+}
+
+
+export function selectRoomItemByRoom (parameter) {
+ return axios({
+ url: api.roomContent + '/selectRoomItemByRoom',
+ method: 'post',
+ data: parameter,
+ headers: {
+ 'Content-Type': 'application/json;charset=UTF-8'
+ }
+ })
+}
+
+
export function delRoomContent (parameter) {
return axios({
url: api.roomContent + '/remove',
diff --git a/src/views/admin/meeting/ReservationPersonList.vue b/src/views/admin/meeting/ReservationPersonList.vue
index c5801f0..2fcc6c7 100644
--- a/src/views/admin/meeting/ReservationPersonList.vue
+++ b/src/views/admin/meeting/ReservationPersonList.vue
@@ -4,8 +4,13 @@
-
-
+
+
+
+
+
+
+
@@ -14,13 +19,13 @@
-
-
+
+
-
-
+
+
@@ -59,7 +64,7 @@
diff --git a/src/views/admin/meeting/modules/ReservationPersonModal.vue b/src/views/admin/meeting/modules/ReservationPersonModal.vue
index ee91e3d..6447825 100644
--- a/src/views/admin/meeting/modules/ReservationPersonModal.vue
+++ b/src/views/admin/meeting/modules/ReservationPersonModal.vue
@@ -14,17 +14,20 @@
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
@@ -68,7 +71,7 @@
this.mdl = Object.assign(record)
this.visible = true
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.mdl, 'id', 'userId', 'reservationId', 'name', 'phone', 'joinTime'))
+ this.form.setFieldsValue(pick(this.mdl, 'id', 'userId', 'participantId', 'status', 'joinTime', 'reservationId', 'participantName', 'participantPhone'))
})
},
handleSubmit (e) {
diff --git a/src/views/admin/meeting/modules/RoomContentModal.vue b/src/views/admin/meeting/modules/RoomContentModal.vue
index b0c1577..2684a82 100644
--- a/src/views/admin/meeting/modules/RoomContentModal.vue
+++ b/src/views/admin/meeting/modules/RoomContentModal.vue
@@ -2,71 +2,261 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 会议室
+
+
+ 路演厅
+
+
+ 数仓
+
+
+ 数纽
+
+
+ 洽谈室
+
+
+ 直播间
+
+
+ 茶室
+
+
+
+
+
+
+
+
+ {{ item.floorName }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 围桌式
+
+
+ 课桌式
+
+
+ 长方形
+
+
+ U形
+
+
+ 鱼骨形
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+
+
+ 否
+
+
+
+
+
+
+
+
+
+
+ 是
+
+
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+
+
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/admin/meeting/modules/RoomServeModal.vue b/src/views/admin/meeting/modules/RoomServeModal.vue
index 280c7ff..c534d8d 100644
--- a/src/views/admin/meeting/modules/RoomServeModal.vue
+++ b/src/views/admin/meeting/modules/RoomServeModal.vue
@@ -20,8 +20,7 @@
免费服务
- 会务服务
- 其他服务
+ 增值服务