|
@@ -166,32 +166,32 @@
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="用户名称" prop="username" style="width: 90%">
|
|
|
- <el-input v-model="form.username" placeholder="请输入用户名称" />
|
|
|
+ <el-input v-model="form.username" clearable placeholder="请输入用户名称" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="用户昵称" prop="nickName" style="width: 90%">
|
|
|
- <el-input v-model="form.nickName" placeholder="请输入用户昵称" />
|
|
|
+ <el-input v-model="form.nickName" clearable placeholder="请输入用户昵称" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item v-if="form.userId == undefined" label="用户密码" prop="password" style="width: 90%">
|
|
|
- <el-input v-model="form.password" placeholder="请输入用户密码" type="password" />
|
|
|
+ <el-input v-model="form.password" clearable placeholder="请输入用户密码" type="password" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="手机号码" prop="phone" style="width: 90%">
|
|
|
- <el-input v-model="form.phone" placeholder="请输入手机号码" maxlength="11" />
|
|
|
+ <el-input v-model="form.phone" clearable placeholder="请输入手机号码" maxlength="11" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="邮箱" prop="email" style="width: 90%">
|
|
|
- <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
|
|
|
+ <el-input v-model="form.email" clearable placeholder="请输入邮箱" maxlength="50" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="角色" style="width: 90%">
|
|
|
- <el-select v-model="form.roleId" placeholder="请选择" style="width: 100%" @change="$forceUpdate()">
|
|
|
+ <el-select v-model="form.roleId" filterable clearable placeholder="请选择" style="width: 100%" @change="$forceUpdate()">
|
|
|
<el-option
|
|
|
v-for="item in roleOptions"
|
|
|
:key="item.roleId"
|
|
@@ -206,6 +206,8 @@
|
|
|
<el-form-item label="归属部门" prop="deptId" style="width: 90%">
|
|
|
<treeselect
|
|
|
v-model="form.deptId"
|
|
|
+ filterable
|
|
|
+ clearable
|
|
|
:options="deptOptions"
|
|
|
:normalizer="normalizer"
|
|
|
placeholder="请选择归属部门"
|
|
@@ -214,7 +216,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="岗位" style="width: 90%">
|
|
|
- <el-select v-model="form.postId" placeholder="请选择" style="width: 100%" @change="$forceUpdate()">
|
|
|
+ <el-select v-model="form.postId" filterable clearable placeholder="请选择" style="width: 100%" @change="$forceUpdate()">
|
|
|
<el-option
|
|
|
v-for="item in postOptions"
|
|
|
:key="item.postId"
|
|
@@ -228,7 +230,7 @@
|
|
|
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="备注" style="width: 95%">
|
|
|
- <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
|
|
+ <el-input v-model="form.remark" clearable type="textarea" placeholder="请输入内容" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
@@ -511,6 +513,10 @@ export default {
|
|
|
confirmButtonText: '确定',
|
|
|
cancelButtonText: '取消'
|
|
|
}).then(({ value }) => {
|
|
|
+ if (!value) {
|
|
|
+ this.msgError('重置密码不能为空')
|
|
|
+ return
|
|
|
+ }
|
|
|
resetUserPwd(row.userId, value).then(response => {
|
|
|
if (response.code === 200) {
|
|
|
this.msgSuccess('修改成功,新密码是:' + value)
|