From a6d047e106c00a32603ed9c037a1e27b7f75ee6b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 17 三月 2025 18:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/meeting/bookings.vue | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index b523871..5d9ee9b 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -76,17 +76,21 @@
<span class="long-title-style">{{ row.name }}</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="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>
<template slot-scope="{ row }">
<span class="long-title-style">{{ row.roomName }}</span>
</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 }">
<span v-if="row.meetingStatus == 1">鏈紑濮�</span>
@@ -97,7 +101,6 @@
<!-- {{ 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([
--
Gitblit v1.9.3