From 39ba02bed8a5d577957910f32cfa3e59568ffa20 Mon Sep 17 00:00:00 2001 From: chendaze <1824191732@qq.com> Date: Sat, 9 Mar 2024 15:48:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E7=9A=84=E9=A1=B5=E9=9D=A2=E5=92=8C?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=A1=B5=E9=9D=A2=E5=92=8C=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/admin/meeting/ticket.js | 9 + src/views/admin/meeting/EquipmentList.vue | 36 +-- src/views/admin/meeting/RoomServeList.vue | 11 +- src/views/admin/meeting/TicketList.vue | 74 ++--- .../admin/meeting/modules/EquipmentModal.vue | 77 ++++- .../meeting/modules/RoomContentModal.vue | 4 +- .../admin/meeting/modules/RoomServeModal.vue | 22 +- .../admin/meeting/modules/TicketModal.vue | 292 +++++++++++++++--- 8 files changed, 389 insertions(+), 136 deletions(-) diff --git a/src/api/admin/meeting/ticket.js b/src/api/admin/meeting/ticket.js index dfbb1d8..1b1945d 100644 --- a/src/api/admin/meeting/ticket.js +++ b/src/api/admin/meeting/ticket.js @@ -12,6 +12,15 @@ export function getTicketList (parameter) { }) } +export function getTicketByCompany () { + return axios({ + url: api.ticket + '/getTicketByCompany', + method: 'get', + }) +} + + + export function saveTicket (parameter) { return axios({ url: api.ticket + (parameter.id > 0 ? '/update' : '/save'), diff --git a/src/views/admin/meeting/EquipmentList.vue b/src/views/admin/meeting/EquipmentList.vue index 89c497d..a3e4dbe 100644 --- a/src/views/admin/meeting/EquipmentList.vue +++ b/src/views/admin/meeting/EquipmentList.vue @@ -14,8 +14,8 @@ - - + + @@ -83,30 +83,30 @@ export default { // 表头 columns: [ { - title: '设备分类', - dataIndex: 'type' + title: '设备编码', + dataIndex: 'equipmentNum' }, { title: '设备名称', dataIndex: 'equipmentName' }, { - title: '设备状态 0在线 1损坏 2离线', + title: '设备类型', + dataIndex: 'type' + }, + { + title: '设备ip', + dataIndex: 'ip' + }, + { + title: '存放地点', + dataIndex: 'roomName' + }, + { + title: '设备状态', dataIndex: 'status' }, - { - title: '创建时间', - dataIndex: 'createDate', - sorter: true - }, - { - title: '设备编号', - dataIndex: 'equipmentNum' - }, - { - title: '设备图片', - dataIndex: 'pic' - }, + { title: '操作', width: '200px', diff --git a/src/views/admin/meeting/RoomServeList.vue b/src/views/admin/meeting/RoomServeList.vue index 0a1f1f4..e983ed5 100644 --- a/src/views/admin/meeting/RoomServeList.vue +++ b/src/views/admin/meeting/RoomServeList.vue @@ -9,8 +9,11 @@ - - + + + 免费服务 + 增值服务 + @@ -93,8 +96,8 @@ export default { scopedSlots: { customRender: 'serveType' } }, { - title: '服务时间30分钟起步', - dataIndex: 'serveTime' + title: '金额描述', + dataIndex: 'money' }, { title: '备注', diff --git a/src/views/admin/meeting/TicketList.vue b/src/views/admin/meeting/TicketList.vue index ed29122..9b28c05 100644 --- a/src/views/admin/meeting/TicketList.vue +++ b/src/views/admin/meeting/TicketList.vue @@ -8,31 +8,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - 查询 @@ -56,6 +31,13 @@ :columns='columns' :data='loadData' > + + 抵用劵 + 优惠劵 + + + + 编辑 @@ -69,7 +51,7 @@