From c3aaf28f7316cce12eec007a9f85a96cbcddeec2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 10:34:20 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/meeting/bookings.vue | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index ec94c98..6f7de89 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -76,30 +76,24 @@
<span class="long-title-style">{{ row.name }}</span>
</template>
</el-table-column>
- <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="160px"></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="managerInfo" 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="roomName" label="浼氳瀹ゅ悕绉�" align="center" min-width="120px" show-overflow-tooltip>
+ <el-table-column prop="roomName" label="浼氳瀹�" align="center" min-width="120px" show-overflow-tooltip>
<template slot-scope="{ row }">
<span class="long-title-style">{{ row.roomName }}</span>
</template>
</el-table-column>
- <el-table-column prop="roomName" label="浼氳鐘舵��" align="center" min-width="120px" show-overflow-tooltip>
+ <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="120px"></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 }">
- <span v-if="row.meetingStatus == 1" class="long-title-style">鏈紑濮�</span>
- <span v-if="row.meetingStatus == 2" class="long-title-style">杩涜涓�</span>
- <span v-if="row.meetingStatus == 3" class="long-title-style">宸茬粨鏉�</span>
- <span v-if="row.meetingStatus == 4" class="long-title-style">鍗冲皢寮�濮�</span>
- <span v-if="row.meetingStatus == 5" class="long-title-style">宸叉挙閿�</span>
+ <span v-if="row.meetingStatus == 1">鏈紑濮�</span>
+ <span v-if="row.meetingStatus == 2">杩涜涓�</span>
+ <span v-if="row.meetingStatus == 3">宸茬粨鏉�</span>
+ <span v-if="row.meetingStatus == 4">鍗冲皢寮�濮�</span>
+ <span v-if="row.meetingStatus == 5">宸叉挙閿�</span>
+ <!-- {{ row.status==0 ? '姝ｅ父' : '鍙栨秷' }} -->
</template>
</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([
@@ -114,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