From ccf69ee82f77a2e67a565cec02f95e64324a283f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 15 五月 2024 09:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/meeting/rooms.vue |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/admin/src/views/meeting/rooms.vue b/admin/src/views/meeting/rooms.vue
index a8ef660..b29a7c0 100644
--- a/admin/src/views/meeting/rooms.vue
+++ b/admin/src/views/meeting/rooms.vue
@@ -11,13 +11,14 @@
           filterable
           clearable
           multiple
+          style="width: 250px"
           placeholder="閫夋嫨閮ㄩ棬鎴愬憳"
         >
           <el-option
             v-for="item in userList"
             :key="item.id"
             :value="item.id"
-            :label="item.department?`${item.department.name}-${item.realname}`:item.realname"
+            :label="item.companyId?`${item.companyName}-${item.companyName}`:item.realname"
             ></el-option>
             <!-- :label="`${item.department.name}-${item.realname}`" -->
           <!-- <el-option :key="1" :value="1" label="绂佺敤" /> -->
@@ -84,8 +85,8 @@
           </template>
         </el-table-column>
         <el-table-column prop="createDate" label="鍒涘缓鏃堕棿"  align="center" min-width="140px"></el-table-column>
+        <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="140px"></el-table-column>
         <!-- <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
-        <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
         <el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
         <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
         <el-table-column prop="imgurl" label="浼氳瀹ゅ浘鐗�" min-width="100px"></el-table-column>

--
Gitblit v1.9.3