Skip to content

X
xzxt-shiro
Commit f316d2e0 by liuyongshuai Committed by liuyongshuai
Options

完善用户的增加和更新功能。

parent b39e0840
Showing with 119 additions and 47 deletions
src/main/java/com/xzxtshiro/pojo/SysUser.java
...@@ -4,10 +4,10 @@ import lombok.AllArgsConstructor; ...@@ -4,10 +4,10 @@ import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.extern.log4j.Log4j; import lombok.extern.log4j.Log4j;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.File; import java.io.File;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@Data @Data
@Log4j @Log4j
...@@ -47,6 +47,7 @@ public class SysUser extends BaseModel implements Serializable { ...@@ -47,6 +47,7 @@ public class SysUser extends BaseModel implements Serializable {
protected String sex; protected String sex;
@DateTimeFormat(pattern = "yyyy-MM-dd")
protected Date birthday; protected Date birthday;
protected String telephone; protected String telephone;
......
src/main/webapp/WEB-INF/jsp/admin/user/add.jsp
...@@ -8,19 +8,6 @@ ...@@ -8,19 +8,6 @@
<meta name="viewport" <meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<title>添加用户</title> <title>添加用户</title>
<style>
.layui-upload{
position: absolute;
right: -321px;
}
.layui-upload-img{
width: 110px;
height: 140px;
}
.btx>label{
color: red;
}
</style>
</head> </head>
<body> <body>
...@@ -79,29 +66,29 @@ ...@@ -79,29 +66,29 @@
<div class="layui-form-item btx"> <div class="layui-form-item btx">
<label class="layui-form-label">登录密码</label> <label class="layui-form-label">登录密码</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="password" name="password" placeholder="请输入密码" <input type="password" name="password" id="password" lay-verify="required" placeholder="请输入密码"
value="${user.password}" class="layui-input"> value="${user.password}" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item btx"> <div class="layui-form-item btx">
<label class="layui-form-label">密码确认</label> <label class="layui-form-label">密码确认</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="password" name="repassword" placeholder="请输入确认密码" <input type="password" name="repassword" lay-verify="repwd" placeholder="请输入确认密码"
value="${user.password}" class="layui-input"> value="${user.password}" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item btx"> <div class="layui-form-item btx">
<label class="layui-form-label">身份证号码</label> <label class="layui-form-label">身份证号码</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="identitycard" lay-verify="identity" placeholder="请输入身份证号" <input type="text" name="identitycard" lay-verify="identitycard" placeholder="请输入身份证号"
value="${user.identitycard}" class="layui-input"> value="${user.identitycard}" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">出生日期</label> <label class="layui-form-label">出生日期</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="birthday" id="birthday" placeholder="" <input type="text" name="birthday" id="birthday" placeholder="请选择出生日期"
value="${user.birthday}" class="layui-laydate-list"> value="${user.birthday}" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item btx"> <div class="layui-form-item btx">
...@@ -114,14 +101,14 @@ ...@@ -114,14 +101,14 @@
<div class="layui-form-item btx"> <div class="layui-form-item btx">
<label class="layui-form-label">用户警号</label> <label class="layui-form-label">用户警号</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="policemanid" placeholder="请输入警号" <input type="text" name="policemanid" placeholder="请输入警号" lay-verify="required"
value="${user.policemanid}" class="layui-input"> value="${user.policemanid}" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item btx"> <div class="layui-form-item btx">
<label class="layui-form-label">用户等级</label> <label class="layui-form-label">用户等级</label>
<div class="layui-input-block"> <div class="layui-input-block">
<select id="grade" name="grade" lay-verify="" lay-filter="type"> <select id="grade" name="grade" lay-verify="required" lay-filter="type">
<option value="">请选择</option> <option value="">请选择</option>
<option value="X">县级</option> <option value="X">县级</option>
<option value="D">地市级</option> <option value="D">地市级</option>
...@@ -243,7 +230,8 @@ ...@@ -243,7 +230,8 @@
if (msg.length!=""){ if (msg.length!=""){
layer.msg(msg, {icon: 5}); layer.msg(msg, {icon: 5});
} }
//验证表单数据
chechFormData(form);
//设置用户等级回显 //设置用户等级回显
var grade = "${user.grade}"; var grade = "${user.grade}";
$("#grade").val(grade); $("#grade").val(grade);
......
src/main/webapp/WEB-INF/jsp/admin/user/inc.jsp
<%@ page contentType="text/html;charset=UTF-8" language="java"%> <%@ page contentType="text/html;charset=UTF-8" language="java"%>
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/layui/css/layui.css" media="all"> <link rel="stylesheet" href="${pageContext.request.contextPath}/resources/layui/css/layui.css" media="all">
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/common/css/common.css" media="all">
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/ztree/metroStyle/metroStyle.css"/> <link rel="stylesheet" href="${pageContext.request.contextPath}/resources/ztree/metroStyle/metroStyle.css"/>
<script src="${pageContext.request.contextPath}/resources/jquery-3.1.0.min.js"></script> <script src="${pageContext.request.contextPath}/resources/jquery-3.1.0.min.js"></script>
<script src="${pageContext.request.contextPath}/resources/ztree/ztree/jquery.ztree.core.js"></script> <script src="${pageContext.request.contextPath}/resources/ztree/ztree/jquery.ztree.core.js"></script>
......
src/main/webapp/WEB-INF/jsp/admin/user/update.jsp
...@@ -8,16 +8,6 @@ ...@@ -8,16 +8,6 @@
<meta name="viewport" <meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<title>修改用户</title> <title>修改用户</title>
<style>
.layui-upload{
position: absolute;
right: -321px;
}
.layui-upload-img{
width: 110px;
height: 140px;
}
</style>
</head> </head>
<body> <body>
...@@ -49,7 +39,7 @@ ...@@ -49,7 +39,7 @@
action="${pageContext.request.contextPath}/admin/user/update/" action="${pageContext.request.contextPath}/admin/user/update/"
method="post"> method="post">
<input type="text" name="id" placeholder="用户ID" value="${user.id}" hidden> <input type="text" name="id" placeholder="用户ID" value="${user.id}" hidden>
<div class="layui-form-item"> <div class="layui-form-item btx">
<label class="layui-form-label">登录名</label> <label class="layui-form-label">登录名</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="username" lay-verify="required" placeholder="请输入员工工号" <input type="text" name="username" lay-verify="required" placeholder="请输入员工工号"
...@@ -57,7 +47,7 @@ ...@@ -57,7 +47,7 @@
class="layui-input"> class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item btx">
<label class="layui-form-label">用户姓名</label> <label class="layui-form-label">用户姓名</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="trueName" lay-verify="required" placeholder="请输入用户姓名" <input type="text" name="trueName" lay-verify="required" placeholder="请输入用户姓名"
...@@ -81,39 +71,46 @@ ...@@ -81,39 +71,46 @@
<input type="hidden" id="yhzpPath" name="yhzpPath" value=""/> <input type="hidden" id="yhzpPath" name="yhzpPath" value=""/>
<button type="button" class="layui-btn" id="yhzpBtn"><i class="layui-icon"></i>上传照片</button> <button type="button" class="layui-btn" id="yhzpBtn"><i class="layui-icon"></i>上传照片</button>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item btx">
<label class="layui-form-label">登录密码</label> <label class="layui-form-label">登录密码</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="password" placeholder="默认密码000000" value="${user.password}" <input type="text" name="password" lay-verify="required" placeholder="默认密码000000" value="${user.password}"
class="layui-input"> class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item btx">
<label class="layui-form-label">身份证号码</label> <label class="layui-form-label">身份证号码</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="identitycard" placeholder="请输入身份证号" <input type="text" name="identitycard" lay-verify="identitycard" placeholder="请输入身份证号"
value="${user.identitycard}" class="layui-input"> value="${user.identitycard}" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">出生日期</label>
<div class="layui-input-block">
<input type="text" name="birthday" id="birthday" placeholder="请选择出生日期"
class="layui-input">
</div>
</div>
<div class="layui-form-item btx">
<label class="layui-form-label">联系电话</label> <label class="layui-form-label">联系电话</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="telephone" placeholder="请输入联系电话" <input type="text" name="telephone" lay-verify="phone" placeholder="请输入联系电话"
value="${user.telephone}" class="layui-input"> value="${user.telephone}" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item btx">
<label class="layui-form-label">用户警号</label> <label class="layui-form-label">用户警号</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="policemanid" placeholder="请输入警号" <input type="text" name="policemanid" lay-verify="required" placeholder="请输入警号"
value="${user.policemanid}" class="layui-input"> value="${user.policemanid}" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item btx">
<label class="layui-form-label">用户等级</label> <label class="layui-form-label">用户等级</label>
<div class="layui-input-block"> <div class="layui-input-block">
<select id="grade" name="grade" lay-verify="" lay-filter="grade"> <select id="grade" name="grade" lay-verify="required" lay-filter="grade">
<option value="">请选择</option> <option value="">请选择</option>
<option value="X">县级</option> <option value="X">县级</option>
<option value="D">地市级</option> <option value="D">地市级</option>
...@@ -122,7 +119,7 @@ ...@@ -122,7 +119,7 @@
</select> </select>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item btx">
<label class="layui-form-label">所属单位</label> <label class="layui-form-label">所属单位</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="unitname" id="unitname" lay-verify="required" <input type="text" name="unitname" id="unitname" lay-verify="required"
...@@ -135,7 +132,7 @@ ...@@ -135,7 +132,7 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item btx">
<label class="layui-form-label">用户角色</label> <label class="layui-form-label">用户角色</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="roleName" id="roleName" lay-verify="required" <input type="text" name="roleName" id="roleName" lay-verify="required"
...@@ -148,6 +145,13 @@ ...@@ -148,6 +145,13 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">备注</label>
<div class="layui-input-block">
<input type="text" name="remark" placeholder="请输入备注"
value="${user.remark}" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">用户状态</label> <label class="layui-form-label">用户状态</label>
<div class="layui-input-block"> <div class="layui-input-block">
<c:if test="${user.openFlag==0 or user.openFlag==null}"> <c:if test="${user.openFlag==0 or user.openFlag==null}">
...@@ -161,6 +165,19 @@ ...@@ -161,6 +165,19 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">性别</label>
<div class="layui-input-block">
<c:if test="${user.sex==1 or user.sex==null}">
<input type="radio" name="sex" value="1" title="男" checked>
<input type="radio" name="sex" value="2" title="女">
</c:if>
<c:if test="${user.sex==2}">
<input type="radio" name="sex" value="1" title="男">
<input type="radio" name="sex" value="2" title="女" checked>
</c:if>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">显示照片</label> <label class="layui-form-label">显示照片</label>
<div class="layui-input-block"> <div class="layui-input-block">
<c:if test="${user.isShow==0 or user.isShow==null}"> <c:if test="${user.isShow==0 or user.isShow==null}">
...@@ -186,6 +203,10 @@ ...@@ -186,6 +203,10 @@
<span hidden id="msg">${msg}</span> <span hidden id="msg">${msg}</span>
<script src="${pageContext.request.contextPath}/resources/layui/layui.js"></script> <script src="${pageContext.request.contextPath}/resources/layui/layui.js"></script>
<script> <script>
//加载日期插件
laydate.render({
elem: '#birthday' //指定元素
});
layui.use(['element', 'form', 'jquery'], function () { layui.use(['element', 'form', 'jquery'], function () {
var form = layui.form, var form = layui.form,
layer = layui.layer, layer = layui.layer,
...@@ -207,6 +228,8 @@ ...@@ -207,6 +228,8 @@
if (msg.length!=""){ if (msg.length!=""){
layer.msg(msg, {icon: 5}); layer.msg(msg, {icon: 5});
} }
//验证表单数据
chechFormData(form);
//设置原有单位回显 //设置原有单位回显
var unitname = "${user.unitname}"; var unitname = "${user.unitname}";
var unitcode = "${user.unitcode}"; var unitcode = "${user.unitcode}";
...@@ -216,6 +239,11 @@ ...@@ -216,6 +239,11 @@
var grade = "${user.grade}"; var grade = "${user.grade}";
$("#grade").val(grade); $("#grade").val(grade);
form.render('select'); form.render('select');
//出生日期转化
var birthday = "${user.birthday}";
$("#birthday").val(formatTime(birthday));
var data = ${unit}; var data = ${unit};
var zNodes =[]; var zNodes =[];
......
src/main/webapp/resources/common/common.js
...@@ -113,4 +113,47 @@ function checkTree(treeId){ ...@@ -113,4 +113,47 @@ function checkTree(treeId){
skin: 'layui-layer-demo', //加上边框 skin: 'layui-layer-demo', //加上边框
content: $("#"+treeId) content: $("#"+treeId)
}); });
} }
\ No newline at end of file /**
* 格林威治时间转化
* @param time
* @returns {string}
*/
function formatTime(time){
var now = new Date(time);
var year = now.getFullYear();
var mon = now.getMonth()+1;
var date= now.getDate();
if(mon<10){
mon = '0'+mon;
};
if(date<10){
date = '0'+date;
}
var postDate = year+'-'+mon+'-'+date;
return postDate;
}
//验证表单数据
function chechFormData(form) {
form.verify({
identitycard: function (value) { //昵称 value：表单的值、item：表单的DOM对象
var reg = /^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/;
if (value.length > 0 ) {
console.log(reg.test(value));
if(reg.test(value)===false){
return '身份证号码格式不正确！';
}
}else {
return '身份证号码不能为空';
}
},
repwd: function (value) {
//获取密码
var pwd = $("#password").val();
if (pwd != value) {
return '两次输入的密码不一致';
}
}
});
}
src/main/webapp/resources/common/css/common.css 0 → 100644
.layui-upload{
position: absolute;
right: -321px;
}
.layui-upload-img{
width: 110px;
height: 140px;
}
.btx>label{
color: red;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment