From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007

---
 admin/src/views/meeting/rooms.vue |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/admin/src/views/meeting/rooms.vue b/admin/src/views/meeting/rooms.vue
index c2f1e3c..2dd7299 100644
--- a/admin/src/views/meeting/rooms.vue
+++ b/admin/src/views/meeting/rooms.vue
@@ -5,7 +5,7 @@
       <el-form-item label="浼氳瀹ゅ悕绉�" prop="name">
         <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
       </el-form-item>
-      <el-form-item label="绠＄悊鍛�" prop="sysList">
+<!--      <el-form-item label="绠＄悊鍛�" prop="sysList">
         <el-select
           v-model="searchForm.sysList"
           filterable
@@ -18,12 +18,12 @@
             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="绂佺敤" /> -->
+            &lt;!&ndash; :label="`${item.department.name}-${item.realname}`" &ndash;&gt;
+          &lt;!&ndash; <el-option :key="1" :value="1" label="绂佺敤" /> &ndash;&gt;
         </el-select>
-      </el-form-item>
+      </el-form-item>-->
 
       <section>
         <el-button type="primary" @click="search">鎼滅储</el-button>
@@ -38,13 +38,18 @@
         <!-- <li><el-button @click="deleteByIdInBatch" v-permissions="['business:rooms:delete']">鍒犻櫎</el-button></li> -->
       </ul>
       <el-table
+          :height="tableHeightNew"
         v-loading="isWorking.search"
         :data="tableData.list"
         stripe
-        border
         @selection-change="handleSelectionChange"
       >
         <!-- <el-table-column type="selection" width="55"></el-table-column> -->
+        <el-table-column prop="id" label="鍞竴鏍囪瘑" align="center" min-width="80px" show-overflow-tooltip>
+          <template slot-scope="{row}">
+            <span class="long-title-style">{{ row.id }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="name" label="浼氳瀹ゅ悕绉�" align="center" min-width="120px" show-overflow-tooltip>
           <template slot-scope="{row}">
             <span class="long-title-style">{{ row.name }}</span>
@@ -84,8 +89,8 @@
             ></el-switch>
           </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="createDate" label="鍒涘缓鏃堕棿"  align="center" min-width="160px"></el-table-column>
+        <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="160px"></el-table-column>
         <!-- <el-table-column prop="editor" 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>
@@ -121,7 +126,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 {
@@ -164,14 +169,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()
   },
@@ -200,7 +200,7 @@
           this.tableData.pagination.total = data.total
         })
         .catch(e => {
-          this.$tip.apiFailed(e)
+          // this.$tip.apiFailed(e)
         })
         .finally(() => {
           this.isWorking.search = false

--
Gitblit v1.9.3