From b94daf4ea357eafce26f37a1f0a799d55cbfa1a4 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 24 二月 2025 16:38:21 +0800
Subject: [PATCH] ll
---
admin/src/views/meeting/rooms.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/admin/src/views/meeting/rooms.vue b/admin/src/views/meeting/rooms.vue
index 4fbc523..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="绂佺敤" /> -->
@@ -41,10 +41,14 @@
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>
@@ -121,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 {
@@ -164,13 +168,9 @@
'field.id': 'id',
'field.main': 'id'
})
- userList({
- page: 1,
- capacity: 9999,
- model: { realname: this.filterText }
- })
+ userList({ queryParam: this.filterText ,workStatus:0,type:2} )
.then(res => {
- this.userList = res.records
+ this.userList = res
})
this.search()
},
@@ -199,7 +199,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