From 7b51c9e1abc198a501f7858599da9c116130fd6f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 三月 2025 16:47:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/meeting/bookings.vue | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index 674d968..6912d39 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 }">
--
Gitblit v1.9.3