|
|
@@ -128,50 +128,35 @@
|
|
|
<el-form :model="form" :rules="rules" ref="userRef" label-width="80px">
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="用户昵称" prop="nickName">
|
|
|
- <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
|
|
|
+ <el-form-item v-if="form.userId == undefined" label="帐号" prop="userName">
|
|
|
+ <el-input v-model="form.userName" placeholder="请输入帐号名称" maxlength="30" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="归属部门" prop="deptId">
|
|
|
- <el-tree-select v-model="form.deptId" :data="deptOptions"
|
|
|
- :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id"
|
|
|
- placeholder="请选择归属部门" check-strictly />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- <el-row>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="手机号码" prop="phonenumber">
|
|
|
- <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="邮箱" prop="email">
|
|
|
- <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
|
|
|
+ <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-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
|
|
|
- <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
|
|
|
+ <el-form-item label="姓名" prop="nickName">
|
|
|
+ <el-input v-model="form.nickName" placeholder="请输入姓名" maxlength="30" />
|
|
|
</el-form-item>
|
|
|
</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" maxlength="20"
|
|
|
- show-password />
|
|
|
+ <el-form-item label="归属部门" prop="deptId">
|
|
|
+ <el-tree-select v-model="form.deptId" :data="deptOptions"
|
|
|
+ :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id"
|
|
|
+ placeholder="请选择归属部门" check-strictly />
|
|
|
</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 sys_user_sex" :key="dict.value" :label="dict.label"
|
|
|
- :value="dict.value"></el-option>
|
|
|
- </el-select>
|
|
|
+ <el-form-item label="手机号码" prop="phonenumber">
|
|
|
+ <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
@@ -183,12 +168,13 @@
|
|
|
</el-form-item>
|
|
|
</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-form-item label="用户性别">
|
|
|
+ <el-select v-model="form.sex" placeholder="请选择">
|
|
|
+ <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label"
|
|
|
+ :value="dict.value"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -645,13 +631,13 @@
|
|
|
/** 新增按钮操作 */
|
|
|
function handleAdd() {
|
|
|
reset();
|
|
|
- getUser().then(response => {
|
|
|
- postOptions.value = response.posts;
|
|
|
- roleOptions.value = response.roles;
|
|
|
+ // getUser().then(response => {
|
|
|
+ // postOptions.value = response.posts;
|
|
|
+ // roleOptions.value = response.roles;
|
|
|
open.value = true;
|
|
|
title.value = "添加用户";
|
|
|
form.value.password = initPassword.value;
|
|
|
- });
|
|
|
+ // });
|
|
|
};
|
|
|
/** 修改按钮操作 */
|
|
|
function handleUpdate(row) {
|