|
|
@ -1,78 +1,38 @@
|
|
|
|
<template>
|
|
|
|
<template>
|
|
|
|
<div class="app-container">
|
|
|
|
<div class="app-container">
|
|
|
|
<el-row :gutter="20">
|
|
|
|
<el-row :gutter="20">
|
|
|
|
<!--部门数据-->
|
|
|
|
<!--区域数据-->
|
|
|
|
<el-col :span="4" :xs="24">
|
|
|
|
<el-col :span="4" :xs="24">
|
|
|
|
<div class="head-container">
|
|
|
|
<div class="head-container">
|
|
|
|
<el-input
|
|
|
|
<el-input v-model="deptName" placeholder="请输入区域名称进行过滤" clearable size="small" prefix-icon="el-icon-search"
|
|
|
|
v-model="deptName"
|
|
|
|
style="margin-bottom: 20px" />
|
|
|
|
placeholder="请输入部门名称"
|
|
|
|
|
|
|
|
clearable
|
|
|
|
|
|
|
|
size="small"
|
|
|
|
|
|
|
|
prefix-icon="el-icon-search"
|
|
|
|
|
|
|
|
style="margin-bottom: 20px"
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div class="head-container">
|
|
|
|
<div class="head-container">
|
|
|
|
<el-tree
|
|
|
|
<el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
|
|
|
|
:data="deptOptions"
|
|
|
|
:filter-node-method="filterNode" ref="tree" node-key="id" highlight-current @node-click="handleNodeClick" />
|
|
|
|
:props="defaultProps"
|
|
|
|
|
|
|
|
:expand-on-click-node="false"
|
|
|
|
|
|
|
|
:filter-node-method="filterNode"
|
|
|
|
|
|
|
|
ref="tree"
|
|
|
|
|
|
|
|
node-key="id"
|
|
|
|
|
|
|
|
default-expand-all
|
|
|
|
|
|
|
|
highlight-current
|
|
|
|
|
|
|
|
@node-click="handleNodeClick"
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<!--用户数据-->
|
|
|
|
<!--用户数据-->
|
|
|
|
<el-col :span="20" :xs="24">
|
|
|
|
<el-col :span="20" :xs="24">
|
|
|
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
|
|
|
|
|
|
|
|
label-width="68px">
|
|
|
|
<el-form-item label="用户名称" prop="userName">
|
|
|
|
<el-form-item label="用户名称" prop="userName">
|
|
|
|
<el-input
|
|
|
|
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
|
|
|
|
v-model="queryParams.userName"
|
|
|
|
@keyup.enter.native="handleQuery" />
|
|
|
|
placeholder="请输入用户名称"
|
|
|
|
|
|
|
|
clearable
|
|
|
|
|
|
|
|
style="width: 240px"
|
|
|
|
|
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="手机号码" prop="phonenumber">
|
|
|
|
<el-form-item label="手机号码" prop="phonenumber">
|
|
|
|
<el-input
|
|
|
|
<el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
|
|
|
|
v-model="queryParams.phonenumber"
|
|
|
|
@keyup.enter.native="handleQuery" />
|
|
|
|
placeholder="请输入手机号码"
|
|
|
|
|
|
|
|
clearable
|
|
|
|
|
|
|
|
style="width: 240px"
|
|
|
|
|
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="状态" prop="status">
|
|
|
|
<el-form-item label="状态" prop="status">
|
|
|
|
<el-select
|
|
|
|
<el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
|
|
|
|
v-model="queryParams.status"
|
|
|
|
<el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
|
|
|
|
placeholder="用户状态"
|
|
|
|
:value="dict.value" />
|
|
|
|
clearable
|
|
|
|
|
|
|
|
style="width: 240px"
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
<el-option
|
|
|
|
|
|
|
|
v-for="dict in dict.type.sys_normal_disable"
|
|
|
|
|
|
|
|
:key="dict.value"
|
|
|
|
|
|
|
|
:label="dict.label"
|
|
|
|
|
|
|
|
:value="dict.value"
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="创建时间">
|
|
|
|
<el-form-item label="创建时间">
|
|
|
|
<el-date-picker
|
|
|
|
<el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
|
|
|
|
v-model="dateRange"
|
|
|
|
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
|
|
|
|
style="width: 240px"
|
|
|
|
|
|
|
|
value-format="yyyy-MM-dd"
|
|
|
|
|
|
|
|
type="daterange"
|
|
|
|
|
|
|
|
range-separator="-"
|
|
|
|
|
|
|
|
start-placeholder="开始日期"
|
|
|
|
|
|
|
|
end-placeholder="结束日期"
|
|
|
|
|
|
|
|
></el-date-picker>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item>
|
|
|
|
<el-form-item>
|
|
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
@ -82,104 +42,60 @@
|
|
|
|
|
|
|
|
|
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<el-button
|
|
|
|
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
|
|
|
type="primary"
|
|
|
|
v-hasPermi="['system:user:add']">新增</el-button>
|
|
|
|
plain
|
|
|
|
|
|
|
|
icon="el-icon-plus"
|
|
|
|
|
|
|
|
size="mini"
|
|
|
|
|
|
|
|
@click="handleAdd"
|
|
|
|
|
|
|
|
v-hasPermi="['system:user:add']"
|
|
|
|
|
|
|
|
>新增</el-button>
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<el-button
|
|
|
|
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
|
|
|
|
type="success"
|
|
|
|
v-hasPermi="['system:user:edit']">修改</el-button>
|
|
|
|
plain
|
|
|
|
|
|
|
|
icon="el-icon-edit"
|
|
|
|
|
|
|
|
size="mini"
|
|
|
|
|
|
|
|
:disabled="single"
|
|
|
|
|
|
|
|
@click="handleUpdate"
|
|
|
|
|
|
|
|
v-hasPermi="['system:user:edit']"
|
|
|
|
|
|
|
|
>修改</el-button>
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<el-button
|
|
|
|
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
|
|
|
|
type="danger"
|
|
|
|
v-hasPermi="['system:user:remove']">删除</el-button>
|
|
|
|
plain
|
|
|
|
|
|
|
|
icon="el-icon-delete"
|
|
|
|
|
|
|
|
size="mini"
|
|
|
|
|
|
|
|
:disabled="multiple"
|
|
|
|
|
|
|
|
@click="handleDelete"
|
|
|
|
|
|
|
|
v-hasPermi="['system:user:remove']"
|
|
|
|
|
|
|
|
>删除</el-button>
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
<el-col :span="1.5">
|
|
|
|
|
|
|
|
<el-button
|
|
|
|
|
|
|
|
type="info"
|
|
|
|
|
|
|
|
plain
|
|
|
|
|
|
|
|
icon="el-icon-upload2"
|
|
|
|
|
|
|
|
size="mini"
|
|
|
|
|
|
|
|
@click="handleImport"
|
|
|
|
|
|
|
|
v-hasPermi="['system:user:import']"
|
|
|
|
|
|
|
|
>导入</el-button>
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
<el-col :span="1.5">
|
|
|
|
|
|
|
|
<el-button
|
|
|
|
|
|
|
|
type="warning"
|
|
|
|
|
|
|
|
plain
|
|
|
|
|
|
|
|
icon="el-icon-download"
|
|
|
|
|
|
|
|
size="mini"
|
|
|
|
|
|
|
|
@click="handleExport"
|
|
|
|
|
|
|
|
v-hasPermi="['system:user:export']"
|
|
|
|
|
|
|
|
>导出</el-button>
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
<!-- <el-col :span="1.5">
|
|
|
|
|
|
|
|
<el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
|
|
|
|
|
|
|
|
v-hasPermi="['system:user:import']">导入</el-button>
|
|
|
|
|
|
|
|
</el-col> -->
|
|
|
|
|
|
|
|
<!-- <el-col :span="1.5">
|
|
|
|
|
|
|
|
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
|
|
|
|
|
|
|
|
v-hasPermi="['system:user:export']">导出</el-button>
|
|
|
|
|
|
|
|
</el-col> -->
|
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
|
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
|
|
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
|
|
|
|
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
|
|
|
|
<el-table-column type="selection" width="50" align="center" />
|
|
|
|
<el-table-column type="selection" width="50" align="center" />
|
|
|
|
<el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
|
|
|
|
<el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
|
|
|
|
<el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
|
|
|
|
<el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"
|
|
|
|
<el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
|
|
|
|
:show-overflow-tooltip="true" />
|
|
|
|
<el-table-column label="归属地区" align="center" key="deptName" prop="areaAuthName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
|
|
|
|
<el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
|
|
|
|
<el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
|
|
|
|
:show-overflow-tooltip="true" />
|
|
|
|
|
|
|
|
<el-table-column label="归属地区" align="center" key="deptName" prop="areaAuthName" v-if="columns[3].visible"
|
|
|
|
|
|
|
|
:show-overflow-tooltip="true" />
|
|
|
|
|
|
|
|
<el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible"
|
|
|
|
|
|
|
|
width="120" />
|
|
|
|
<el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
|
|
|
|
<el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<el-switch
|
|
|
|
<el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
|
|
|
|
v-model="scope.row.status"
|
|
|
|
@change="handleStatusChange(scope.row)"></el-switch>
|
|
|
|
active-value="0"
|
|
|
|
|
|
|
|
inactive-value="1"
|
|
|
|
|
|
|
|
@change="handleStatusChange(scope.row)"
|
|
|
|
|
|
|
|
></el-switch>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
|
|
|
|
<el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
|
|
|
|
|
|
|
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<span>{{ parseTime(scope.row.createTime) }}</span>
|
|
|
|
<span>{{ parseTime(scope.row.createTime) }}</span>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
|
|
|
|
label="操作"
|
|
|
|
|
|
|
|
align="center"
|
|
|
|
|
|
|
|
width="160"
|
|
|
|
|
|
|
|
class-name="small-padding fixed-width"
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
<template slot-scope="scope" v-if="scope.row.userId !== 1">
|
|
|
|
<template slot-scope="scope" v-if="scope.row.userId !== 1">
|
|
|
|
<el-button
|
|
|
|
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
|
|
|
|
size="mini"
|
|
|
|
v-hasPermi="['system:user:edit']">修改</el-button>
|
|
|
|
type="text"
|
|
|
|
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
|
|
|
|
icon="el-icon-edit"
|
|
|
|
v-hasPermi="['system:user:remove']">删除</el-button>
|
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
|
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
|
|
|
|
v-hasPermi="['system:user:edit']"
|
|
|
|
v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
|
|
|
|
>修改</el-button>
|
|
|
|
|
|
|
|
<el-button
|
|
|
|
|
|
|
|
size="mini"
|
|
|
|
|
|
|
|
type="text"
|
|
|
|
|
|
|
|
icon="el-icon-delete"
|
|
|
|
|
|
|
|
@click="handleDelete(scope.row)"
|
|
|
|
|
|
|
|
v-hasPermi="['system:user:remove']"
|
|
|
|
|
|
|
|
>删除</el-button>
|
|
|
|
|
|
|
|
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
|
|
|
|
|
|
|
|
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
|
|
|
|
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
|
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
|
<el-dropdown-item command="handleResetPwd" icon="el-icon-key"
|
|
|
|
<el-dropdown-item command="handleResetPwd" icon="el-icon-key"
|
|
|
@ -192,13 +108,8 @@
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table>
|
|
|
|
</el-table>
|
|
|
|
|
|
|
|
|
|
|
|
<pagination
|
|
|
|
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
|
|
|
|
v-show="total>0"
|
|
|
|
:limit.sync="queryParams.pageSize" @pagination="getList" />
|
|
|
|
:total="total"
|
|
|
|
|
|
|
|
:page.sync="queryParams.pageNum"
|
|
|
|
|
|
|
|
:limit.sync="queryParams.pageSize"
|
|
|
|
|
|
|
|
@pagination="getList"
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
|
@ -213,7 +124,8 @@
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-form-item label="归属地区" prop="deptId">
|
|
|
|
<el-form-item label="归属地区" prop="deptId">
|
|
|
|
<treeselect v-model="value" :options="deptOptions" :show-count="true" placeholder="请选择归属地区" :normalizer="normalizer" @select="handleSelect"/>
|
|
|
|
<treeselect v-model="value" :options="deptOptions" :show-count="true" placeholder="请选择归属地区"
|
|
|
|
|
|
|
|
:normalizer="normalizer" @select="handleSelect" />
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
@ -224,15 +136,10 @@
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-form-item label="角色" prop="roleIds">
|
|
|
|
<el-form-item label="角色" prop="roleIds">
|
|
|
|
<el-select v-model="form.roleIds" multiple placeholder="请选择角色">
|
|
|
|
<el-select v-model="form.roleIds" placeholder="请选择角色">
|
|
|
|
<el-option
|
|
|
|
<el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId"
|
|
|
|
v-for="item in roleOptions"
|
|
|
|
:disabled="item.status == 1"></el-option>
|
|
|
|
:key="item.roleId"
|
|
|
|
|
|
|
|
:label="item.roleName"
|
|
|
|
|
|
|
|
:value="item.roleId"
|
|
|
|
|
|
|
|
:disabled="item.status == 1"
|
|
|
|
|
|
|
|
></el-option>
|
|
|
|
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
@ -245,7 +152,8 @@
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
|
|
|
|
<el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
|
|
|
|
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
|
|
|
|
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password
|
|
|
|
|
|
|
|
autocomplete="new-password" />
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
@ -253,23 +161,17 @@
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-form-item label="用户性别">
|
|
|
|
<el-form-item label="用户性别">
|
|
|
|
<el-select v-model="form.sex" placeholder="请选择性别">
|
|
|
|
<el-select v-model="form.sex" placeholder="请选择性别">
|
|
|
|
<el-option
|
|
|
|
<el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
|
|
|
|
v-for="dict in dict.type.sys_user_sex"
|
|
|
|
:value="dict.value"></el-option>
|
|
|
|
:key="dict.value"
|
|
|
|
|
|
|
|
:label="dict.label"
|
|
|
|
|
|
|
|
:value="dict.value"
|
|
|
|
|
|
|
|
></el-option>
|
|
|
|
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-form-item label="状态">
|
|
|
|
<el-form-item label="状态">
|
|
|
|
<el-radio-group v-model="form.status">
|
|
|
|
<el-radio-group v-model="form.status">
|
|
|
|
<el-radio
|
|
|
|
<el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{
|
|
|
|
v-for="dict in dict.type.sys_normal_disable"
|
|
|
|
dict.label
|
|
|
|
:key="dict.value"
|
|
|
|
}}</el-radio>
|
|
|
|
:label="dict.value"
|
|
|
|
|
|
|
|
>{{dict.label}}</el-radio>
|
|
|
|
|
|
|
|
</el-radio-group>
|
|
|
|
</el-radio-group>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
@ -283,18 +185,9 @@
|
|
|
|
|
|
|
|
|
|
|
|
<!-- 用户导入对话框 -->
|
|
|
|
<!-- 用户导入对话框 -->
|
|
|
|
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
|
|
|
|
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
|
|
|
|
<el-upload
|
|
|
|
<el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
|
|
|
|
ref="upload"
|
|
|
|
:action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
|
|
|
|
:limit="1"
|
|
|
|
:on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
|
|
|
|
accept=".xlsx, .xls"
|
|
|
|
|
|
|
|
:headers="upload.headers"
|
|
|
|
|
|
|
|
:action="upload.url + '?updateSupport=' + upload.updateSupport"
|
|
|
|
|
|
|
|
:disabled="upload.isUploading"
|
|
|
|
|
|
|
|
:on-progress="handleFileUploadProgress"
|
|
|
|
|
|
|
|
:on-success="handleFileSuccess"
|
|
|
|
|
|
|
|
:auto-upload="false"
|
|
|
|
|
|
|
|
drag
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
<i class="el-icon-upload"></i>
|
|
|
|
<i class="el-icon-upload"></i>
|
|
|
|
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
|
|
|
|
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
|
|
|
|
<div class="el-upload__tip text-center" slot="tip">
|
|
|
|
<div class="el-upload__tip text-center" slot="tip">
|
|
|
@ -302,7 +195,8 @@
|
|
|
|
<el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
|
|
|
|
<el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<span>仅允许导入xls、xlsx格式文件。</span>
|
|
|
|
<span>仅允许导入xls、xlsx格式文件。</span>
|
|
|
|
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
|
|
|
|
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
|
|
|
|
|
|
|
|
@click="importTemplate">下载模板</el-link>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</el-upload>
|
|
|
|
</el-upload>
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
@ -314,7 +208,7 @@
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
|
|
<script>
|
|
|
|
<script>
|
|
|
|
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus,getAreaTree } from "@/api/system/user";
|
|
|
|
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, getAreaTree } from "@/api/system/user";
|
|
|
|
import { getToken } from "@/utils/auth";
|
|
|
|
import { getToken } from "@/utils/auth";
|
|
|
|
import Treeselect from "@riophae/vue-treeselect";
|
|
|
|
import Treeselect from "@riophae/vue-treeselect";
|
|
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
|
@ -343,13 +237,11 @@ export default {
|
|
|
|
title: "",
|
|
|
|
title: "",
|
|
|
|
// 部门树选项
|
|
|
|
// 部门树选项
|
|
|
|
deptOptions: undefined,
|
|
|
|
deptOptions: undefined,
|
|
|
|
value:null,
|
|
|
|
value: null,
|
|
|
|
// 是否显示弹出层
|
|
|
|
// 是否显示弹出层
|
|
|
|
open: false,
|
|
|
|
open: false,
|
|
|
|
// 部门名称
|
|
|
|
// 区域名称
|
|
|
|
deptName: undefined,
|
|
|
|
deptName: undefined,
|
|
|
|
// 默认密码
|
|
|
|
|
|
|
|
initPassword: undefined,
|
|
|
|
|
|
|
|
// 日期范围
|
|
|
|
// 日期范围
|
|
|
|
dateRange: [],
|
|
|
|
dateRange: [],
|
|
|
|
// 岗位选项
|
|
|
|
// 岗位选项
|
|
|
@ -381,11 +273,11 @@ export default {
|
|
|
|
queryParams: {
|
|
|
|
queryParams: {
|
|
|
|
pageNum: 1,
|
|
|
|
pageNum: 1,
|
|
|
|
pageSize: 10,
|
|
|
|
pageSize: 10,
|
|
|
|
userName: undefined,
|
|
|
|
userName: '',
|
|
|
|
phonenumber: undefined,
|
|
|
|
phonenumber: '',
|
|
|
|
status: undefined,
|
|
|
|
status: '',
|
|
|
|
deptId: undefined,
|
|
|
|
deptId: '',
|
|
|
|
areaAuthCode:undefined
|
|
|
|
areaAuthCode: ''
|
|
|
|
},
|
|
|
|
},
|
|
|
|
// 列信息
|
|
|
|
// 列信息
|
|
|
|
columns: [
|
|
|
|
columns: [
|
|
|
@ -403,8 +295,8 @@ export default {
|
|
|
|
{ required: true, message: "用户名称不能为空", trigger: "blur" },
|
|
|
|
{ required: true, message: "用户名称不能为空", trigger: "blur" },
|
|
|
|
{ min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
|
|
|
|
{ min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
|
|
|
|
],
|
|
|
|
],
|
|
|
|
roleIds:[
|
|
|
|
roleIds: [
|
|
|
|
{required: true, message: "角色不能为空", trigger: "blur" }
|
|
|
|
{ required: true, message: "角色不能为空", trigger: "blur" }
|
|
|
|
],
|
|
|
|
],
|
|
|
|
nickName: [
|
|
|
|
nickName: [
|
|
|
|
{ required: true, message: "用户昵称不能为空", trigger: "blur" }
|
|
|
|
{ required: true, message: "用户昵称不能为空", trigger: "blur" }
|
|
|
@ -433,82 +325,80 @@ export default {
|
|
|
|
watch: {
|
|
|
|
watch: {
|
|
|
|
// 根据名称筛选部门树
|
|
|
|
// 根据名称筛选部门树
|
|
|
|
deptName(val) {
|
|
|
|
deptName(val) {
|
|
|
|
|
|
|
|
console.log(this.$refs.tree)
|
|
|
|
this.$refs.tree.filter(val);
|
|
|
|
this.$refs.tree.filter(val);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
created() {
|
|
|
|
created() {
|
|
|
|
|
|
|
|
|
|
|
|
this.getList();
|
|
|
|
this.getList();
|
|
|
|
this.getDeptTree();
|
|
|
|
this.getDeptTree();
|
|
|
|
this.getConfigKey("sys.user.initPassword").then(response => {
|
|
|
|
|
|
|
|
this.initPassword = response.msg;
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
methods: {
|
|
|
|
methods: {
|
|
|
|
/** 查询用户列表 */
|
|
|
|
/** 查询用户列表 */
|
|
|
|
getList(value) {
|
|
|
|
getList(value) {
|
|
|
|
console.log(value,'shuju');
|
|
|
|
|
|
|
|
this.loading = true;
|
|
|
|
this.loading = true;
|
|
|
|
this.queryParams.areaAuthCode = value
|
|
|
|
this.queryParams.areaAuthCode = value || ''
|
|
|
|
// console.log(this.queryParams,'jjh');
|
|
|
|
console.log(this.queryParams)
|
|
|
|
listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
|
|
|
|
console.log(this.queryParams, 'jjh');
|
|
|
|
this.userList = response.rows;
|
|
|
|
listUser(this.queryParams).then(response => {
|
|
|
|
this.total = response.total;
|
|
|
|
this.userList = response.rows;
|
|
|
|
this.loading = false;
|
|
|
|
this.total = response.total;
|
|
|
|
}
|
|
|
|
this.loading = false;
|
|
|
|
|
|
|
|
}
|
|
|
|
);
|
|
|
|
);
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
/** 查询部门下拉树结构 */
|
|
|
|
/** 查询部门下拉树结构 */
|
|
|
|
getDeptTree() {
|
|
|
|
getDeptTree() {
|
|
|
|
getAreaTree().then(response => {
|
|
|
|
getAreaTree().then(response => {
|
|
|
|
console.log(response,'jjk');
|
|
|
|
console.log(response, 'jjk');
|
|
|
|
this.deptOptions = response.data;
|
|
|
|
this.deptOptions = response.data;
|
|
|
|
console.log(this.deptOptions,'kk');
|
|
|
|
console.log(this.deptOptions, 'kk');
|
|
|
|
this.normalizer()
|
|
|
|
this.normalizer()
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
normalizer(node){
|
|
|
|
normalizer(node) {
|
|
|
|
if(node.children && !node.children.length){
|
|
|
|
if (node.children && !node.children.length) {
|
|
|
|
delete node.children;
|
|
|
|
delete node.children;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return {
|
|
|
|
return {
|
|
|
|
id: node.id,
|
|
|
|
id: node.id,
|
|
|
|
label: node.areaName,
|
|
|
|
label: node.areaName,
|
|
|
|
children: node.children,
|
|
|
|
children: node.children,
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
handleSelect(treeNode){
|
|
|
|
}
|
|
|
|
console.log(treeNode,'treeNode');
|
|
|
|
},
|
|
|
|
this.form.areaAuthCode = treeNode.subAreaCode
|
|
|
|
|
|
|
|
console.log(this.form,'form');
|
|
|
|
handleSelect(treeNode) {
|
|
|
|
console.log(this.value,'value');
|
|
|
|
console.log(treeNode, 'treeNode');
|
|
|
|
},
|
|
|
|
this.form.areaAuthCode = treeNode.subAreaCode
|
|
|
|
|
|
|
|
console.log(this.form, 'form');
|
|
|
|
|
|
|
|
console.log(this.value, 'value');
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// !!!!!!!!!!!!!!!!
|
|
|
|
// !!!!!!!!!!!!!!!!
|
|
|
|
// 筛选节点
|
|
|
|
// 筛选节点
|
|
|
|
filterNode(value, data) {
|
|
|
|
filterNode(value, data) {
|
|
|
|
if (!value) return true;
|
|
|
|
if (!value) return true;
|
|
|
|
return data.label.indexOf(value) !== -1;
|
|
|
|
return data.areaName.indexOf(value) !== -1;
|
|
|
|
},
|
|
|
|
},
|
|
|
|
///////////
|
|
|
|
///////////
|
|
|
|
// 节点单击事件
|
|
|
|
// 节点单击事件
|
|
|
|
handleNodeClick(data) {
|
|
|
|
handleNodeClick(data) {
|
|
|
|
console.log(data.subAreaCode,'jj');
|
|
|
|
console.log(data.subAreaCode, 'jj');
|
|
|
|
this.getList(data.subAreaCode)
|
|
|
|
this.getList(data.subAreaCode)
|
|
|
|
// this.handleQuery(data.areaAuthCode);
|
|
|
|
// this.handleQuery(data.areaAuthCode);
|
|
|
|
},
|
|
|
|
},
|
|
|
|
// 用户状态修改
|
|
|
|
// 用户状态修改
|
|
|
|
handleStatusChange(row) {
|
|
|
|
handleStatusChange(row) {
|
|
|
|
let text = row.status === "0" ? "启用" : "停用";
|
|
|
|
let text = row.status === "0" ? "启用" : "停用";
|
|
|
|
this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?').then(function() {
|
|
|
|
this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?').then(function () {
|
|
|
|
return changeUserStatus(row.userId, row.status);
|
|
|
|
return changeUserStatus(row.userId, row.status);
|
|
|
|
}).then(() => {
|
|
|
|
}).then(() => {
|
|
|
|
this.$modal.msgSuccess(text + "成功");
|
|
|
|
this.$modal.msgSuccess(text + "成功");
|
|
|
|
}).catch(function() {
|
|
|
|
}).catch(function () {
|
|
|
|
row.status = row.status === "0" ? "1" : "0";
|
|
|
|
row.status = row.status === "0" ? "1" : "0";
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
@ -531,7 +421,7 @@ export default {
|
|
|
|
status: "0",
|
|
|
|
status: "0",
|
|
|
|
remark: undefined,
|
|
|
|
remark: undefined,
|
|
|
|
postIds: [],
|
|
|
|
postIds: [],
|
|
|
|
roleIds: []
|
|
|
|
roleIds: ''
|
|
|
|
};
|
|
|
|
};
|
|
|
|
this.resetForm("form");
|
|
|
|
this.resetForm("form");
|
|
|
|
},
|
|
|
|
},
|
|
|
@ -570,13 +460,13 @@ export default {
|
|
|
|
/** 新增按钮操作 */
|
|
|
|
/** 新增按钮操作 */
|
|
|
|
handleAdd() {
|
|
|
|
handleAdd() {
|
|
|
|
this.reset();
|
|
|
|
this.reset();
|
|
|
|
|
|
|
|
console.log('新增', this.form)
|
|
|
|
getUser().then(response => {
|
|
|
|
getUser().then(response => {
|
|
|
|
console.log(response,'kkj');
|
|
|
|
console.log(response, 'kkj');
|
|
|
|
this.postOptions = response.posts;
|
|
|
|
this.postOptions = response.posts;
|
|
|
|
this.roleOptions = response.roles;
|
|
|
|
this.roleOptions = response.roles;
|
|
|
|
this.open = true;
|
|
|
|
this.open = true;
|
|
|
|
this.title = "添加用户";
|
|
|
|
this.title = "添加用户";
|
|
|
|
this.form.password = this.initPassword;
|
|
|
|
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
/** 修改按钮操作 */
|
|
|
|
/** 修改按钮操作 */
|
|
|
@ -603,18 +493,18 @@ export default {
|
|
|
|
inputPattern: /^.{5,20}$/,
|
|
|
|
inputPattern: /^.{5,20}$/,
|
|
|
|
inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
|
|
|
|
inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
|
|
|
|
}).then(({ value }) => {
|
|
|
|
}).then(({ value }) => {
|
|
|
|
resetUserPwd(row.userId, value).then(response => {
|
|
|
|
resetUserPwd(row.userId, value).then(response => {
|
|
|
|
this.$modal.msgSuccess("修改成功,新密码是:" + value);
|
|
|
|
this.$modal.msgSuccess("修改成功,新密码是:" + value);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}).catch(() => {});
|
|
|
|
}).catch(() => { });
|
|
|
|
},
|
|
|
|
},
|
|
|
|
/** 分配角色操作 */
|
|
|
|
/** 分配角色操作 */
|
|
|
|
handleAuthRole: function(row) {
|
|
|
|
handleAuthRole: function (row) {
|
|
|
|
const userId = row.userId;
|
|
|
|
const userId = row.userId;
|
|
|
|
this.$router.push("/system/user-auth/role/" + userId);
|
|
|
|
this.$router.push("/system/user-auth/role/" + userId);
|
|
|
|
},
|
|
|
|
},
|
|
|
|
/** 提交按钮 */
|
|
|
|
/** 提交按钮 */
|
|
|
|
submitForm: function() {
|
|
|
|
submitForm: function () {
|
|
|
|
this.$refs["form"].validate(valid => {
|
|
|
|
this.$refs["form"].validate(valid => {
|
|
|
|
if (valid) {
|
|
|
|
if (valid) {
|
|
|
|
if (this.form.userId != undefined) {
|
|
|
|
if (this.form.userId != undefined) {
|
|
|
@ -636,12 +526,12 @@ export default {
|
|
|
|
/** 删除按钮操作 */
|
|
|
|
/** 删除按钮操作 */
|
|
|
|
handleDelete(row) {
|
|
|
|
handleDelete(row) {
|
|
|
|
const userIds = row.userId || this.ids;
|
|
|
|
const userIds = row.userId || this.ids;
|
|
|
|
this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项?').then(function() {
|
|
|
|
this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项?').then(function () {
|
|
|
|
return delUser(userIds);
|
|
|
|
return delUser(userIds);
|
|
|
|
}).then(() => {
|
|
|
|
}).then(() => {
|
|
|
|
this.getList();
|
|
|
|
this.getList();
|
|
|
|
this.$modal.msgSuccess("删除成功");
|
|
|
|
this.$modal.msgSuccess("删除成功");
|
|
|
|
}).catch(() => {});
|
|
|
|
}).catch(() => { });
|
|
|
|
},
|
|
|
|
},
|
|
|
|
/** 导出按钮操作 */
|
|
|
|
/** 导出按钮操作 */
|
|
|
|
handleExport() {
|
|
|
|
handleExport() {
|
|
|
|