用户UI修改

VisualInspection/css/user/addUser.css

@@ -0,0 +1,10 @@
+.ll{
+    width: 120px;
+}
+
+.lll{
+    padding-right: 0px;
+}
+.cc {
+    padding-left: 20px;
+}

VisualInspection/js/user/addUser.js

@@ -73,7 +73,7 @@ function initUserInfo() {
     $("#user_position").val(usertemp.positionid)
     $("#user_idno").val(usertemp.idno)
     $("#user_email").val(usertemp.email)
-    
+
     $("#user_img_pre2").html("")
     $("#user_img_add").removeClass("hide");
     $("#user_img_pre").addClass("hide");
@@ -111,10 +111,10 @@ function initUserInfo() {
     var attr = [];
     if (usertemp.roles.length > 0) {
         for (var j = 0; j < usertemp.roles.length; j++) {
-           var ii={};
-           ii["id"]=usertemp.roles[j].id;
-           ii["title"]=usertemp.roles[j].des;
-           attr.push(ii);
+            var ii = {};
+            ii["id"] = usertemp.roles[j].id;
+            ii["title"] = usertemp.roles[j].des;
+            attr.push(ii);
         }
     }
 
@@ -142,21 +142,45 @@ function addUser() {
     var userposition = $("#user_position").val();
     var usertruename = $("#user_true_name").val();
     var userroles = role_selectinput.getSelectedItemsId();
-
+    if (userpassword != null && typeof (userpassword) != "undefined" && userpassword != userconfirmpassword) {
+        layer.msg('密码不一致！', {
+            time: 2000, //20s后自动关闭
+        });
+        return;
+    }
     var parm = {
-        "username": username,
-        "password": userpassword,
-        "mobile": usermobile,
-        "phone": usermobile,
-        "workno": userworkno,
-        "idno": useridno,
-        "email": useremail,
-        "pic": userpic,
         "organid": dept_selectinput.value,
         "positionid": 1,
         "truename": usertruename,
-        "roleids":userroles
+        "roleids": userroles
+    }
+
+    if (userpassword != null && typeof (userpassword) != "undefined") {
+        parm["password"] = userpassword;
+    }
+    if (usermobile != null && typeof (usermobile) != "undefined") {
+        parm["mobile"] = usermobile;
+        parm["phone"] = usermobile;
     }
+    if (username != null && typeof (username) != "undefined") {
+        parm["username"] = username;
+    }
+    if (userworkno != null && typeof (userworkno) != "undefined") {
+        parm["workno"] = userworkno;
+    }
+    if (useridno != null && typeof (useridno) != "undefined") {
+        parm["idno"] = useridno;
+    }
+    if (useremail != null && typeof (useremail) != "undefined") {
+        parm["email"] = useridno;
+    }
+    if (userpic != null && typeof (userpic) != "undefined") {
+        parm["pic"] = userpic;
+    }
+
+
+
+
     if (edittype == "edit") {
         parm["id"] = usertemp.id;
         UserUpdate(parm, function (data) {

VisualInspection/view/user/addUser.html

@@ -14,32 +14,32 @@
         <div class="form-group" style="margin-bottom:0">
             <div class="col-md-8">
                 <div class="form-group">
-                    <label for="exampleInputAccount4" class="col-sm-3">账号：</label>
+                    <label for="exampleInputAccount4" class="col-sm-3 ll">账号：</label>
                     <div class="col-md-9 col-sm-9">
                         <input type="text" id="user_name" class="form-control" placeholder="账号">
                     </div>
                 </div>
                 <div class="form-group">
-                    <label for="exampleInputAccount4" class="col-sm-3">真实姓名：</label>
+                    <label for="exampleInputAccount4" class="col-sm-3 ll">真实姓名：</label>
                     <div class="col-md-9 col-sm-9">
                         <input type="text" id="user_true_name" class="form-control" placeholder="真实姓名">
                     </div>
                 </div>
                 <div class="form-group">
-                    <label for="exampleInputAccount4" class="col-sm-3">工号：</label>
+                    <label for="exampleInputAccount4" class="col-sm-3 ll">工号：</label>
                     <div class="col-md-9 col-sm-9">
                         <input type="text" id="user_workno" class="form-control" placeholder="工号">
                     </div>
                 </div>
 
                 <div class="form-group">
-                    <label for="exampleInputAccount4" class="col-sm-3">密码：</label>
+                    <label for="exampleInputAccount4" class="col-sm-3 ll">密码：</label>
                     <div class="col-md-9 col-sm-9">
                         <input type="text" id="user_password" class="form-control" placeholder="密码">
                     </div>
                 </div>
                 <div class="form-group">
-                    <label for="exampleInputAccount4" class="col-sm-3">确定密码：</label>
+                    <label for="exampleInputAccount4" class="col-sm-3 ll">确定密码：</label>
                     <div class="col-md-9 col-sm-9">
                         <input type="text" id="user_confirm_password" class="form-control" placeholder="确认密码">
                     </div>
@@ -48,7 +48,7 @@
 
 
             </div>
-            <div class="col-md-4">
+            <div class="col-md-4" style="width:140px">
                 <div class="row hide" id="user_img_pre">
                     <section class='up-section fl loading' id="user_img_pre2">
                     </section>
@@ -77,40 +77,40 @@
 
 
         <div class="form-group">
-            <label for="exampleInputPassword4" class="col-sm-2">用户角色：</label>
-            <div class="col-md-10 col-sm-10">
+            <label for="exampleInputPassword4" class="col-sm-2 ll lll">用户角色：</label>
+            <div class="col-md-10 col-sm-10 cc">
                 <input type="text" id="user_role_select" class="form-control" placeholder="请选择角色">
 
             </div>
         </div>
         <div class="form-group">
-            <label for="exampleInputPassword4" class="col-sm-2">组织机构：</label>
-            <div class="col-md-10 col-sm-10">
+            <label for="exampleInputPassword4" class="col-sm-2  ll lll">组织机构：</label>
+            <div class="col-md-10 col-sm-10 cc">
                 <div id="user_dept_select">选择部门</div>
 
             </div>
         </div>
         <div class="form-group">
-            <label for="exampleInputAccount4" class="col-sm-2">手机：</label>
-            <div class="col-md-10 col-sm-10">
+            <label for="exampleInputAccount4" class="col-sm-2  ll lll">手机：</label>
+            <div class="col-md-10 col-sm-10 cc">
                 <input type="text" id="user_mobile" class="form-control" placeholder="手机号">
             </div>
         </div>
         <div class="form-group">
-            <label for="exampleInputAccount4" class="col-sm-2">职位：</label>
-            <div class="col-md-10 col-sm-10">
+            <label for="exampleInputAccount4" class="col-sm-2  ll lll">职位：</label>
+            <div class="col-md-10 col-sm-10 cc">
                 <input type="text" id="user_position" class="form-control" placeholder="职位">
             </div>
         </div>
         <div class="form-group">
-            <label for="exampleInputAccount4" class="col-sm-2">身份证：</label>
-            <div class="col-md-10 col-sm-10">
+            <label for="exampleInputAccount4" class="col-sm-2  ll lll">身份证：</label>
+            <div class="col-md-10 col-sm-10 cc">
                 <input type="text" id="user_idno" class="form-control" placeholder="身份证">
             </div>
         </div>
         <div class="form-group">
-            <label for="exampleInputAccount4" class="col-sm-2">邮箱：</label>
-            <div class="col-md-10 col-sm-10">
+            <label for="exampleInputAccount4" class="col-sm-2  ll lll">邮箱：</label>
+            <div class="col-md-10 col-sm-10 cc">
                 <input type="text" id="user_email" class="form-control" placeholder="邮箱">
             </div>
         </div>

VisualInspection/view/user/userManager.html

@@ -62,7 +62,7 @@
 </div>
 
 <div class="modal fade" id="addUserModal">
-    <div class="modal-dialog">
+    <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/UserController.java

@@ -107,8 +107,10 @@ public class UserController extends BaseController {
     public String updateUser(@RequestBody User user,@PathVariable int userid){
         try{
         	user.setId(userid);
-        	if(user.getPassword()!=null){
+        	if(user.getPassword()!=null && user.getPassword()!=""){
         		user.setPassword(new Md5PasswordEncoder().encodePassword(user.getPassword(), null));
+        	}else{
+        		user.setPassword(null);
         	}
         	if(user.getRoleids()!=null){
         		roleService.roleUnBindUser(user.getId());