|
@@ -1,8 +1,7 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
<el-row :gutter="20">
|
|
|
- <!--部门数据-->
|
|
|
- <el-col :span="4" :xs="24">
|
|
|
+ <!-- <el-col :span="4" :xs="24">
|
|
|
<div class="head-container">
|
|
|
<el-input
|
|
|
v-model="deptName"
|
|
@@ -25,7 +24,7 @@
|
|
|
/>
|
|
|
</div>
|
|
|
</el-col>
|
|
|
- <!--用户数据-->
|
|
|
+ -->
|
|
|
<el-col :span="20" :xs="24">
|
|
|
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
<el-form-item label="用户名称" prop="userName">
|
|
@@ -38,7 +37,7 @@
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="手机号码" prop="phonenumber">
|
|
|
+ <!-- <el-form-item label="手机号码" prop="phonenumber">
|
|
|
<el-input
|
|
|
v-model="queryParams.phonenumber"
|
|
|
placeholder="请输入手机号码"
|
|
@@ -47,7 +46,7 @@
|
|
|
style="width: 240px"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item> -->
|
|
|
<el-form-item label="状态" prop="status">
|
|
|
<el-select
|
|
|
v-model="queryParams.status"
|
|
@@ -112,7 +111,7 @@
|
|
|
v-hasPermi="['system:user:remove']"
|
|
|
>删除</el-button>
|
|
|
</el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
+ <!-- <el-col :span="1.5">
|
|
|
<el-button
|
|
|
type="info"
|
|
|
icon="el-icon-upload2"
|
|
@@ -129,7 +128,7 @@
|
|
|
@click="handleExport"
|
|
|
v-hasPermi="['system:user:export']"
|
|
|
>导出</el-button>
|
|
|
- </el-col>
|
|
|
+ </el-col> -->
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
|
|
|
@@ -196,12 +195,12 @@
|
|
|
@pagination="getList"
|
|
|
/>
|
|
|
</el-col>
|
|
|
- </el-row>
|
|
|
+ </el-row>
|
|
|
|
|
|
<!-- 添加或修改参数配置对话框 -->
|
|
|
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
|
- <el-row>
|
|
|
+ <!-- <el-row>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="用户昵称" prop="nickName">
|
|
|
<el-input v-model="form.nickName" placeholder="请输入用户昵称" />
|
|
@@ -212,8 +211,8 @@
|
|
|
<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- </el-row>
|
|
|
- <el-row>
|
|
|
+ </el-row> -->
|
|
|
+ <!-- <el-row>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="手机号码" prop="phonenumber">
|
|
|
<el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
|
|
@@ -224,7 +223,7 @@
|
|
|
<el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- </el-row>
|
|
|
+ </el-row> -->
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
|
|
@@ -233,23 +232,12 @@
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
|
|
|
- <el-input v-model="form.password" placeholder="请输入用户密码" type="password" />
|
|
|
+ <el-input v-model="form.password" placeholder="请输入用户密码" type="text" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="用户性别">
|
|
|
- <el-select v-model="form.sex" placeholder="请选择">
|
|
|
- <el-option
|
|
|
- v-for="dict in sexOptions"
|
|
|
- :key="dict.dictValue"
|
|
|
- :label="dict.dictLabel"
|
|
|
- :value="dict.dictValue"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
+
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="状态">
|
|
|
<el-radio-group v-model="form.status">
|
|
@@ -263,19 +251,6 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="岗位">
|
|
|
- <el-select v-model="form.postIds" multiple placeholder="请选择">
|
|
|
- <el-option
|
|
|
- v-for="item in postOptions"
|
|
|
- :key="item.postId"
|
|
|
- :label="item.postName"
|
|
|
- :value="item.postId"
|
|
|
- :disabled="item.status == 1"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="角色">
|
|
|
<el-select v-model="form.roleIds" multiple placeholder="请选择">
|
|
@@ -289,6 +264,20 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <!-- <el-col :span="12">
|
|
|
+ <el-form-item label="岗位">
|
|
|
+ <el-select v-model="form.postIds" multiple placeholder="请选择">
|
|
|
+ <el-option
|
|
|
+ v-for="item in postOptions"
|
|
|
+ :key="item.postId"
|
|
|
+ :label="item.postName"
|
|
|
+ :value="item.postId"
|
|
|
+ :disabled="item.status == 1"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col> -->
|
|
|
+
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
@@ -418,31 +407,31 @@ export default {
|
|
|
userName: [
|
|
|
{ required: true, message: "用户名称不能为空", trigger: "blur" }
|
|
|
],
|
|
|
- nickName: [
|
|
|
- { required: true, message: "用户昵称不能为空", trigger: "blur" }
|
|
|
- ],
|
|
|
- deptId: [
|
|
|
- { required: true, message: "归属部门不能为空", trigger: "change" }
|
|
|
- ],
|
|
|
+ // nickName: [
|
|
|
+ // { required: true, message: "用户昵称不能为空", trigger: "blur" }
|
|
|
+ // ],
|
|
|
+ // deptId: [
|
|
|
+ // { required: true, message: "归属部门不能为空", trigger: "change" }
|
|
|
+ // ],
|
|
|
password: [
|
|
|
{ required: true, message: "用户密码不能为空", trigger: "blur" }
|
|
|
],
|
|
|
- email: [
|
|
|
- { required: true, message: "邮箱地址不能为空", trigger: "blur" },
|
|
|
- {
|
|
|
- type: "email",
|
|
|
- message: "'请输入正确的邮箱地址",
|
|
|
- trigger: ["blur", "change"]
|
|
|
- }
|
|
|
- ],
|
|
|
- phonenumber: [
|
|
|
- { required: true, message: "手机号码不能为空", trigger: "blur" },
|
|
|
- {
|
|
|
- pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
|
|
|
- message: "请输入正确的手机号码",
|
|
|
- trigger: "blur"
|
|
|
- }
|
|
|
- ]
|
|
|
+ // email: [
|
|
|
+ // { required: true, message: "邮箱地址不能为空", trigger: "blur" },
|
|
|
+ // {
|
|
|
+ // type: "email",
|
|
|
+ // message: "'请输入正确的邮箱地址",
|
|
|
+ // trigger: ["blur", "change"]
|
|
|
+ // }
|
|
|
+ // ],
|
|
|
+ // phonenumber: [
|
|
|
+ // { required: true, message: "手机号码不能为空", trigger: "blur" },
|
|
|
+ // {
|
|
|
+ // pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
|
|
|
+ // message: "请输入正确的手机号码",
|
|
|
+ // trigger: "blur"
|
|
|
+ // }
|
|
|
+ // ]
|
|
|
}
|
|
|
};
|
|
|
},
|
|
@@ -462,7 +451,7 @@ export default {
|
|
|
this.sexOptions = response.data;
|
|
|
});
|
|
|
this.getConfigKey("sys.user.initPassword").then(response => {
|
|
|
- this.initPassword = response.msg;
|
|
|
+ this.initPassword = response.data;
|
|
|
});
|
|
|
},
|
|
|
methods: {
|
|
@@ -557,6 +546,8 @@ export default {
|
|
|
this.open = true;
|
|
|
this.title = "添加用户";
|
|
|
this.form.password = this.initPassword;
|
|
|
+ this.form.roleIds= [response.data.roles[0].roleId]
|
|
|
+
|
|
|
});
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
@@ -569,7 +560,7 @@ export default {
|
|
|
this.postOptions = response.data.posts;
|
|
|
this.roleOptions = response.data.roles;
|
|
|
this.form.postIds = response.data.postIds;
|
|
|
- this.form.roleIds = response.data.roleIds;
|
|
|
+ this.form.roleIds= response.data.roleIds
|
|
|
this.open = true;
|
|
|
this.title = "修改用户";
|
|
|
this.form.password = "";
|