|
|
@@ -1,84 +1,38 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
<layoutCom>
|
|
|
- <org-tree
|
|
|
- slot="leftBar"
|
|
|
- v-model="queryParams.orgId"
|
|
|
- @defaultKey="getDefaultKey"
|
|
|
- @checkChange="checkChange"
|
|
|
- @click="clickTreeNode"
|
|
|
- ></org-tree>
|
|
|
+ <org-tree slot="leftBar" v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
|
|
|
+ @click="clickTreeNode"></org-tree>
|
|
|
<el-row slot="rightBar">
|
|
|
<!--用户数据-->
|
|
|
<el-col>
|
|
|
<!-- 搜索条件 -->
|
|
|
- <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-input
|
|
|
- :maxlength="20"
|
|
|
- v-model="queryParams.username"
|
|
|
- placeholder="请输入用户账号"
|
|
|
- clearable
|
|
|
- style="width: 200px"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
+ <el-input :maxlength="20" v-model="queryParams.username" placeholder="请输入用户账号" clearable
|
|
|
+ style="width: 200px" @keyup.enter.native="handleQuery" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="用户姓名" prop="name">
|
|
|
- <el-input
|
|
|
- :maxlength="20"
|
|
|
- v-model="queryParams.name"
|
|
|
- placeholder="请输入用户姓名"
|
|
|
- clearable
|
|
|
- style="width: 200px"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
+ <el-input :maxlength="20" v-model="queryParams.name" placeholder="请输入用户姓名" clearable style="width: 200px"
|
|
|
+ @keyup.enter.native="handleQuery" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="手机号码" prop="phone">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.phone"
|
|
|
- placeholder="请输入手机号码"
|
|
|
- clearable
|
|
|
- style="width: 200px"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
+ <el-input v-model="queryParams.phone" placeholder="请输入手机号码" clearable style="width: 200px"
|
|
|
+ @keyup.enter.native="handleQuery" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="用户角色" prop="roleIds">
|
|
|
|
|
|
<!-- @visible-change="selectAllRoles" -->
|
|
|
- <el-select
|
|
|
- style="width: 200px"
|
|
|
- clearable
|
|
|
- v-model="queryParams.roleId"
|
|
|
- placeholder="请选择用户角色"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in role_options"
|
|
|
- :key="item.id"
|
|
|
- :label="item.roleName"
|
|
|
- :value="item.id"
|
|
|
- ></el-option>
|
|
|
+ <el-select style="width: 200px" clearable v-model="queryParams.roleId" placeholder="请选择用户角色">
|
|
|
+ <el-option v-for="item in role_options" :key="item.id" :label="item.roleName"
|
|
|
+ :value="item.id"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="状态" prop="isLock">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.isLock"
|
|
|
- placeholder="请选择状态"
|
|
|
- clearable
|
|
|
- style="width: 200px"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="dict in dict.type.sys_user_is_lock"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.label"
|
|
|
- :value="dict.value"
|
|
|
- />
|
|
|
+ <el-select v-model="queryParams.isLock" placeholder="请选择状态" clearable style="width: 200px">
|
|
|
+ <el-option v-for="dict in dict.type.sys_user_is_lock" :key="dict.value" :label="dict.label"
|
|
|
+ :value="dict.value" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<!-- <el-form-item label="创建时间">
|
|
|
@@ -86,38 +40,20 @@
|
|
|
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
|
|
|
</el-form-item> -->
|
|
|
<el-form-item>
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- icon="el-icon-search"
|
|
|
- size="mini"
|
|
|
- @click="handleQuery"
|
|
|
- >搜索</el-button
|
|
|
- >
|
|
|
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
|
- >重置</el-button
|
|
|
- >
|
|
|
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
|
<span style="margin-left: 50px;">只显示管理人员:</span>
|
|
|
- <el-switch
|
|
|
- v-model="queryParams.onlyManager"
|
|
|
- active-text="是"
|
|
|
- >
|
|
|
+ <el-switch v-model="queryParams.onlyManager" active-text="是">
|
|
|
</el-switch>
|
|
|
-
|
|
|
+
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
|
|
|
<!-- 按纽 -->
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
<el-col :span="1.5">
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- plain
|
|
|
- icon="el-icon-plus"
|
|
|
- size="mini"
|
|
|
- @click="handleAdd"
|
|
|
- v-hasPermi="['system:user:add']"
|
|
|
- >新增</el-button
|
|
|
- >
|
|
|
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
|
|
+ v-hasPermi="['system:user:add']">新增</el-button>
|
|
|
</el-col>
|
|
|
<!-- <el-col :span="1.5">
|
|
|
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
|
|
|
@@ -127,87 +63,33 @@
|
|
|
<el-button type="danger" 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 :span="1.5">
|
|
|
- <el-button
|
|
|
- type="warning"
|
|
|
- plain
|
|
|
- icon="el-icon-download"
|
|
|
- size="mini"
|
|
|
- @click="handleExportManager"
|
|
|
- v-hasPermi="['system:user:export']"
|
|
|
- >导出管理人员</el-button>
|
|
|
- </el-col>
|
|
|
- <right-toolbar
|
|
|
- :showSearch.sync="showSearch"
|
|
|
- @queryTable="getList"
|
|
|
- :columns="columns"
|
|
|
- ></right-toolbar>
|
|
|
+ <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 :span="1.5">
|
|
|
+ <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportManager"
|
|
|
+ v-hasPermi="['system:user:export']">导出管理人员</el-button>
|
|
|
+ </el-col>
|
|
|
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
|
|
|
</el-row>
|
|
|
- <el-table
|
|
|
- border
|
|
|
- height="650"
|
|
|
- size="small"
|
|
|
- v-loading="loading"
|
|
|
- :data="userList"
|
|
|
- @selection-change="handleSelectionChange"
|
|
|
- >
|
|
|
- <el-table-column fixed label="序号" type="index" align="center" width="50"></el-table-column>
|
|
|
- <el-table-column
|
|
|
- label="用户账号"
|
|
|
- align="center"
|
|
|
- key="username"
|
|
|
- prop="username"
|
|
|
- width="120"
|
|
|
- v-if="columns[0].visible"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- label="用户姓名"
|
|
|
- align="center"
|
|
|
- key="name"
|
|
|
- prop="name"
|
|
|
- width="120"
|
|
|
- v-if="columns[1].visible"
|
|
|
- :show-overflow-tooltip="true"
|
|
|
- />
|
|
|
+ <el-table border height="650" size="small" v-loading="loading" :data="userList"
|
|
|
+ @selection-change="handleSelectionChange">
|
|
|
+ <el-table-column fixed label="序号" type="index" align="center" width="50"></el-table-column>
|
|
|
+ <el-table-column label="用户账号" align="center" key="username" prop="username" width="120"
|
|
|
+ v-if="columns[0].visible" />
|
|
|
+ <el-table-column label="用户姓名" align="center" key="name" prop="name" width="120" v-if="columns[1].visible"
|
|
|
+ :show-overflow-tooltip="true" />
|
|
|
|
|
|
- <el-table-column
|
|
|
- label="所属机构"
|
|
|
- align="left"
|
|
|
- key="orgName"
|
|
|
- prop="orgName"
|
|
|
- width="200"
|
|
|
- v-if="columns[3].visible"
|
|
|
- :show-overflow-tooltip="true"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- label="用户角色"
|
|
|
- align="left"
|
|
|
- prop="roles"
|
|
|
- width="240"
|
|
|
- v-if="columns[2].visible"
|
|
|
- :show-overflow-tooltip="true"
|
|
|
- >
|
|
|
+ <el-table-column label="所属机构" align="left" key="orgName" prop="orgName" width="200" v-if="columns[3].visible"
|
|
|
+ :show-overflow-tooltip="true" />
|
|
|
+ <el-table-column label="用户角色" align="left" prop="roles" width="240" v-if="columns[2].visible"
|
|
|
+ :show-overflow-tooltip="true">
|
|
|
<template slot-scope="scope">
|
|
|
<!-- <template v-for="item in scope.row.roles">
|
|
|
{{ item.roleName }}
|
|
|
@@ -216,127 +98,47 @@
|
|
|
<div class="cell" v-html="formatter(scope.row.roleNames)"></div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- label="手机号码"
|
|
|
- align="left"
|
|
|
- prop="phone"
|
|
|
- width="200"
|
|
|
- v-if="columns[3].visible"
|
|
|
- :show-overflow-tooltip="true"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- label="状态"
|
|
|
- align="center"
|
|
|
- key="isLock"
|
|
|
- prop="isLock"
|
|
|
- v-if="columns[4].visible"
|
|
|
- width="80"
|
|
|
- >
|
|
|
+ <el-table-column label="手机号码" align="left" prop="phone" width="200" v-if="columns[3].visible"
|
|
|
+ :show-overflow-tooltip="true" />
|
|
|
+ <el-table-column label="状态" align="center" key="isLock" prop="isLock" v-if="columns[4].visible" width="80">
|
|
|
<template slot-scope="scope">
|
|
|
- <dict-tag
|
|
|
- :options="dict.type.sys_user_is_lock"
|
|
|
- :value="scope.row.isLock"
|
|
|
- />
|
|
|
+ <dict-tag :options="dict.type.sys_user_is_lock" :value="scope.row.isLock" />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- label="是否管理人员"
|
|
|
- align="center"
|
|
|
- key="isManager"
|
|
|
- prop="isManager"
|
|
|
- v-if="columns[5].visible"
|
|
|
- width="120"
|
|
|
- >
|
|
|
+ <el-table-column label="是否管理人员" align="center" key="isManager" prop="isManager" v-if="columns[5].visible"
|
|
|
+ width="120">
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.isManager > 0 ? "是" : "否" }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- label="登录IP"
|
|
|
- align="center"
|
|
|
- key="lastIp"
|
|
|
- prop="lastIp"
|
|
|
- v-if="columns[6].visible"
|
|
|
- width="120"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- label="登录时间"
|
|
|
- align="center"
|
|
|
- key="lastTime"
|
|
|
- prop="lastTime"
|
|
|
- v-if="columns[7].visible"
|
|
|
- width="120"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- label="操作"
|
|
|
- align="center"
|
|
|
- width="300"
|
|
|
- fixed="right"
|
|
|
- class-name="small-padding fixed-width"
|
|
|
- >
|
|
|
- <template slot-scope="scope" >
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-plus"
|
|
|
- @click="handleExtend(scope.row)"
|
|
|
- v-hasPermi="['system:user:extend']"
|
|
|
- v-if="check==true" >补充信息</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- icon="el-icon-edit"
|
|
|
- @click="handleUpdate(scope.row)"
|
|
|
- v-hasPermi="['system:user:edit']" v-if="check==true"
|
|
|
- >编辑</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-table-column label="登录IP" align="center" key="lastIp" prop="lastIp" v-if="columns[6].visible"
|
|
|
+ width="120" />
|
|
|
+ <el-table-column label="登录时间" align="center" key="lastTime" prop="lastTime" v-if="columns[7].visible"
|
|
|
+ width="120" />
|
|
|
+ <el-table-column label="操作" align="center" width="300" fixed="right" class-name="small-padding fixed-width">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-button size="mini" type="text" icon="el-icon-plus" @click="handleExtend(scope.row)"
|
|
|
+ v-hasPermi="['system:user:extend']" v-if="check == true">补充信息</el-button>
|
|
|
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
|
|
|
+ v-hasPermi="['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-dropdown-menu slot="dropdown">
|
|
|
- <el-dropdown-item
|
|
|
- command="handleResetPwd"
|
|
|
- icon="el-icon-key"
|
|
|
- v-hasPermi="['system:user:resetPwd']"
|
|
|
- >重置密码</el-dropdown-item
|
|
|
- >
|
|
|
- <el-dropdown-item
|
|
|
- command="handleAuthRole"
|
|
|
- v-if="false"
|
|
|
- icon="el-icon-circle-check"
|
|
|
- v-hasPermi="['system:user:edit']"
|
|
|
- >分配角色</el-dropdown-item
|
|
|
- >
|
|
|
+ <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
|
|
|
+ v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="handleAuthRole" v-if="false" icon="el-icon-circle-check"
|
|
|
+ v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
|
|
|
- <pagination
|
|
|
- v-show="total > 0"
|
|
|
- :total="total"
|
|
|
- :page.sync="queryParams.pageNum"
|
|
|
- :limit.sync="queryParams.pageSize"
|
|
|
- @pagination="getList"
|
|
|
- />
|
|
|
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
|
|
|
+ :limit.sync="queryParams.pageSize" @pagination="getList" />
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</layoutCom>
|
|
|
@@ -347,74 +149,38 @@
|
|
|
<el-row>
|
|
|
<el-col :span="10">
|
|
|
<el-form-item label="用户账号" prop="username">
|
|
|
- <el-input
|
|
|
- v-model="form.username"
|
|
|
- placeholder="请输入用户账号"
|
|
|
- :maxlength="20"
|
|
|
- :readonly="form.source == 1"
|
|
|
- />
|
|
|
+ <el-input v-model="form.username" placeholder="请输入用户账号" :maxlength="20" :readonly="form.source == 1" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="10">
|
|
|
<el-form-item label="用户名称" prop="name">
|
|
|
- <el-input
|
|
|
- v-model="form.name"
|
|
|
- placeholder="请输入用户名称"
|
|
|
- maxlength="30"
|
|
|
- :readonly="form.source == 1"
|
|
|
- />
|
|
|
+ <el-input v-model="form.name" placeholder="请输入用户名称" maxlength="30" :readonly="form.source == 1" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="20">
|
|
|
<el-form-item label="所属机构" prop="orgId" @click="clickk">
|
|
|
- <tree-select
|
|
|
- v-model="form.orgId"
|
|
|
- :options="deptOptions"
|
|
|
- :show-count="true"
|
|
|
- :normalizer="tenantIdnormalizer"
|
|
|
- :props="{ checkStrictly: true, label: 'name' }"
|
|
|
- placeholder="请选择所属机构"
|
|
|
- :disabled="form.source == 1"
|
|
|
- />
|
|
|
+ <tree-select v-model="form.orgId" :options="deptOptions" :show-count="true" :normalizer="tenantIdnormalizer"
|
|
|
+ :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择所属机构" :disabled="form.source == 1" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="10">
|
|
|
<el-form-item label="用户角色" prop="roleIds">
|
|
|
- <el-select
|
|
|
- @visible-change="selectRoles"
|
|
|
- style="width: 100%"
|
|
|
- v-model="form.roleIds"
|
|
|
- multiple
|
|
|
- placeholder="请选择用户角色"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in roleOptions"
|
|
|
- :key="item.id"
|
|
|
- :label="item.roleName"
|
|
|
- :value="item.id"
|
|
|
- :disabled="item.status == 1"
|
|
|
- ></el-option>
|
|
|
+ <el-select @visible-change="selectRoles" style="width: 100%" v-model="form.roleIds" multiple
|
|
|
+ placeholder="请选择用户角色">
|
|
|
+ <el-option v-for="item in roleOptions" :key="item.id" :label="item.roleName" :value="item.id"
|
|
|
+ :disabled="item.status == 1"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="10">
|
|
|
<el-form-item label="用户性别" prop="gender">
|
|
|
- <el-select
|
|
|
- style="width: 100%"
|
|
|
- v-model="form.gender"
|
|
|
- placeholder="请选择用户性别"
|
|
|
- :disabled="form.source == 1"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="dict in dict.type.sys_user_sex"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.label"
|
|
|
- :value="`${dict.value}`"
|
|
|
- ></el-option>
|
|
|
+ <el-select style="width: 100%" v-model="form.gender" placeholder="请选择用户性别" :disabled="form.source == 1">
|
|
|
+ <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
|
|
|
+ :value="`${dict.value}`"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -422,23 +188,12 @@
|
|
|
<el-row>
|
|
|
<el-col :span="10">
|
|
|
<el-form-item label="手机号码" prop="phone">
|
|
|
- <el-input
|
|
|
- v-model="form.phone"
|
|
|
- placeholder="请输入手机号码"
|
|
|
- maxlength="11"
|
|
|
- :readonly="form.source == 1"
|
|
|
- />
|
|
|
+ <el-input v-model="form.phone" placeholder="请输入手机号码" maxlength="11" :readonly="form.source == 1" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="10">
|
|
|
<el-form-item v-if="!form.id" 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 />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -446,13 +201,17 @@
|
|
|
<el-col :span="10">
|
|
|
<el-form-item label="状态">
|
|
|
<el-radio-group v-model="form.isLock">
|
|
|
- <el-radio
|
|
|
- v-for="dict in dict.type.sys_user_is_lock"
|
|
|
- :key="`${dict.value}`"
|
|
|
- :label="dict.value"
|
|
|
- :disabled="form.source == 1"
|
|
|
- >{{ dict.label }}</el-radio
|
|
|
- >
|
|
|
+ <el-radio v-for="dict in dict.type.sys_user_is_lock" :key="`${dict.value}`" :label="dict.value"
|
|
|
+ :disabled="form.source == 1">{{ dict.label }}</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="10">
|
|
|
+ <el-form-item label="是否管理人员">
|
|
|
+ <el-radio-group v-model="form.isManage">
|
|
|
+ <el-radio v-for="dict in dict.type.sys_yes_no" :key="`${dict.value}`" :label="dict.value"
|
|
|
+ :disabled="form.source == 1">{{ dict.label }}</el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -466,24 +225,10 @@
|
|
|
</DialogCom>
|
|
|
|
|
|
<!-- 用户导入对话框 -->
|
|
|
- <DialogCom
|
|
|
- :title="upload.title"
|
|
|
- :visible.sync="upload.open"
|
|
|
- width="400px"
|
|
|
- append-to-body
|
|
|
- >
|
|
|
- <el-upload
|
|
|
- ref="upload"
|
|
|
- :limit="1"
|
|
|
- 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
|
|
|
- >
|
|
|
+ <DialogCom :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
|
|
|
+ <el-upload ref="upload" :limit="1" 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>
|
|
|
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
|
|
|
<!-- <div class="el-upload__tip text-center" slot="tip">
|
|
|
@@ -524,11 +269,11 @@ import {
|
|
|
import { getToken } from "@/utils/auth";
|
|
|
import { deptTreeSelect } from "@/api/system/public";
|
|
|
import tableList from "@/mixins/tableList";
|
|
|
-import {getInfo}from "@/api/login";
|
|
|
-import {getRoles}from "@/api/system/public";
|
|
|
+import { getInfo } from "@/api/login";
|
|
|
+import { getRoles } from "@/api/system/public";
|
|
|
export default {
|
|
|
name: "User",
|
|
|
- dicts: ["sys_normal_disable", "sys_user_sex","sys_user_is_lock"],
|
|
|
+ dicts: ["sys_normal_disable", "sys_user_sex", "sys_user_is_lock","sys_yes_no"],
|
|
|
components: { OrgTree },
|
|
|
mixins: [tableList],
|
|
|
data() {
|
|
|
@@ -596,8 +341,8 @@ export default {
|
|
|
status: null,
|
|
|
orgId: null,
|
|
|
checkSub: true,
|
|
|
- onlyManager:false,
|
|
|
- name:null,
|
|
|
+ onlyManager: false,
|
|
|
+ name: null,
|
|
|
},
|
|
|
// 列信息
|
|
|
columns: [
|
|
|
@@ -700,21 +445,21 @@ export default {
|
|
|
// }
|
|
|
},
|
|
|
methods: {
|
|
|
- clickk(){
|
|
|
+ clickk() {
|
|
|
console.log("clickk")
|
|
|
},
|
|
|
- changeRoleIds(){
|
|
|
- this.form.roleIds=null;
|
|
|
+ changeRoleIds() {
|
|
|
+ this.form.roleIds = null;
|
|
|
},
|
|
|
- formatter(content){
|
|
|
- if(content){
|
|
|
+ formatter(content) {
|
|
|
+ if (content) {
|
|
|
const strArr = content.toString().split(',');
|
|
|
- let rel = "";
|
|
|
- strArr.forEach(function(item,index,arr){
|
|
|
- let ops = `<span style="color: #008CD6;"> ${item} </span> `;
|
|
|
- rel = rel == "" ? ops: rel +" || "+ops;
|
|
|
- })
|
|
|
- return rel;
|
|
|
+ let rel = "";
|
|
|
+ strArr.forEach(function (item, index, arr) {
|
|
|
+ let ops = `<span style="color: #008CD6;"> ${item} </span> `;
|
|
|
+ rel = rel == "" ? ops : rel + " || " + ops;
|
|
|
+ })
|
|
|
+ return rel;
|
|
|
}
|
|
|
return "";
|
|
|
},
|
|
|
@@ -724,19 +469,19 @@ export default {
|
|
|
(this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
|
|
|
);
|
|
|
},
|
|
|
- cleanRoles(){
|
|
|
- this.roleOptions=[];
|
|
|
+ cleanRoles() {
|
|
|
+ this.roleOptions = [];
|
|
|
|
|
|
},
|
|
|
- getAllRoles(){
|
|
|
- getRoles().then((response) =>{
|
|
|
+ getAllRoles() {
|
|
|
+ getRoles().then((response) => {
|
|
|
this.role_options = response;
|
|
|
- });
|
|
|
+ });
|
|
|
},
|
|
|
- selectRoles(){
|
|
|
- selectrolesByOrgId({orgId:this.form.orgId}).then((res)=>{
|
|
|
- console.log(res,"selectrolesByOrgId");
|
|
|
- this.roleOptions=res.data;
|
|
|
+ selectRoles() {
|
|
|
+ selectrolesByOrgId({ orgId: this.form.orgId }).then((res) => {
|
|
|
+ console.log(res, "selectrolesByOrgId");
|
|
|
+ this.roleOptions = res.data;
|
|
|
})
|
|
|
},
|
|
|
/** 查询机构树数据 */
|
|
|
@@ -776,7 +521,7 @@ export default {
|
|
|
/** 重置按钮操作 */
|
|
|
resetQuery() {
|
|
|
this.resetForm("queryForm");
|
|
|
- this.queryParams.onlyManager=false;
|
|
|
+ this.queryParams.onlyManager = false;
|
|
|
this.handleQuery();
|
|
|
},
|
|
|
|
|
|
@@ -848,6 +593,7 @@ export default {
|
|
|
postIds: [],
|
|
|
roleIds: [],
|
|
|
isLock: "0",
|
|
|
+ isManage: "Y"
|
|
|
};
|
|
|
this.resetForm("form");
|
|
|
},
|
|
|
@@ -884,7 +630,7 @@ export default {
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
|
- this.isRoleIdsChanged=false;
|
|
|
+ this.isRoleIdsChanged = false;
|
|
|
// console.log(row);
|
|
|
this.reset();
|
|
|
this.getDeptTree();
|
|
|
@@ -896,10 +642,10 @@ export default {
|
|
|
this.roleOptions = response.roles;
|
|
|
this.$set(this.form, "postIds", response.postIds);
|
|
|
// this.$set(this.form, "roleIds", response.roleIds);
|
|
|
- this.form.roleIds=response.roleIds;
|
|
|
+ this.form.roleIds = response.roleIds;
|
|
|
this.open = true;
|
|
|
this.title = "编辑";
|
|
|
- console.log(response.roleIds,"roleIds")
|
|
|
+ console.log(response.roleIds, "roleIds")
|
|
|
this.form.password = "";
|
|
|
});
|
|
|
},
|
|
|
@@ -922,7 +668,7 @@ export default {
|
|
|
this.$modal.msgSuccess("修改成功，新密码是：" + value);
|
|
|
});
|
|
|
})
|
|
|
- .catch(() => {});
|
|
|
+ .catch(() => { });
|
|
|
},
|
|
|
/** 分配角色操作 */
|
|
|
handleAuthRole: function (row) {
|
|
|
@@ -934,7 +680,7 @@ export default {
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
if (this.form.id != undefined) {
|
|
|
- console.log(this.form,"this.form")
|
|
|
+ console.log(this.form, "this.form")
|
|
|
updateUser(this.form).then((response) => {
|
|
|
this.$modal.msgSuccess("修改成功");
|
|
|
this.open = false;
|
|
|
@@ -963,7 +709,7 @@ export default {
|
|
|
this.getList();
|
|
|
this.$modal.msgSuccess("删除成功");
|
|
|
})
|
|
|
- .catch(() => {});
|
|
|
+ .catch(() => { });
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
|
@@ -1008,8 +754,8 @@ export default {
|
|
|
this.$refs.upload.clearFiles();
|
|
|
this.$alert(
|
|
|
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
|
|
|
- response.msg +
|
|
|
- "</div>",
|
|
|
+ response.msg +
|
|
|
+ "</div>",
|
|
|
"导入结果",
|
|
|
{ dangerouslyUseHTMLString: true }
|
|
|
);
|
luojun