From 5a40d0ff8a5be7ac1aa50cd3943ed5cb0bab9f3f Mon Sep 17 00:00:00 2001
From: paidaxing444 <12qwaszx>
Date: Sat, 18 Apr 2020 20:09:15 +0800
Subject: [PATCH] =?UTF-8?q?20200418-zlp-1=20=E7=94=A8=E6=88=B7=E7=AE=A1?=
=?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/permission.js | 3 +-
ruoyi-ui/src/views/system/user/index.vue | 59 ++++---------------
.../views/system/user/profile/userInfo.vue | 4 +-
.../system/controller/SysUserController.java | 2 +
4 files changed, 17 insertions(+), 51 deletions(-)
diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js
index 1813f429f..813e971d3 100644
--- a/ruoyi-ui/src/permission.js
+++ b/ruoyi-ui/src/permission.js
@@ -7,7 +7,8 @@ import { getToken } from '@/utils/auth'
NProgress.configure({ showSpinner: false })
-const whiteList = ['/login', '/auth-redirect', '/bind', '/register']
+//const whiteList = ['/login', '/auth-redirect', '/bind', '/register']
+const whiteList = ['/login']
router.beforeEach((to, from, next) => {
NProgress.start()
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 1349ef7d9..00089330d 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -38,16 +38,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="手机号码" prop="phonenumber">
- <el-input
- v-model="queryParams.phonenumber"
- placeholder="请输入手机号码"
- clearable
- size="small"
- style="width: 240px"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
@@ -136,13 +126,13 @@
<el-table-column type="selection" width="40" align="center" />
<el-table-column label="用户编号" align="center" prop="userId" />
<el-table-column
- label="用户名称"
+ label="登录账号"
align="center"
prop="userName"
:show-overflow-tooltip="true"
/>
<el-table-column
- label="用户昵称"
+ label="用户姓名"
align="center"
prop="nickName"
:show-overflow-tooltip="true"
@@ -152,8 +142,7 @@
align="center"
prop="dept.deptName"
:show-overflow-tooltip="true"
- />
- <el-table-column label="手机号码" align="center" prop="phonenumber" width="120" />
+ />
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<el-switch
@@ -217,8 +206,8 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
- <el-form-item label="用户昵称" prop="nickName">
- <el-input v-model="form.nickName" placeholder="请输入用户昵称" />
+ <el-form-item label="用户姓名" prop="nickName">
+ <el-input v-model="form.nickName" placeholder="请输入用户姓名" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -227,18 +216,8 @@
</el-form-item>
</el-col>
<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>
- </el-col>
- <el-col :span="12">
- <el-form-item label="用户名称" prop="userName">
- <el-input v-model="form.userName" placeholder="请输入用户名称" />
+ <el-form-item label="登录账号" prop="userName">
+ <el-input v-model="form.userName" placeholder="请输入手机号码" maxlength="11"/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -422,14 +401,16 @@ export default {
pageNum: 1,
pageSize: 10,
userName: undefined,
- phonenumber: undefined,
status: undefined,
deptId: undefined
},
// 表单校验
rules: {
userName: [
- { required: true, message: "用户名称不能为空", trigger: "blur" }
+ { required: true,
+ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+ message: "请输入正确的手机号码",
+ trigger: "blur" }
],
nickName: [
{ required: true, message: "用户昵称不能为空", trigger: "blur" }
@@ -439,22 +420,6 @@ export default {
],
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"
- }
]
}
};
@@ -541,8 +506,6 @@ export default {
userName: undefined,
nickName: undefined,
password: undefined,
- phonenumber: undefined,
- email: undefined,
sex: undefined,
status: "0",
remark: undefined,
diff --git a/ruoyi-ui/src/views/system/user/profile/userInfo.vue b/ruoyi-ui/src/views/system/user/profile/userInfo.vue
index 2e8ef99d9..d2ce0558f 100644
--- a/ruoyi-ui/src/views/system/user/profile/userInfo.vue
+++ b/ruoyi-ui/src/views/system/user/profile/userInfo.vue
@@ -11,8 +11,8 @@
</el-form-item>
<el-form-item label="性别">
<el-radio-group v-model="user.sex">
- <el-radio label="0">男</el-radio>
- <el-radio label="1">女</el-radio>
+ <el-radio label="1">男</el-radio>
+ <el-radio label="2">女</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item>
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
index a1eb4423f..4403faf5b 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
@@ -132,6 +132,8 @@ public class SysUserController extends BaseController
{
return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
}
+ user.setPhonenumber(user.getUserName());
+ user.setEmail(user.getUserName()+"@benyi.com");
user.setCreateBy(SecurityUtils.getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
return toAjax(userService.insertUser(user));