role test

admin-console/src/main/java/com/ibeetl/admin/console/web/query/RoleQuery.java

@@ -14,7 +14,7 @@ public class RoleQuery extends PageParam {
     @Query(name = "名称", display = true)
     private String name;
     @Query(name = "业务角色类型", type = Query.TYPE_DICT,dict=CoreDictType.ROLE_TYPE)
-    private Integer type;
+    private String type;
 
 
     public String getCode() {
@@ -33,13 +33,15 @@ public class RoleQuery extends PageParam {
         this.name = name;
     }
 
-	public Integer getType() {
+	public String getType() {
 		return type;
 	}
 
-	public void setType(Integer type) {
+	public void setType(String type) {
 		this.type = type;
 	}
 
+	
+
 
 }

admin-console/src/main/resources/static/js/admin/role/add.js

@@ -8,7 +8,7 @@ layui.define([ 'form', 'laydate', 'table','roleApi'], function(exports) {
 				this.initSubmit();
 			},
 			initSubmit:function(){
-				$("#addButton").click(function(){
+				$("#addButton").click($("#addForm"),function(){
 					roleApi.addRole(function(){
 						parent.window.dataReload();
 						Common.info("添加成功");

admin-console/src/main/resources/static/js/admin/role/edit.js

@@ -8,8 +8,8 @@ layui.define([ 'form', 'laydate', 'table','roleApi'], function(exports) {
 				this.initSubmit();
 			},
 			initSubmit:function(){
-				$("#addButton").click(function(){
-					roleApi.updateRole(function(){
+				$("#updateButton").click(function(){
+					roleApi.updateRole($("#updateForm"),function(){
 						parent.window.dataReload();
 						Common.info("更新成功");
 						Lib.closeFrame();
@@ -18,7 +18,7 @@ layui.define([ 'form', 'laydate', 'table','roleApi'], function(exports) {
 					
 				});
 				
-				$("#addButton-cancel").click(function(){
+				$("#updateButton-cancel").click(function(){
 					Lib.closeFrame();
 				});
 			}

admin-console/src/main/resources/static/js/admin/role/index.js

@@ -21,7 +21,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
 				height : 'full-280',
 				method : 'post',
 				url : Common.CTX + '/admin/role/list.json' //数据接口
-				,page : {"layout":['count','prev', 'page', 'next']} //开启分页
+				,page : Lib.tablePage //开启分页
 				,limit : 10,
 				cols : [ [ //表头
 				{

admin-console/src/main/resources/static/js/admin/role/roleApi.js

 /*访问后台的代码*/
 layui.define([], function(exports) {
 	var api={
-			updateRole:function(callback){
-				Lib.submitForm($('#updateForm'),{},callback)
+			updateRole:function(form,callback){
+				Lib.submitForm("/admin/role/update.json",form,{},callback)
 			},
-			addRole:function(callback){
-				Lib.submitForm($('#addForm'),{},callback)
+			addRole:function(form,callback){
+				Lib.submitForm("/admin/role/add.json",form,{},callback)
 			},
 			del:function(ids,callback){
 				Common.post("/admin/role/delete.json",{"ids":ids},function(){

admin-console/src/main/resources/static/js/admin/role/roleFn.js

@@ -56,7 +56,6 @@ layui.define([ 'form', 'laydate', 'table','roleApi'], function(exports) {
 			roleApi.queryFunctionByRole(roleId,function(fnIds){
 				for(var i=0;i<fnIds.length;i++){
 					var node = zTreeObj.getNodesByParam("id",fnIds[i]);
-//					zTreeObj.selectNode(node[0]);
 					zTreeObj.checkNode(node[0], true, true);
 				}
 			});

admin-console/src/main/resources/static/js/admin/role/roleUser.js

@@ -7,21 +7,22 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
 		
 		init:function(roleId){
 			this.initTable(roleId);
+			this.initSearchForm();
 			this.initClose();
 		},
 		initClose:function(){
-			
 			$("#close").click(function(){
 				Lib.closeFrame();
 			});
 		},
+		
 		initTable:function(roleId){
 			userTable = table.render({
 				elem : '#userTable',
 				height : 'full-180',
 				method : 'post',
 				url : Common.CTX + '/admin/role/user/list.json?roleId='+roleId //数据接口
-				,page : {"layout":['count','prev', 'page', 'next']} //开启分页
+				,page : Lib.tablePage //开启分页
 				,limit : 10,
 				cols : [ [ //表头
 				{

admin-console/src/main/resources/templates/admin/role/add.html

 <!--# layout("/common/layout.html",{"jsBase":"/js/admin/role/"}){ -->
 
-<form class="layui-form layui-form-pane" id="addForm"
-	action="/admin/role/add.json">
+<form class="layui-form layui-form-pane" id="addForm">
 	<div class="layui-row">
 		<div class="layui-form-item">
 			<label class="layui-form-label">角色名称</label>

admin-console/src/main/resources/templates/admin/role/edit.html

 <!--# layout("/common/layout.html",{"jsBase":"/js/admin/role/"}){ -->
 
-<form class="layui-form layui-form-pane" id="updateForm"
-	action="/admin/role/update.json">
+<form class="layui-form layui-form-pane" id="updateForm">
 	<div class="layui-row">
 		<div class="layui-form-item">
 			<label class="layui-form-label">角色名称</label>