From 92e2f86210ebaca3f0b4af21c64d22cc91dffba4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 01 四月 2025 09:14:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/meeting/bookings.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index 6912d39..6f7de89 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -108,9 +108,9 @@
               <el-button type="text"
                 v-if="row.hasRole ==1 && (row.meetingStatus == '1' || row.meetingStatus == '4')"
                 @click="handleStart(row)">寮�濮�</el-button>
-              <el-button type="text" v-if=" row.hasRole ==1&& row.meetingStatus == '2'"
+              <el-button type="text" v-if=" row.hasRole ==1 && [2, 0].includes(row.meetingStatus)"
                 @click="handleEnd(row)">缁撴潫</el-button>
-              <el-button v-if="row.hasRole ==1 && (row.meetingStatus == '1' || row.meetingStatus == '4')" type="text" @click="cancelMeeting(row.id)">鎾ゅ洖</el-button>
+              <el-button v-if="row.hasRole ==1 && [1, 4].includes(row.meetingStatus)" type="text" @click="cancelMeeting(row.id)">鎾ゅ洖</el-button>
               <el-button  type="text" @click="deleteById(row)" class="red" v-permissions="['business:bookings:delete']">鍒犻櫎</el-button>
             </template>
           </template>

--
Gitblit v1.9.3