From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/meeting/bookings.vue | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index e9e45a1..ffc3d68 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -66,7 +66,7 @@
@click="exportExcel">瀵煎嚭</el-button>
</li>
</ul>
- <el-table v-loading="isWorking.search" :data="tableData.list" stripe border
+ <el-table v-loading="isWorking.search" :data="tableData.list" stripe
@selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" align="center" width="55"></el-table-column> -->
<el-table-column prop="name" label="浼氳涓婚" align="center" min-width="120px" show-overflow-tooltip>
@@ -98,7 +98,7 @@
'business:bookings:update',
'business:bookings:delete',
])
- " label="鎿嶄綔" min-width="100" align="center" fixed="right">
+ " label="鎿嶄綔" min-width="140" align="center" fixed="right">
<template slot-scope="{ row }">
<template>
<el-button type="text" @click="$refs.operaBookingsDetailWindow.open('浼氳璇︽儏', row)">鏌ョ湅璇︽儏</el-button>
@@ -106,6 +106,7 @@
@click="$refs.operaBookingsWindow.open('缂栬緫浼氳棰勭害', row)"
v-permissions="['business:bookings:update']">缂栬緫</el-button>
<el-button type="text" v-if="row.meetingStatus == '1'" @click="handleStart(row)">寮�濮�</el-button>
+ <el-button type="text" v-if="row.meetingStatus == '2'" @click="handleEnd(row)">缁撴潫</el-button>
<el-button v-if="row.meetingStatus == '1'" type="text" @click="cancelMeeting(row.id)"
v-permissions="['business:bookings:update']">鎾ゅ洖</el-button>
</template>
@@ -132,7 +133,7 @@
import { findList } from '@/api/meeting/rooms'
import { getSystemDictData } from '@/api/system/dictData'
import { fetchList } from '@/api/business/company'
-import { cancelById, bookingsDetail, startEarlyById, startById } from '@/api/meeting/bookings'
+import { cancelById, bookingsDetail, startEarlyById, startById, meetingEndById } from '@/api/meeting/bookings'
import { timeForMat } from '@/utils/util'
export default {
name: 'Bookings',
@@ -276,6 +277,18 @@
})
})
},
+ handleEnd(row) {
+ this.$dialog.messageWaring('缁撴潫浼氳', '鏄惁缁撴潫褰撳墠浼氳锛�')
+ .then(() => {
+ meetingEndById({ id: row.id })
+ .then(() => {
+ this.$message.success('浼氳宸茬粨鏉�')
+ this.handlePageChange()
+ })
+ .catch(e => {
+ })
+ })
+ },
cancelMeeting(id) {
this.$dialog.messageWaring('鍙栨秷浼氳', '鏄惁鍙栨秷褰撳墠浼氳锛�')
.then(() => {
--
Gitblit v1.9.3