From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007

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

diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index 674d968..6f44d68 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -26,7 +26,7 @@
       <el-form-item label="棰勭害浜�" prop="realName">
         <el-input v-model="searchForm.realName" placeholder="璇疯緭鍏ラ绾︿汉" @keypress.enter.native="search"></el-input>
       </el-form-item>
-      <el-form-item label="浼氳鐘舵��" prop="status">
+      <el-form-item label="浼氳鐘舵��" prop="meetingStatus">
         <el-select v-model="searchForm.meetingStatus" filterable clearable placeholder="璇烽�夋嫨鐘舵��">
           <el-option v-for="item in status" :key="item.id" :value="item.id" :label="item.name" />
         </el-select>
@@ -82,10 +82,6 @@
           </template>
         </el-table-column>
         <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="120px"></el-table-column>
-        <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="120px"></el-table-column>
-        <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="120px"></el-table-column>
-        <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="400px"></el-table-column>
-        <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="300px"></el-table-column>
         <el-table-column prop="managerInfo" label="棰勭害浜�" align="center" min-width="100px"></el-table-column>
         <el-table-column label="浼氳鐘舵��" align="center" min-width="60px">
           <template slot-scope="{ row }">
@@ -97,8 +93,8 @@
             <!-- {{ row.status==0 ? '姝e父' : '鍙栨秷' }} -->
           </template>
         </el-table-column>
+        <el-table-column prop="remark" label="浼氳闇�姹�" align="center" min-width="100px"></el-table-column>
         <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" min-width="150px"></el-table-column>
-        <!-- <el-table-column prop="content" label="浼氳鍐呭" min-width="100px"></el-table-column> -->
         <el-table-column v-if="
           containPermissions([
             'business:bookings:update',
@@ -112,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