提交 1c42a605 authored 作者: pengxiaohui's avatar pengxiaohui

修改腾讯账号列表不出现滚动条bug

上级 94eec31e
...@@ -28,25 +28,27 @@ ...@@ -28,25 +28,27 @@
<div class="delete-bar"> <div class="delete-bar">
<i class="el-icon-warning"></i> 已选择 <span class="num">{{selection.length || 0}}</span><el-button type="text" size="m" :disabled="!selection.length" @click="handleDelete('')" style="margin-left:15px;">删除</el-button> <i class="el-icon-warning"></i> 已选择 <span class="num">{{selection.length || 0}}</span><el-button type="text" size="m" :disabled="!selection.length" @click="handleDelete('')" style="margin-left:15px;">删除</el-button>
</div> </div>
<el-table :data="listData" style="width: 100%;flex:1;" v-loading="loading" @selection-change="handleSelectionChange"> <div class="table-container">
<el-table-column type="selection" width="45" /> <el-table :data="listData" style="width: 100%;" height="100%" v-loading="loading" @selection-change="handleSelectionChange">
<el-table-column prop="username" label="姓名" min-width="120" /> <el-table-column type="selection" width="45" />
<el-table-column prop="phone" label="手机号码" min-width="80"/> <el-table-column prop="username" label="姓名" min-width="120" />
<el-table-column prop="email" label="邮箱" min-width="140"/> <el-table-column prop="phone" label="手机号码" min-width="80"/>
<el-table-column prop="userid" label="用户ID" min-width="120"/> <el-table-column prop="email" label="邮箱" min-width="140"/>
<el-table-column label="用户类型" min-width="80"> <el-table-column prop="userid" label="用户ID" min-width="120"/>
<template slot-scope="{ row }"> <el-table-column label="用户类型" min-width="80">
<span v-if="row.type === 2">普通用户</span> <template slot-scope="{ row }">
<span v-else>虚拟会议室</span> <span v-if="row.type === 2">普通用户</span>
</template> <span v-else>虚拟会议室</span>
</el-table-column> </template>
<el-table-column label="操作" min-width="80" v-if="isSuperAdmin"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="操作" min-width="80" v-if="isSuperAdmin">
<el-button type="text" size="small" @click="handleEdit(scope.row)">编辑</el-button> <template slot-scope="scope">
<el-button type="text" size="small" @click="handleDelete(scope.row.userid)">删除</el-button> <el-button type="text" size="small" @click="handleEdit(scope.row)">编辑</el-button>
</template> <el-button type="text" size="small" @click="handleDelete(scope.row.userid)">删除</el-button>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<div class="footer-bar"> <div class="footer-bar">
<el-pagination :current-page.sync="curPage" :page-size.sync="pageSize" :page-sizes="[10, 20, 50, 100]" layout="total, prev, pager, next, sizes, jumper" :total="total" @current-change="pageChange" @size-change="pageChange" style="text-align:right;"></el-pagination> <el-pagination :current-page.sync="curPage" :page-size.sync="pageSize" :page-sizes="[10, 20, 50, 100]" layout="total, prev, pager, next, sizes, jumper" :total="total" @current-change="pageChange" @size-change="pageChange" style="text-align:right;"></el-pagination>
</div> </div>
...@@ -306,6 +308,9 @@ h5{ ...@@ -306,6 +308,9 @@ h5{
display:flex; display:flex;
flex-direction:column; flex-direction:column;
} }
.table-container{
flex:1;
}
.search-filter{ .search-filter{
display:flex; display:flex;
flex-wrap: wrap; flex-wrap: wrap;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论