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 | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/admin/src/views/meeting/rooms.vue b/admin/src/views/meeting/rooms.vue
index 166f5e0..2dd7299 100644
--- a/admin/src/views/meeting/rooms.vue
+++ b/admin/src/views/meeting/rooms.vue
@@ -5,24 +5,25 @@
<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
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.realname}-${item.companyName}`:item.realname"
></el-option>
- <!-- :label="`${item.department.name}-${item.realname}`" -->
- <!-- <el-option :key="1" :value="1" label="绂佺敤" /> -->
+ <!– :label="`${item.department.name}-${item.realname}`" –>
+ <!– <el-option :key="1" :value="1" label="绂佺敤" /> –>
</el-select>
- </el-form-item>
+ </el-form-item>-->
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -37,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>
@@ -67,7 +73,7 @@
</el-table-column>
<el-table-column prop="limitNum" label="鍙�夋湇鍔￠」" align="center" min-width="140px" show-overflow-tooltip>
<template slot-scope="{row}">
- <div class="long-title-style">{{ row.projectList.map(item => item.projectName).join('|') }}</div>
+ <div class="long-title-style">{{ row.projectList.map(item => item.projectName).join(' | ') }}</div>
</template>
</el-table-column>
@@ -83,9 +89,9 @@
></el-switch>
</template>
</el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" 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="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>
@@ -120,9 +126,9 @@
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 '@/views/meeting/api/rooms'
+import { updateStatusById } from '@/api/meeting/rooms'
export default {
name: 'Rooms',
extends: BaseTable,
@@ -151,7 +157,7 @@
}
}
},
- provide() {
+ provide () {
return {
userList: () => this.userList
}
@@ -159,31 +165,27 @@
created () {
this.config({
module: '浼氳瀹や俊鎭〃',
- api: '@/views/meeting/api/rooms',
+ api: '/meeting/rooms',
'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()
},
methods: {
- // 椤电爜鍙樻洿澶勭悊
+ // 椤电爜鍙樻洿澶勭悊
handlePageChange (pageIndex) {
this.__checkApi()
this.tableData.pagination.pageIndex = pageIndex || this.tableData.pagination.pageIndex
this.isWorking.search = true
let sysList = [...this.searchForm.sysList]
sysList = sysList.map(item => {
- return {userId: item}
+ return { userId: item }
})
- console.log(sysList);
+ console.log(sysList)
this.api.fetchList({
page: this.tableData.pagination.pageIndex,
capacity: this.tableData.pagination.pageSize,
@@ -198,7 +200,7 @@
this.tableData.pagination.total = data.total
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking.search = false
@@ -208,23 +210,21 @@
// console.log('21212');
// this.$refs.selectMember.open('閫夋嫨绠＄悊鍛�')
// },
- changeStatus(item) {
+ changeStatus (item) {
updateStatusById({
id: item.id,
status: item.status
})
.then(() => {
this.$message.success('淇敼鎴愬姛')
-
})
.catch(e => {
- this.$message.error(e)
})
.finally(() => {
this.handlePageChange()
})
}
- },
+ }
}
</script>
--
Gitblit v1.9.3