|
|
@@ -22,21 +22,24 @@
|
|
|
<el-col :lg="20" :xs="24">
|
|
|
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
|
|
|
<div v-show="showSearch" class="mb-[10px]">
|
|
|
- <el-card shadow="hover">
|
|
|
+ <el-card shadow="hover" :style="{ marginTop: '10px', height: '60px' }">
|
|
|
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
|
|
|
- <el-form-item label="用户名称" prop="userName">
|
|
|
- <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
|
|
|
+ <el-form-item label="" prop="userName">
|
|
|
+ <el-input v-model="queryParams.userName" placeholder="请输入用户名称" style="width: 120px" clearable
|
|
|
+ @keyup.enter="handleQuery"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="手机号码" prop="phonenumber">
|
|
|
- <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
|
|
|
+ <el-form-item label="" prop="phonenumber">
|
|
|
+ <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" style="width: 120px" clearable
|
|
|
+ @keyup.enter="handleQuery"/>
|
|
|
</el-form-item>
|
|
|
|
|
|
- <el-form-item label="状态" prop="status">
|
|
|
- <el-select v-model="queryParams.status" placeholder="用户状态" clearable>
|
|
|
- <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
|
|
|
+ <el-form-item label="" prop="status">
|
|
|
+ <el-select v-model="queryParams.status" placeholder="用户状态" style="width: 120px" clearable>
|
|
|
+ <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
|
|
|
+ :value="dict.value"/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="创建时间" style="width: 308px">
|
|
|
+ <el-form-item label="" style="width: 308px">
|
|
|
<el-date-picker
|
|
|
v-model="dateRange"
|
|
|
value-format="YYYY-MM-DD HH:mm:ss"
|
|
|
@@ -50,6 +53,33 @@
|
|
|
<el-form-item>
|
|
|
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
|
|
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
|
|
+ <el-button v-has-permi="['system:user:add']" type="primary" plain icon="Plus" @click="handleAdd()">
|
|
|
+ 新增
|
|
|
+ </el-button>
|
|
|
+ <el-button v-has-permi="['system:user:add']" type="success" plain :disabled="single" icon="Edit"
|
|
|
+ @click="handleUpdate()">
|
|
|
+ 修改
|
|
|
+ </el-button>
|
|
|
+ <el-button v-has-permi="['system:user:delete']" type="danger" plain :disabled="multiple" icon="Delete"
|
|
|
+ @click="handleDelete()">
|
|
|
+ 删除
|
|
|
+ </el-button>
|
|
|
+ <el-dropdown class="mt-[1px]" style="margin-left: 10px">
|
|
|
+ <el-button plain type="info">
|
|
|
+ 更多
|
|
|
+ <el-icon class="el-icon--right">
|
|
|
+ <arrow-down/>
|
|
|
+ </el-icon
|
|
|
+ >
|
|
|
+ </el-button>
|
|
|
+ <template #dropdown>
|
|
|
+ <el-dropdown-menu>
|
|
|
+ <el-dropdown-item icon="Download" @click="importTemplate">下载模板</el-dropdown-item>
|
|
|
+ <el-dropdown-item icon="Top" @click="handleImport"> 导入数据</el-dropdown-item>
|
|
|
+ <el-dropdown-item icon="Download" @click="handleExport"> 导出数据</el-dropdown-item>
|
|
|
+ </el-dropdown-menu>
|
|
|
+ </template>
|
|
|
+ </el-dropdown>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
</el-card>
|
|
|
@@ -57,79 +87,71 @@
|
|
|
</transition>
|
|
|
|
|
|
<el-card shadow="hover">
|
|
|
- <template #header>
|
|
|
- <el-row :gutter="10">
|
|
|
- <el-col :span="1.5">
|
|
|
- <el-button v-has-permi="['system:user:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
|
|
|
- </el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
- <el-button v-has-permi="['system:user:add']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()">
|
|
|
- 修改
|
|
|
- </el-button>
|
|
|
- </el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
- <el-button v-has-permi="['system:user:delete']" type="danger" plain :disabled="multiple" icon="Delete" @click="handleDelete()">
|
|
|
- 删除
|
|
|
- </el-button>
|
|
|
- </el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
- <el-dropdown class="mt-[1px]">
|
|
|
- <el-button plain type="info">
|
|
|
- 更多
|
|
|
- <el-icon class="el-icon--right"><arrow-down /></el-icon
|
|
|
- ></el-button>
|
|
|
- <template #dropdown>
|
|
|
- <el-dropdown-menu>
|
|
|
- <el-dropdown-item icon="Download" @click="importTemplate">下载模板</el-dropdown-item>
|
|
|
- <el-dropdown-item icon="Top" @click="handleImport"> 导入数据</el-dropdown-item>
|
|
|
- <el-dropdown-item icon="Download" @click="handleExport"> 导出数据</el-dropdown-item>
|
|
|
- </el-dropdown-menu>
|
|
|
- </template>
|
|
|
- </el-dropdown>
|
|
|
- </el-col>
|
|
|
- <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @query-table="getList"></right-toolbar>
|
|
|
- </el-row>
|
|
|
- </template>
|
|
|
-
|
|
|
- <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
|
|
|
- <el-table-column type="selection" width="50" align="center" />
|
|
|
- <el-table-column v-if="columns[0].visible" key="userId" label="用户编号" align="center" prop="userId" />
|
|
|
- <el-table-column v-if="columns[1].visible" key="userName" label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" />
|
|
|
- <el-table-column v-if="columns[2].visible" key="nickName" label="用户昵称" align="center" prop="nickName" :show-overflow-tooltip="true" />
|
|
|
- <el-table-column v-if="columns[3].visible" key="deptName" label="部门" align="center" prop="deptName" :show-overflow-tooltip="true" />
|
|
|
- <el-table-column v-if="columns[4].visible" key="phonenumber" label="手机号码" align="center" prop="phonenumber" width="120" />
|
|
|
- <el-table-column v-if="columns[5].visible" key="status" label="状态" align="center">
|
|
|
- <template #default="scope">
|
|
|
- <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
-
|
|
|
- <el-table-column v-if="columns[6].visible" label="创建时间" align="center" prop="createTime" width="160">
|
|
|
- <template #default="scope">
|
|
|
- <span>{{ scope.row.createTime }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
-
|
|
|
- <el-table-column label="操作" fixed="right" width="180" class-name="small-padding fixed-width">
|
|
|
- <template #default="scope">
|
|
|
- <el-tooltip v-if="scope.row.userId !== 1" content="修改" placement="top">
|
|
|
- <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
|
|
|
- </el-tooltip>
|
|
|
- <el-tooltip v-if="scope.row.userId !== 1" content="删除" placement="top">
|
|
|
- <el-button v-hasPermi="['system:user:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
|
|
|
- </el-tooltip>
|
|
|
-
|
|
|
- <el-tooltip v-if="scope.row.userId !== 1" content="重置密码" placement="top">
|
|
|
- <el-button v-hasPermi="['system:user:resetPwd']" link type="primary" icon="Key" @click="handleResetPwd(scope.row)"></el-button>
|
|
|
- </el-tooltip>
|
|
|
-
|
|
|
- <el-tooltip v-if="scope.row.userId !== 1" content="分配角色" placement="top">
|
|
|
- <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)"></el-button>
|
|
|
- </el-tooltip>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
-
|
|
|
+ <!-- <template #header>
|
|
|
+ <el-row :gutter="10">
|
|
|
+ <el-col :span="1.5">
|
|
|
+
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+
|
|
|
+ </el-col>
|
|
|
+ <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @query-table="getList"></right-toolbar>
|
|
|
+ </el-row>
|
|
|
+ </template>-->
|
|
|
+
|
|
|
+ <div class="table-content">
|
|
|
+ <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
|
|
|
+ <el-table-column type="selection" width="50" align="center"/>
|
|
|
+ <el-table-column v-if="columns[0].visible" key="userId" label="用户编号" align="center" prop="userId"/>
|
|
|
+ <el-table-column v-if="columns[1].visible" key="userName" label="用户名称" align="center" prop="userName"
|
|
|
+ :show-overflow-tooltip="true"/>
|
|
|
+ <el-table-column v-if="columns[2].visible" key="nickName" label="用户昵称" align="center" prop="nickName"
|
|
|
+ :show-overflow-tooltip="true"/>
|
|
|
+ <el-table-column v-if="columns[3].visible" key="deptName" label="部门" align="center" prop="deptName"
|
|
|
+ :show-overflow-tooltip="true"/>
|
|
|
+ <el-table-column v-if="columns[4].visible" key="phonenumber" label="手机号码" align="center"
|
|
|
+ prop="phonenumber" width="120"/>
|
|
|
+ <el-table-column v-if="columns[5].visible" key="status" label="状态" align="center">
|
|
|
+ <template #default="scope">
|
|
|
+ <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
|
|
|
+ @change="handleStatusChange(scope.row)"></el-switch>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
+ <el-table-column v-if="columns[6].visible" label="创建时间" align="center" prop="createTime" width="160">
|
|
|
+ <template #default="scope">
|
|
|
+ <span>{{ scope.row.createTime }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
+ <el-table-column label="操作" fixed="right" width="180" class-name="small-padding fixed-width">
|
|
|
+ <template #default="scope">
|
|
|
+ <el-tooltip v-if="scope.row.userId !== 1" content="修改" placement="top">
|
|
|
+ <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
|
|
|
+ </el-tooltip>
|
|
|
+ <el-tooltip v-if="scope.row.userId !== 1" content="删除" placement="top">
|
|
|
+ <el-button v-hasPermi="['system:user:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
|
|
|
+ </el-tooltip>
|
|
|
+
|
|
|
+ <el-tooltip v-if="scope.row.userId !== 1" content="重置密码" placement="top">
|
|
|
+ <el-button v-hasPermi="['system:user:resetPwd']" link type="primary" icon="Key"
|
|
|
+ @click="handleResetPwd(scope.row)"></el-button>
|
|
|
+ </el-tooltip>
|
|
|
+
|
|
|
+ <el-tooltip v-if="scope.row.userId !== 1" content="分配角色" placement="top">
|
|
|
+ <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="CircleCheck"
|
|
|
+ @click="handleAuthRole(scope.row)"></el-button>
|
|
|
+ </el-tooltip>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
<pagination
|
|
|
v-show="total > 0"
|
|
|
v-model:page="queryParams.pageNum"
|
|
|
@@ -142,7 +164,7 @@
|
|
|
</el-row>
|
|
|
|
|
|
<!-- 添加或修改用户配置对话框 -->
|
|
|
- <el-dialog ref="formDialogRef" v-model="dialog.visible" :title="dialog.title" width="600px" append-to-body @close="closeDialog">
|
|
|
+ <el-dialog ref="formDialogRef" v-model="dialog.visible" :title="dialog.title" width="700px" append-to-body @close="closeDialog">
|
|
|
<el-form ref="userFormRef" :model="form" :rules="rules" label-width="80px">
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
@@ -286,18 +308,18 @@
|
|
|
|
|
|
<script setup name="User" lang="ts">
|
|
|
import api from '@/api/system/user';
|
|
|
-import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
|
|
|
-import { DeptVO } from '@/api/system/dept/types';
|
|
|
-import { RoleVO } from '@/api/system/role/types';
|
|
|
-import { PostQuery, PostVO } from '@/api/system/post/types';
|
|
|
-import { treeselect } from '@/api/system/dept';
|
|
|
-import { globalHeaders } from '@/utils/request';
|
|
|
-import { to } from 'await-to-js';
|
|
|
-import { optionselect } from '@/api/system/post';
|
|
|
+import {UserForm, UserQuery, UserVO} from '@/api/system/user/types';
|
|
|
+import {DeptVO} from '@/api/system/dept/types';
|
|
|
+import {RoleVO} from '@/api/system/role/types';
|
|
|
+import {PostVO} from '@/api/system/post/types';
|
|
|
+import {treeselect} from '@/api/system/dept';
|
|
|
+import {globalHeaders} from '@/utils/request';
|
|
|
+import {to} from 'await-to-js';
|
|
|
+import {optionselect} from '@/api/system/post';
|
|
|
|
|
|
const router = useRouter();
|
|
|
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
|
|
-const { sys_normal_disable, sys_user_sex } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_sex'));
|
|
|
+const {proxy} = getCurrentInstance() as ComponentInternalInstance;
|
|
|
+const {sys_normal_disable, sys_user_sex} = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_sex'));
|
|
|
const userList = ref<UserVO[]>();
|
|
|
const loading = ref(true);
|
|
|
const showSearch = ref(true);
|
