From db28093d0496fd1ff2806b21e5f3f3cec90bc213 Mon Sep 17 00:00:00 2001
From: fangcheng <fangcheng@lymsh.com>
Date: Thu, 9 Mar 2017 15:16:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/cm/controller/sys/SysRolesController.java | 12 ++++++
 .../lyms/cm/controller/sys/SysUsersController.java | 12 ++++++
 .../main/webapp/WEB-INF/views/role/role_edit.html  |  9 ++++
 .../main/webapp/WEB-INF/views/role/role_list.html  | 45 ++++++++++++++------
 .../main/webapp/WEB-INF/views/user/user_edit.html  |  6 +--
 .../main/webapp/WEB-INF/views/user/user_list.html  | 49 ++++++++++++++--------
 6 files changed, 100 insertions(+), 33 deletions(-)

diff --git a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java
index 7070425..98bf6f6 100644
--- a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java
+++ b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java
@@ -61,6 +61,18 @@ public class SysRolesController extends BaseController {
         Page<SysRoles> page = getPage();
         EntityWrapper<SysRoles> ew = new EntityWrapper<SysRoles>();
         ew.where("ifDel=0");
+        String id = getParameter("id");
+        String name = getParameter("name");
+        String type = getParameter("type");
+        if(StrUtils.isNotEmpty(id)){
+            ew.and("id like {0}", name.trim() + "%");
+        }
+        if(StrUtils.isNotEmpty(name)){
+            ew.and("name like {0}", name.trim() + "%");
+        }
+        if(StrUtils.isNotEmpty(type)){
+            ew.and("type={0}", type);
+        }
         return toGridData(sysRolesService.selectPage(page, ew));
     }
 
diff --git a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java
index a223208..0bf45dd 100644
--- a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java
+++ b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java
@@ -92,6 +92,18 @@ public class SysUsersController extends BaseController {
 		Page<SysUsers> page = getPage();
 		EntityWrapper<SysUsers> ew = new EntityWrapper<SysUsers>();
         ew.where("ifDel=0");
+        String searchName = getParameter("name");
+        String searchAccount = getParameter("account");
+        String searchPhone = getParameter("phone");
+        if(StrUtils.isNotEmpty(searchName)){
+            ew.and("name like {0}", searchName.trim() + "%");
+        }
+        if(StrUtils.isNotEmpty(searchAccount)){
+            ew.and("account like {0}", searchAccount.trim() + "%");
+        }
+        if(StrUtils.isNotEmpty(searchPhone)){
+            ew.and("phone like {0}", searchPhone.trim() + "%");
+        }
 		page = userService.selectPage(page,ew);
 		return toGridData(page);
 	}
diff --git a/center.manager/src/main/webapp/WEB-INF/views/role/role_edit.html b/center.manager/src/main/webapp/WEB-INF/views/role/role_edit.html
index 759b78a..192e63d 100644
--- a/center.manager/src/main/webapp/WEB-INF/views/role/role_edit.html
+++ b/center.manager/src/main/webapp/WEB-INF/views/role/role_edit.html
@@ -120,6 +120,15 @@ $(function() {
 	                </div>
 	            </div>
 	            <div class="form-group">
+	            	<label class="col-sm-3 control-label">角色类型：</label>
+	                <div class="col-sm-8">
+	                    <select class="form-control m-b" name="type">
+                            <option value="1" #if ($role.type == 1) selected="selected" #end >用户角色</option>
+                            <option value="0" #if ($role.type == 0) selected="selected" #end >管理员角色</option>
+                        </select>
+	                </div>
+	            </div>
+	            <div class="form-group">
 	                <label class="col-sm-3 control-label">角色备注：</label>
 	                <div class="col-sm-8">
 	                    <input type="text" placeholder="角色备注" value="$!role.remarks" aria-required="true" required="true" class="form-control" minlength="2" name="remarks" id="remarks">
diff --git a/center.manager/src/main/webapp/WEB-INF/views/role/role_list.html b/center.manager/src/main/webapp/WEB-INF/views/role/role_list.html
index 788a59e..c3715e8 100644
--- a/center.manager/src/main/webapp/WEB-INF/views/role/role_list.html
+++ b/center.manager/src/main/webapp/WEB-INF/views/role/role_list.html
@@ -4,16 +4,23 @@
     	<div style="padding-top:30px;">
 	        <form role="form" class="form-inline">
 	            <div class="form-group">
-	                <input type="text" placeholder="请输入角色名称" id="usernameSearch" class="form-control">
+	                <input type="text" placeholder="角色名" id="searchName" class="form-control">
 	            </div>
 	            <div class="form-group">
-	                <input type="text" placeholder="请输入角色描述" id="idSearch" class="form-control">
+	            	<select class="form-control m-b" name="type" id="searchType" style="margin-bottom: 0;">
+	            		<option value="">所有</option>
+                        <option value="1">用户角色</option>
+                        <option value="0">管理员角色</option>
+                    </select>
+	            </div>
+	            <div class="form-group">
+	                <input type="text" placeholder="角色id编号" id="searchId" class="form-control">
 	            </div>
 	        </form>
         </div>
     </div>
     <div class="col-sm-2">
-        <div class="title-action">
+        <div class="title-action" onclick="search();">
             <a class="btn btn-primary"><i class="fa fa-search"></i> 查询</a>
         </div>
     </div>
@@ -35,6 +42,16 @@
 <script type="text/javascript">
 var controllerRequestMappint = "/sysRoles/";
 
+function search(){
+	var queryParams = {
+		query:{
+			name: $("#searchName").val(),
+			id: $("#searchId").val(),
+			type: $("#searchType").val()
+		}
+	}
+	$('#dataTable').bootstrapTable('refresh', queryParams );
+}
 function add() {
 	fullWindow("新增角色", APP.PATH + controllerRequestMappint + "0/toEdit");
 }
@@ -42,7 +59,7 @@ function add() {
 function edit(){
 	var id = getSingleSelectedValue("dataTable","id");
 	if(id){
-		fullWindow("修改橘色", APP.PATH + controllerRequestMappint + id + "/toEdit");
+		fullWindow("修改角色", APP.PATH + controllerRequestMappint + id + "/toEdit");
 	}
 }
 
@@ -56,28 +73,32 @@ var default_dataColumns = [{
 						    field: 'check_state',
 						    title: '',
 						    checkbox: true
-						},{
-						    field: 'id',
-						    title: '编号'
 						}, {
 						    field: 'name',
 						    title: '角色名'
 						}, {
 						    field: 'type',
-						    title: '角色类型'
-						}, {
+						    title: '角色类型',
+						    formatter:function(value,row,index){  
+						    	if(value == 0){
+						    		return '管理员'
+						    	}else{
+						    		return '用户';
+						    	}
+						    }
+						},{
 						    field: 'remarks',
 						    title: '备注'
 						},{
 						    field: 'orgId',
 						    title: '机构id'
 						},{
-						    field: 'publishId',
-						    title: '发布人id'
-						},{
 						    field: 'enable',
 						    title: '启/停用',
 						    formatter:enableFormatter
+						},{
+						    field: 'id',
+						    title: '编号'
 						}];
 </script>
 #end
diff --git a/center.manager/src/main/webapp/WEB-INF/views/user/user_edit.html b/center.manager/src/main/webapp/WEB-INF/views/user/user_edit.html
index 0a1d769..136c1f4 100644
--- a/center.manager/src/main/webapp/WEB-INF/views/user/user_edit.html
+++ b/center.manager/src/main/webapp/WEB-INF/views/user/user_edit.html
@@ -116,7 +116,7 @@ $(function() {
 	                <div class="col-sm-8">
 	                    <input type="text" placeholder="登录账号" value="$!user.account" aria-required="true" required="true" class="form-control" minlength="2" name="account" id="account">
 	                </div>
-	            </div>
+	            </div> 
 	            <div class="form-group">
 	                <label class="col-sm-3 control-label">用户姓名：</label>
 	                <div class="col-sm-8">
@@ -126,13 +126,13 @@ $(function() {
 	            <div class="form-group">
 	                <label class="col-sm-3 control-label">密码：</label>
 	                <div class="col-sm-8">
-	                    <input type="text" placeholder="登录密码" value="" #if("$!user.id" == "") aria-required="true"  required="true" minlength="2" #end class="form-control"  name="pwd" id="pwd">
+	                    <input type="password" placeholder="登录密码" value="" #if("$!user.id" == "") aria-required="true"  required="true" minlength="2" #end class="form-control"  name="pwd" id="pwd">
 	                </div>
 	            </div>
 	            <div class="form-group">
 	                <label class="col-sm-3 control-label">手机号：</label>
 	                <div class="col-sm-8">
-	                    <input type="text" placeholder="手机号" value="$!user.phone" aria-required="true" required="true" class="form-control" minlength="2" name="phone" id="phone">
+	                    <input type="text" placeholder="手机号" value="$!user.phone" aria-required="true" required="true" class="form-control" minlength="11" maxlength="11" name="phone" id="phone">
 	                </div>
 	            </div>
 	            <div class="form-group">
diff --git a/center.manager/src/main/webapp/WEB-INF/views/user/user_list.html b/center.manager/src/main/webapp/WEB-INF/views/user/user_list.html
index 9a761b9..5eb4cb8 100644
--- a/center.manager/src/main/webapp/WEB-INF/views/user/user_list.html
+++ b/center.manager/src/main/webapp/WEB-INF/views/user/user_list.html
@@ -3,17 +3,20 @@
     <div class="col-sm-10">
     	<div style="padding-top:30px;">
 	        <form role="form" class="form-inline">
+	        	<div class="form-group">
+	                <input type="text" placeholder="登录账号" id="searchAccount" class="form-control">
+	            </div>
 	            <div class="form-group">
-	                <input type="text" placeholder="请输入用户名" id="usernameSearch" class="form-control">
+	                <input type="text" placeholder="用户姓名" id="searchName" class="form-control">
 	            </div>
 	            <div class="form-group">
-	                <input type="text" placeholder="请输入ID" id="idSearch" class="form-control">
+	                <input type="text" placeholder="手机号" id="searchPhone" class="form-control">
 	            </div>
 	        </form>
         </div>
     </div>
     <div class="col-sm-2">
-        <div class="title-action">
+        <div class="title-action" onclick="search();">
             <a class="btn btn-primary"><i class="fa fa-search"></i> 查询</a>
         </div>
     </div>
@@ -34,6 +37,16 @@
 #override("js")
 <script type="text/javascript">
 var controllerRequestMappint = "/sysUsers/";
+function search(){
+	var queryParams = {
+		query:{
+			name: $("#searchName").val(),
+			account: $("#searchAccount").val(),
+			phone: $("#searchPhone").val()
+		}
+	}
+	 $('#dataTable').bootstrapTable('refresh', queryParams );
+}
 
 function add() {
 	fullWindow("新增用户", APP.PATH + controllerRequestMappint + "0/toEdit");
@@ -57,25 +70,12 @@ var default_dataColumns = [{
 					    title: '',
 					    checkbox: true
 					},{
-					    field: 'id',
-					    title: '编号'
+					    field: 'name',
+					    title: '姓名'
 					},{
-					    field: 'type',
-					    title: '类型',
-					    formatter:function(value,row,index){  
-					    	if(value == 0){
-					    		return '管理员'
-					    	}else{
-					    		return '用户';
-					    	}
-					    }
-					}, {
 					    field: 'account',
 					    title: '帐号'
 					},{
-					    field: 'name',
-					    title: '姓名'
-					},{
 					    field: 'orgId',
 					    title: '机构'
 					},{
@@ -85,9 +85,22 @@ var default_dataColumns = [{
 					    field: 'phone',
 					    title: '手机号'
 					},{
+					    field: 'type',
+					    title: '类型',
+					    formatter:function(value,row,index){  
+					    	if(value == 0){
+					    		return '管理员'
+					    	}else{
+					    		return '用户';
+					    	}
+					    }
+					},{
 					    field: 'enable',
 					    title: '启/停用',
 					    formatter:enableFormatter
+					},{
+					    field: 'id',
+					    title: '编号'
 					}];
 </script>
 #end
-- 
1.8.3.1