|
|
@@ -12,28 +12,28 @@
|
|
|
@get-table-data="onSearchCommit"
|
|
|
@reset-form="onResetForm"
|
|
|
/>
|
|
|
- <div class="content-wrapper">
|
|
|
- <div v-permission="PERM_USER.ACCOUNT_MANAGE">
|
|
|
- <el-button type="primary" @click="openAddSingleDrawer">
|
|
|
- <template #icon>
|
|
|
- <el-icon>
|
|
|
- <Plus />
|
|
|
- </el-icon>
|
|
|
- </template>
|
|
|
- 添加用户
|
|
|
- </el-button>
|
|
|
-
|
|
|
- <el-button color="#1890FF" @click="openAddMultipleDrawer" style="margin-left: 18px" plain>
|
|
|
- <template #icon>
|
|
|
- <el-icon>
|
|
|
- <DocumentAdd />
|
|
|
- </el-icon>
|
|
|
- </template>
|
|
|
- 批量导入
|
|
|
- </el-button>
|
|
|
- </div>
|
|
|
+ <div v-permission="PERM_USER.ACCOUNT_MANAGE" class="toolbar">
|
|
|
+ <el-button type="primary" @click="openAddSingleDrawer">
|
|
|
+ <template #icon>
|
|
|
+ <el-icon>
|
|
|
+ <Plus />
|
|
|
+ </el-icon>
|
|
|
+ </template>
|
|
|
+ 添加用户
|
|
|
+ </el-button>
|
|
|
+
|
|
|
+ <el-button color="#1890FF" @click="openAddMultipleDrawer" style="margin-left: 18px" plain>
|
|
|
+ <template #icon>
|
|
|
+ <el-icon>
|
|
|
+ <DocumentAdd />
|
|
|
+ </el-icon>
|
|
|
+ </template>
|
|
|
+ 批量导入
|
|
|
+ </el-button>
|
|
|
+ </div>
|
|
|
|
|
|
- <el-table :data="userList" row-key="id" style="margin-top: 10px">
|
|
|
+ <div class="table-wrapper">
|
|
|
+ <el-table :data="userList" row-key="id" height="100%">
|
|
|
<el-table-column label="工号" prop="staffNo" width="200">
|
|
|
<template #default="scope">
|
|
|
<div>
|
|
|
@@ -61,7 +61,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="姓名" prop="realname" width="200" />
|
|
|
<el-table-column label="手机" prop="mobile" width="200" />
|
|
|
- <el-table-column label="状态" prop="isDisabled" width="200">
|
|
|
+ <el-table-column label="状态" prop="isDisabled" width="120">
|
|
|
<template #default="scope">
|
|
|
<div>
|
|
|
<el-tag :type="!scope.row.isDisabled ? 'success' : 'danger'">
|
|
|
@@ -70,7 +70,7 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="角色" prop="roleList" width="240">
|
|
|
+ <el-table-column label="角色" prop="roleList">
|
|
|
<template #default="scope">
|
|
|
<div>
|
|
|
{{ tranformRoleList(scope.row.roleList) }}
|
|
|
@@ -90,19 +90,9 @@
|
|
|
<template #default="scope">
|
|
|
<el-space v-if="scope.row.roleType !== RoleTypeEnum.SUPER_ADMIN">
|
|
|
<div class="el-space el-space--horizontal">
|
|
|
- <!-- <div
|
|
|
- class="el-space__item"
|
|
|
- @click="handleEdit(scope.row)"
|
|
|
- v-permission="{ action: [PERM_USER.ACCOUNT_EDIT] }"
|
|
|
- > -->
|
|
|
<div class="el-space__item" @click="handleEdit(scope.row)" v-permission="PERM_USER.ACCOUNT_MANAGE">
|
|
|
<div><img :src="editIcon" class="el-tooltip__trigger" /></div>
|
|
|
</div>
|
|
|
- <!-- <div
|
|
|
- class="el-space__item"
|
|
|
- @click="handleDelete(scope.row)"
|
|
|
- v-permission="{ action: [PERM_USER.ACCOUNT_DELETE] }"
|
|
|
- > -->
|
|
|
<div class="el-space__item" @click="handleDelete(scope.row)" v-permission="PERM_USER.ACCOUNT_MANAGE">
|
|
|
<div><img :src="deleteIcon" class="el-tooltip__trigger" /></div>
|
|
|
</div>
|
|
|
@@ -118,20 +108,20 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
-
|
|
|
- <section class="paginationPosition">
|
|
|
- <el-pagination
|
|
|
- background
|
|
|
- :layout="DEFAULT_PAGINATION_LAYOUT"
|
|
|
- :page-sizes="PAGE_SIZE_CONFIG"
|
|
|
- :total="total"
|
|
|
- v-model:page-size="params.pageSize"
|
|
|
- v-model:current-page="params.pageNumber"
|
|
|
- @change="loadPageData"
|
|
|
- />
|
|
|
- </section>
|
|
|
</div>
|
|
|
|
|
|
+ <section class="paginationPosition">
|
|
|
+ <el-pagination
|
|
|
+ background
|
|
|
+ :layout="DEFAULT_PAGINATION_LAYOUT"
|
|
|
+ :page-sizes="PAGE_SIZE_CONFIG"
|
|
|
+ :total="total"
|
|
|
+ v-model:page-size="params.pageSize"
|
|
|
+ v-model:current-page="params.pageNumber"
|
|
|
+ @change="loadPageData"
|
|
|
+ />
|
|
|
+ </section>
|
|
|
+
|
|
|
<CreateDrawer
|
|
|
ref="createDrawerRef"
|
|
|
:title="drawerTitle"
|
|
|
@@ -346,25 +336,36 @@
|
|
|
<style lang="scss" scoped>
|
|
|
.user-page {
|
|
|
position: relative;
|
|
|
- /* height: calc(100vh - 64px - 12px); */
|
|
|
- background-color: #ffffff;
|
|
|
+ padding: 20px;
|
|
|
+ display: flex;
|
|
|
+ flex-direction: column;
|
|
|
+ height: 100%;
|
|
|
+ overflow: hidden;
|
|
|
}
|
|
|
|
|
|
- .content-wrapper {
|
|
|
- padding: 20px;
|
|
|
- padding-top: 0;
|
|
|
+ .toolbar {
|
|
|
+ margin-bottom: 20px;
|
|
|
+ display: flex;
|
|
|
+ flex-shrink: 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ .table-wrapper {
|
|
|
+ flex: 1;
|
|
|
+ overflow: hidden;
|
|
|
+ min-height: 0;
|
|
|
}
|
|
|
|
|
|
- .user-list {
|
|
|
- padding: 0 21px;
|
|
|
+ .paginationPosition {
|
|
|
+ flex-shrink: 0;
|
|
|
+ margin-top: 20px;
|
|
|
}
|
|
|
|
|
|
.add-popover {
|
|
|
position: absolute;
|
|
|
width: 593px;
|
|
|
height: 435px;
|
|
|
- left: 50%;
|
|
|
- top: 50%;
|
|
|
+ left: 45%;
|
|
|
+ top: 45%;
|
|
|
margin-top: -218px;
|
|
|
margin-left: -297px;
|
|
|
z-index: 99;
|
ai0187