xubh hace 5 años
padre
commit
d8fc555c41

+ 6 - 4
src/main/java/com/minpay/huicai/system/action/RoleManageAction.java

@@ -175,7 +175,8 @@ public class RoleManageAction implements IMINAction {
 		ImRole role = Service.lookup(IMINDataBaseService.class).selectByPrimaryKey(ImRoleMapper.class, id);
 		role.setName(name);
 		role.setDesc(desc);
-		role.setIndexpage(roleMainPage);
+		//role.setIndexpage(roleMainPage);
+		role.setIndexpage("main.html");
 		Service.lookup(IMINDataBaseService.class).updateByPrimaryKey(ImRoleMapper.class, role);
 
 		Set<String> set = new HashSet<String>(Arrays.asList(itemid));
@@ -296,9 +297,9 @@ public class RoleManageAction implements IMINAction {
 		if ("".equals(desc) || desc == null) {
 			throw new MINBusinessException("请输入角色描述!");
 		}
-		if ("".equals(roleMainPage) || roleMainPage == null) {
+		/*if ("".equals(roleMainPage) || roleMainPage == null) {
 			throw new MINBusinessException("请输入角色主页!");
-		}
+		}*/
 		String[] itemid = itemidStr.split(",");
 		if (itemid.length == 0) {
 			throw new MINBusinessException("至少选择一个菜单!");
@@ -332,7 +333,8 @@ public class RoleManageAction implements IMINAction {
 		role.setBranchid(u.getBranchId());
 		role.setAddbranch(u.getBranchId());
 		role.setAddtime(new DateTime().toDateTimeString());
-		role.setIndexpage(roleMainPage);
+		//role.setIndexpage(roleMainPage);
+		role.setIndexpage("main.html");
 		Service.lookup(IMINDataBaseService.class).insert(ImRoleMapper.class, role);
 		String[] itemIds = new String[itemid.length + 1];
 		System.arraycopy(itemid, 0, itemIds, 0, itemid.length);

+ 9 - 9
src/main/webapp/admin/roleManage/roleAdd.html

@@ -19,11 +19,11 @@
                <input type="text" name="name" id="name" lay-verify="required" autocomplete="off" placeholder="请输入角色名称" class="layui-input">
            </div>
        </div>
-       <div class="layui-form-item">
+       <!--<div class="layui-form-item">
            <label class="layui-form-label">角色主页</label>
            <div class="layui-input-block" id = 'roleMainPage'>
 			</div>
-       </div>
+       </div>-->
        <div class="layui-form-item">
            <label class="layui-form-label">角色描述</label>
            <div class="layui-input-block">
@@ -102,7 +102,7 @@
         	var name = document.getElementById('name').value;
         	var desc = document.getElementById('desc').value;
         	var inputs = document.getElementsByTagName("input");
-        	var roleMainPage = $("select[name='roleMainPage']").val();
+        	//var roleMainPage = $("select[name='roleMainPage']").val();
         	// 获取菜单数组
         	for (var i = 0; i < inputs.length; i ++) {
         		if (!isEmpty(inputs[i].value) && inputs[i].checked) {
@@ -129,20 +129,20 @@
         		return;
         	}
         	
-        	if (isEmpty(roleMainPage)) {
+        	/*if (isEmpty(roleMainPage)) {
         		layui.use(['layer'], function(){
         			layer.alert('请选择角色主页!', {icon: 2});
         		})
         		return;
-        	}
+        	}*/
         	// 执行新增
         	$.request({
         		action : 'RoleManageAction/roleAdd',
         		data : {
         			itemidStr : itemid,
         			name : name,
-        			desc : desc,
-        			roleMainPage : roleMainPage
+        			desc : desc/*,
+        			roleMainPage : roleMainPage*/
         		},
         		success : function(data){
         			if (data.MINStatus == 0) {
@@ -209,11 +209,11 @@
 	        	})
         	});
         });
-    	layui.use('form', function(){
+    	/*layui.use('form', function(){
     		var form = layui.form;
 	    	initSelectb('roleMainPage', "MAIN_PAGE_URL", "roleMainPage", 'main.html', true);
 	    	form.render();
-    	});	
+    	});	*/
     </script>
 
 </body>

+ 8 - 8
src/main/webapp/admin/roleManage/roleUpdate.html

@@ -23,11 +23,11 @@
 		      <input type="text" name="name" id="name" placeholder="请输入角色名" autocomplete="off" class="layui-input">
 		    </div>
 		  </div>
-		  <div class="layui-form-item">
+		  <!--<div class="layui-form-item">
 	           <label class="layui-form-label">角色主页</label>
 	           <div class="layui-input-block" id="roleMainPage">
 	           </div>
-          </div>
+          </div>-->
     	  <div class="layui-form-item">
 		    <label class="layui-form-label">角色描述</label>
 		    <div class="layui-input-block">
@@ -63,15 +63,15 @@
 		var name = layui.sessionData("ROW_DATA").NOW_ROW["name"];
 		var desc = layui.sessionData("ROW_DATA").NOW_ROW["desc"];
 		var addtime = layui.sessionData("ROW_DATA").NOW_ROW["addtime"];
-		var roleMainPage = layui.sessionData("ROW_DATA").NOW_ROW["roleMainPage"];
+		//var roleMainPage = layui.sessionData("ROW_DATA").NOW_ROW["roleMainPage"];
 		$("#roleId").val(roleId);
 		$("#name").val(name);
 		$("#desc").val(desc);
-    	layui.use('form', function(){
+    	/*layui.use('form', function(){
     		var form = layui.form;
 	    	initSelectb('roleMainPage', "MAIN_PAGE_URL", "roleMainPage", roleMainPage, true);
 	    	form.render();
-    	});	
+    	});	*/
 		// checkbox 点击事件
         function authChoose(t){
         	var val = t.value;
@@ -116,7 +116,7 @@
         	var name = document.getElementById('name').value;
         	var desc = document.getElementById('desc').value;
         	var inputs = document.getElementsByTagName("input");
-        	var roleMainPage = $("select[name='roleMainPage']").val();
+        	//var roleMainPage = $("select[name='roleMainPage']").val();
         	// 获取菜单数组
         	/* for (var i = 0; i < inputs.length; i ++) {
         		if (!isEmpty(inputs[i].value) && inputs[i].checked) {
@@ -183,8 +183,8 @@
         			authInputs : authInputs,
         			name : name,
         			desc : desc,
-        			id : roleId,
-        			roleMainPage:roleMainPage
+        			id : roleId/*,
+        			roleMainPage:roleMainPage*/
         		},
         		success : function(data){
         			if (data.MINStatus == 0) {