Skip to content

T
tjmdp
Commit cebace75 authored by liuchao's avatar liuchao
Browse files
Options

no message

parent 7355188e
Hide whitespace changes
Inline Side-by-side
Showing with 377 additions and 90 deletions
src/main/java/com/qiankun/controller/UserController.java
View file @ cebace75
......@@ -54,9 +54,10 @@ public class UserController extends BaseController<Object>{
@RequestMapping("/user/add")
public ModelAndView index() throws Exception {
ModelAndView t_view = new ModelAndView();
t_view.setViewName("user/saveuser");
return t_view;
ModelAndView view = new ModelAndView();
view.setViewName("user/saveuser");
view.getModel().put("dict", dict());
return view;
}
@Auth(verifyLogin = false, verifyURL = false)
......
src/main/java/com/qiankun/controller/base/BaseController.java
View file @ cebace75
......@@ -212,6 +212,8 @@ public class BaseController<Entity> extends MultiActionController {
String[] relation = rb.getString("relation").split(","); //关系
String[] education = rb.getString("education").split(","); //学历
String[] paperType = rb.getString("paperType").split(","); //证件类型
String[] nationality = rb.getString("nationality").split(","); //国籍
Map<String, Object> map = new HashMap<>();
map.put("nation", nation);
......@@ -221,6 +223,7 @@ public class BaseController<Entity> extends MultiActionController {
map.put("relation", relation);
map.put("education", education);
map.put("paperType", paperType);
map.put("nationality", nationality);
return map;
......
src/main/resources/system.properties
View file @ cebace75
......@@ -26,4 +26,4 @@ bloodType=\u672a\u77e5,A,B,O,AB,A:RH+,B:RH+,AB:RH+,O:RH+,A:RH-,B:RH-,AB:RH-,O:RH
relation=\u7236\u6bcd,\u5144\u59b9,\u914d\u5076,\u5b50\u5973,\u4eb2\u5c5e,\u670b\u53cb
education=\u521d\u4e2d,\u9ad8\u4e2d,\u4e13\u79d1,\u672c\u79d1,\u7855\u58eb,\u535a\u58eb
paperType=\u8eab\u4efd\u8bc1,\u62a4\u7167,\u519b\u5b98\u8bc1
nationality=\u4e2d\u56fd,\u5176\u4ed6
src/main/webapp/WEB-INF/decorators/main.jsp
View file @ cebace75
......@@ -38,6 +38,7 @@
<link rel="stylesheet" href="<webpath:path/>/resources/assets/css/hsCheckData/hsCheckData.css" />
<link rel="stylesheet" href="<webpath:path/>/resources/css/page.css"/>
<link rel="stylesheet" href="<webpath:path/>/resources/css/style.css"/>
<!--[if lte IE 8] >
<link rel="stylesheet" href="<webpath:path/>/resources/assets/css/ace-ie.min.css"/>
<![endif] -->
......
src/main/webapp/WEB-INF/pages/user/saveuser.jsp
View file @ cebace75
......@@ -32,42 +32,59 @@
<div class="col-xs-12">
<form action="#" id="userForm" name="userForm" method="post" onsubmit="return false" class="form-horizontal" role="form">
<div class="row">
<div class="col-xs-12">
<h3 class="header smaller lighter blue">用户信息</h3></div>
</div>
<div class="page-header">
<h1>
新增用户
<small>
<i class="icon-double-angle-right"></i>
请填写用户基本信息
</small>
</h1>
</div><!-- /.page-header -->
<form action="#" id="reg_form" name="reg_form" method="post" onsubmit="return false" class="form-horizontal" role="form">
<div class="row">
<div class="col-xs-4">
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 姓名 </label>
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 角色 </label>
<div class="col-sm-9">
<select class="col-xs-10 col-sm-10" id="role" name="role">
<option value="2">普通用户</option>
<option value="1">管理员</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> <font color="red">*</font> 姓名 </label>
<div class="col-sm-9">
<input type="text" id="name" name="name" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
<div class="space-4"></div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-2"> 性别 </label>
<div class="col-sm-9">
<input type="text" id="gender" name="gender" placeholder="" class="col-xs-10 col-sm-10" />
<label>
<input name="gender" type="radio" class="ace" value="male">
<span class="lbl"> 男</span>
</label>
<label>
<input name="gender" type="radio" class="ace" value="female">
<span class="lbl"> 女</span>
</label>
</div>
</div>
<div class="space-4"></div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-input-readonly"> 出生日期 </label>
<label class="col-sm-3 control-label no-padding-right" for="form-input-readonly"> <font color="red">*</font> 出生日期 </label>
<div class="col-sm-9">
<input class="col-xs-10 col-sm-10" id="birthday" name="birthday" type="text" data-date-format="yyyy-mm-dd" />
......@@ -75,23 +92,31 @@
</div>
</div>
<div class="space-4"></div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-input-readonly"> 证件类型 </label>
<label class="col-sm-3 control-label no-padding-right" for="form-input-readonly"> <font color="red">*</font> 证件类型 </label>
<div class="col-sm-9">
<select class="col-xs-10 col-sm-10" id="paperType" name="paperType">
<option value="1">身份证</option>
<c:forEach var="value" items="${dict.paperType}">
<option value="${value}">${value}</option>
</c:forEach>
</select>
</div>
</div>
<div class="space-4"></div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-input-readonly"> 证件号码 </label>
<label class="col-sm-3 control-label no-padding-right" for="form-input-readonly"> <font color="red">*</font> 证件号码 </label>
<div class="col-sm-9">
<input type="text" id="paperId" name="paperId" placeholder="" class="col-xs-10 col-sm-10" />
......@@ -99,86 +124,90 @@
</div>
</div>
<div class="space-4"></div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-input-readonly"> 民族 </label>
<div class="col-sm-9">
<select name="nation" id="nation" class="col-xs-10 col-sm-10">
<option value="1">汉族</option>
</select>
<c:forEach var="value" items="${dict.nation}">
<option value="${value}" >${value}</option>
</c:forEach>
</select>
</div>
</div>
<div class="space-4"></div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-input-readonly"> 国籍 </label>
<div class="col-sm-9">
<select class="col-xs-10 col-sm-10" id="nationality" name="nationality">
<option value="中国">中国</option>
<option value="其他">其他</option>
<c:forEach var="value" items="${dict.nationality}">
<option value="${value}">${value}</option>
</c:forEach>
</select>
</div>
</div>
<div class="space-4"></div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-input-readonly"> 籍贯 </label>
<div class="col-sm-9">
<div id="nativePlace" class="col-xs-10 col-sm-10"></div>
</div>
</div>
<div class="space-4"></div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-input-readonly"> 户籍所在地 </label>
<label class="col-sm-3 control-label no-padding-right" for="form-input-readonly"> <font color="red">*</font> 籍贯 </label>
<div class="col-sm-9">
<div id="domicilePlace" class="col-xs-10 col-sm-10"></div>
<select class="col-xs-10 col-sm-10" id="nativePlace" name="nativePlace">
<option value=""></option>
<c:forEach var="value" items="${dict.nativePlace}">
<option value="${value}">${value}</option>
</c:forEach>
</select>
</div>
</div>
<div class="space-4"></div>
</div>
<div class="col-xs-4">
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-input-readonly"> 户籍所在地 </label>
<div class="col-sm-9">
<input type="text" id="domicilePlace" name="domicilePlace" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 经常居住地</label>
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> <font color="red">*</font> 经常居住地</label>
<div class="col-sm-9">
<input type="text" id="addr" name="addr" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
<div class="space-4"></div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-input-readonly"> 学历</label>
<div class="col-sm-9">
<select class="col-xs-10 col-sm-10" id="education" name="education">
<option value="0"></option>
<option value="1">中专</option>
<option value="2">大专</option>
<option value="3">本科</option>
<option value="5">硕士</option>
<option value="6">博士</option>
<option value="">请选择</option>
<c:forEach var="value" items="${dict.education}">
<option value="${value}">${value}</option>
</c:forEach>
</select>
</div>
</div>
<div class="space-4"></div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 工作单位/学校 </label>
......@@ -187,7 +216,7 @@
<input type="text" id="unit" name="unit" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
<div class="space-4"></div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 职业 </label>
......@@ -196,7 +225,7 @@
<input type="text" id="profession" name="profession" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
<div class="space-4"></div>
<div class="form-group">
......@@ -206,7 +235,7 @@
<input type="text" id="unitAddr" name="unitAddr" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
<div class="space-4"></div>
<div class="form-group">
......@@ -216,16 +245,16 @@
<input type="text" id="unitTel" name="unitTel" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
<div class="space-4"></div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 本人手机 </label>
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> <font color="red">*</font> 本人手机 </label>
<div class="col-sm-9">
<input type="text" id="mobile" name="mobile" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
<div class="space-4"></div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 固定电话 </label>
......@@ -234,9 +263,12 @@
<input type="text" id="tel" name="tel" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
<div class="space-4"></div>
</div>
<div class="col-xs-4">
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 邮箱 </label>
......@@ -244,14 +276,7 @@
<input type="text" id="email" name="email" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
<div class="space-4"></div>
</div>
<div class="col-xs-4">
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> QQ号码 </label>
......@@ -259,7 +284,7 @@
<input type="text" id="qq" name="qq" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
<div class="space-4"></div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 微信号 </label>
......@@ -268,7 +293,7 @@
<input type="text" id="weixin" name="weixin" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
<div class="space-4"></div>
<div class="form-group">
......@@ -278,7 +303,7 @@
<input type="text" id="donateBloodCount" name="donateBloodCount" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
<div class="space-4"></div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 血型 </label>
......@@ -287,7 +312,7 @@
<input type="text" id="bloodType" name="bloodType" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
<div class="space-4"></div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 身高 </label>
......@@ -298,7 +323,7 @@
</span>
</div>
</div>
<div class="space-4"></div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 体重 </label>
......@@ -309,24 +334,152 @@
</span>
</div>
</div>
<div class="space-4"></div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 备注 </label>
<div class="col-sm-9">
<textarea rows="5" class="col-xs-10 col-sm-10" id="remark" name="remark"></textarea>
<textarea rows="4" class="col-xs-10 col-sm-10" id="remark" name="remark"></textarea>
</div>
</div>
<div class="space-4"></div>
</div>
</div>
<div class="row">
<div class="col-xs-4"></div>
<div class="col-xs-12">
<h3 class="header smaller lighter blue">联系人一（请填写直系亲属）</h3></div>
</div>
<div class="row">
<div class="col-xs-4">
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 姓名 </label>
<div class="col-sm-9">
<input type="text" id="contactsName1" name="contactsName1" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> QQ号 </label>
<div class="col-sm-9">
<input type="text" id="contactsQQ1" name="contactsQQ1" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
</div>
<div class="col-xs-4">
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 关系</label>
<div class="col-sm-9">
<input type="text" id="contactsRelation1" name="contactsRelation1" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 微信号</label>
<div class="col-sm-9">
<input type="text" id="contactsWeixin1" name="contactsWeixin1" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
</div>
<div class="col-xs-4">
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 手机</label>
<div class="col-sm-9">
<input type="text" id="contactsMobile1" name="contactsMobile1" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 联系地址</label>
<div class="col-sm-9">
<input type="text" id="contactsAddr1" name="contactsAddr1" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<h3 class="header smaller lighter blue">联系人二(请勿填写在校学生、现役士兵、未成年人)</h3></div>
</div>
<div class="row">
<div class="col-xs-4">
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 姓名 </label>
<div class="col-sm-9">
<input type="text" id="contactsName1" name="contactsName1" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> QQ号 </label>
<div class="col-sm-9">
<input type="text" id="contactsQQ1" name="contactsQQ1" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
</div>
<div class="col-xs-4">
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 关系</label>
<div class="col-sm-9">
<input type="text" id="contactsRelation1" name="contactsRelation1" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 微信号</label>
<div class="col-sm-9">
<input type="text" id="contactsWeixin1" name="contactsWeixin1" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
</div>
<div class="col-xs-4">
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 手机</label>
<div class="col-sm-9">
<input type="text" id="contactsMobile1" name="contactsMobile1" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label no-padding-right" for="form-field-1"> 联系地址</label>
<div class="col-sm-9">
<input type="text" id="contactsAddr1" name="contactsAddr1" placeholder="" class="col-xs-10 col-sm-10" />
</div>
</div>
</div>
</div>
......
src/main/webapp/resources/css/style.css
View file @ cebace75
......@@ -1047,4 +1047,8 @@ a.a15:active {
font-size: 14px;
letter-spacing: 0.47px;
line-height: 30px;
}
.form-group{
margin-bottom: 10px;
}
\ No newline at end of file
src/main/webapp/resources/js/user/user.js
View file @ cebace75
$(document).ready(function(){
if ($('#userForm').length>0){
$('#userForm').validate({
doNotHideMessage : true, //this option enables to show the error/success messages on tab switch.
errorElement : 'span', //default input error message container
errorClass : 'validate-inline', // default input error message class
focusInvalid : false, // do not focus the last invalid input
rules : {
"firstName" : {
required : true
},
"lastName" : {
required : true
},
"roleId" : {
required : true
},
"email" : {
required : true,
email : true
},
"password" : {
required : "#changePassword:checked"
},
"confirm_password" : {
required : "#changePassword:checked",
equalTo: "#password"
},
"roleId": {
required : true
},
"jobNumber" : {
required : "#isEmployee:checked"
},
"hireOnDateValue" : {
required : "#isEmployee:checked"
},
"clockId" : {
required : "#isEmployee:checked",
number : "#isEmployee:checked",
min : 1
},
"payId" : {
required : "#isEmployee:checked"
},
"paygroupId" : {
required : "#isEmployee:checked"
},
"departmentValue" : {
required : true
}
},
errorPlacement: function (error, element) { // render error placement for each input type
error.insertAfter(element); // for other inputs, just perform default behavoir
if (element.attr("name") == "roleId") {
$("#roleId-controls div a").attr("style","border-color: #b94a48 !important");
}
},
invalidHandler: function (event, validator) { //display error alert on form submit
parent.Loading.stop();
},
highlight: function (element) { // hightlight error inputs
$(element).closest('.help-inline').removeClass('ok'); // display OK icon
$(element).closest('.control-group').removeClass('success').addClass('error'); // set error class to the control group
},
unhighlight: function (element) { // revert the change dony by hightlight
$(element).closest('.control-group').removeClass('error'); // set error class to the control group
if ($(element).attr("name") == "roleId") {
$("#roleId-controls div a").attr("style","");
}
},
success: function (label) {
label.addClass('valid').closest('.control-group').removeClass('error'); // set success class to the control group
label.remove();
},
submitHandler: function(form){
user.save(form,false);
},
onfocusin: function( element, event ) {
}
});
}
$('#birthday').datepicker()
$("#nation").select2({
......@@ -6,20 +108,43 @@ $(document).ready(function(){
allowClear : true
});
$("#nationality").select2({
$("#nativePlace").select2({
placeholder : "请选择",
allowClear : true
});
$("#nativePlace").hsCheckData({
/* $("#domicilePlace").hsCheckData({
isShowCheckBox: false, //默认为false
data: cityData
});
});*/
$("#domicilePlace").hsCheckData({
isShowCheckBox: false, //默认为false
data: cityData
});
})
\ No newline at end of file
})
var user = {
save : function(form){
}
}
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