From 1465eb9dc666715143d75a6ffcac4312f923e947 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 17 一月 2025 18:05:11 +0800
Subject: [PATCH] 最新版本541200007

---
 admin/src/views/meeting/rooms.vue |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/admin/src/views/meeting/rooms.vue b/admin/src/views/meeting/rooms.vue
index 5380f67..9742cab 100644
--- a/admin/src/views/meeting/rooms.vue
+++ b/admin/src/views/meeting/rooms.vue
@@ -18,7 +18,7 @@
             v-for="item in userList"
             :key="item.id"
             :value="item.id"
-            :label="item.companyId?`${item.companyName}-${item.companyName}`:item.realname"
+            :label="item.companyId?`${item.realname}-${item.companyName}`:item.realname"
             ></el-option>
             <!-- :label="`${item.department.name}-${item.realname}`" -->
           <!-- <el-option :key="1" :value="1" label="绂佺敤" /> -->
@@ -125,7 +125,7 @@
 import TableLayout from '@/layouts/TableLayout'
 import Pagination from '@/components/common/Pagination'
 import OperaRoomsWindow from '@/views/meeting/components/OperaRoomsWindow'
-import { fetchList as userList } from '@/api/system/user'
+import { findAllList as userList } from '@/api/system/user'
 // import selectMember from '@/components/meeting/selectMember'
 import { updateStatusById } from '@/api/meeting/rooms'
 export default {
@@ -168,14 +168,9 @@
       'field.id': 'id',
       'field.main': 'id'
     })
-    userList({
-      page: 1,
-      capacity: 9999,
-      memberType: 2,
-      model: { realname: this.filterText }
-    })
+    userList({ queryParam: this.filterText ,workStatus:0,type:2} )
       .then(res => {
-        this.userList = res.records
+        this.userList = res
       })
     this.search()
   },

--
Gitblit v1.9.3