登录用户菜单获得及其他BUG

git-svn-id: https://192.168.57.71/svn/jsgkj@1040 931142cf-59ea-a443-aa0e-51397b428577

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/DictCtl.java

@@ -188,4 +188,17 @@ public class DictCtl extends BaseCtl {
         return JSONArray.toJSONString(list);
     }
 
+    /**
+     * »ñÈ¡¸¸Àà×ÖµäÁбí
+     * 
+     * @return
+     */
+    @RequestMapping("getNoLeafList")
+    @ResponseBody
+    public String getNoLeafList() {
+
+        List<ComboBoxDto> list = codeService.findByNoLeaf();
+        return JSONArray.toJSONString(list);
+    }
+
 }

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/LoginCtl.java

@@ -1,12 +1,17 @@
 package com.xt.js.gkaq.web.ctl;
 
+import java.util.List;
+
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresRoles;
+import org.apache.shiro.session.Session;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.xt.js.gkaq.common.BaseCtl;
+import com.xt.js.gkaq.frame.model.MenuModel;
+import com.xt.js.gkaq.frame.system.FrameParam;
 
 @Controller
 public class LoginCtl extends BaseCtl {
@@ -19,6 +24,13 @@ public class LoginCtl extends BaseCtl {
 
     @RequestMapping(value = "/index")
     public String index() {
+        Session session = SecurityUtils.getSubject().getSession();
+        // TODO »ñÈ¡µ±Ç°Óû§²Ëµ¥DEMO
+        @SuppressWarnings("unchecked")
+        List<MenuModel> menuList = (List<MenuModel>) session.getAttribute(FrameParam.SESSION_KEY_MENUS);
+        for (MenuModel menu : menuList) {
+            System.out.println("menu : " + menu.getCode() + " | " + menu.getName());
+        }
         return "sys/index";
     }
 

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/frame/dict.jsp

@@ -86,7 +86,16 @@
 						<div class="modal-body">
 							<form class="form-horizontal" id="editForm" method="post" onsubmit="return false;">
 								<input type="hidden" id="id" name="id">
-                                <input type="hidden" id="pid" name="pid">
+                                <input type="hidden" id="pcode" name="pcode">
+                                <div class="form-group">
+                                    <label class="col-sm-2 control-label" for="pid">上级名称</label>
+                                    <div class="col-sm-9">
+                                        <select class="selectpicker form-control" id="pid" name="pid" onchange="changePcode()">
+                                            <option value="" selected="selected">请选择...</option>
+                                        </select>
+                                    </div>
+                                </div>
+<!--                                 <input type="hidden" id="pid" name="pid">
 								<div class="form-group">
 									<label class="col-sm-2 control-label" for="ptext">上级名称</label>
 									<div class="col-sm-9">
@@ -98,7 +107,7 @@
 									<div class="col-sm-9">
 										<input class="form-control" id="pcode" name="pcode" type="text" readonly="readonly" />
 									</div>
-								</div>
+								</div> -->
 								<div class="form-group">
 									<label class="col-sm-2 control-label" for="text">名称</label>
 									<div class="col-sm-9">

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/frame/group.jsp

@@ -52,7 +52,7 @@
                             <tr class="trsearch">
                                 <td class="tdname">½ÇÉ«</td>
                                 <td class="tdcontent">
-                                    <select class="selectpicker form-control" id="srh_role" name="srh_role">
+                                    <select class="selectpicker form-control" data-width="200px" id="srh_role" name="srh_role">
                                         <option value="" selected="selected">ÇëÑ¡Ôñ...</option>
                                     </select></td>
                                 <td class="tdname"><img class="p_searchbtn"

gkaqv2/trunk/modules/web/src/main/webapp/static/js/frame/dict.js

@@ -56,6 +56,8 @@ $(document).ready(function() {
     initGrid();
     // 初始化zTree对象
     dictTree = $.fn.zTree.init($("#dictTree"), setting);
+    // 初始化下拉框
+    pidSelect();
 
     $("#editForm").bootstrapValidator({
         message : 'This value is not valid',
@@ -217,6 +219,7 @@ function initGrid() {
 function addInfo() {
     // 清空表单信息
     comClearFormData("#editForm");
+    $('#pid').selectpicker('refresh');
     $('#leaf').selectpicker('refresh');
 
     //获取选择行
@@ -230,9 +233,8 @@ function addInfo() {
             layer.alert("只能在非末级编码下新增！");
             return;
         }
-        $("#pid").val(node.id);
+        $('#pid').selectpicker('val', node.id);
         $("#pcode").val(node.code);
-        $("#ptext").val(node.text);
     }
     // 弹出模态框
     showModelDialog("editWin", "新增");
@@ -256,9 +258,8 @@ function editInfo() {
             url : basePath + '/dict/getRecord',
             success : function(data) {
                 var selData = $(grid_selector).jqGrid('getRowData', ids);
-                $("#pid").val(selData.pid);
+                $('#pid').selectpicker('val', selData.pid);
                 $("#pcode").val(selData.pcode);
-                $("#ptext").val(selData.ptext);
                 $("#id").val(data.id);
                 $("#text").val(data.text);
                 $("#code").val(data.code);
@@ -364,4 +365,28 @@ function save() {
  */
 function closeWin() {
     hideModelDialog("editWin");
-}
+}
+
+//加载上级字典下拉框选项
+function pidSelect() {
+$.ajax({
+   type : "post",
+   url : basePath + '/dict/getNoLeafList',
+   success : function(data) {
+       loadComboBox(data, "#pid");
+       $('#pid').selectpicker('refresh');
+   }
+});
+}
+
+//根据组织变更所在地
+function changePcode() {
+ var pid = $('#pid').selectpicker('val');
+ $.ajax({
+     type : "post",
+     url : basePath + '/dict/getRecord?id=' + pid,
+     success : function(data) {
+         $('#pcode').val(data.code);
+     }
+ });
+}

gkaqv2/trunk/modules/web/src/main/webapp/static/js/frame/group.js

@@ -45,11 +45,19 @@ data : {
     }
 },
 callback : {
+    onAsyncSuccess: orgTreeOnAsyncSuccess,
     beforeClick : orgTreeBeforeClick,
     onClick : orgTreeOnClick
 }
 };
 
+function orgTreeOnAsyncSuccess() {
+    var nodes = orgTree.getNodes();
+    if (nodes.length == 1) {
+        orgTree.expandNode(nodes[0], true);
+    }
+};
+
 function orgTreeBeforeClick(treeId, treeNode) {
 var nodes = orgTree.getSelectedNodes();
 
@@ -119,7 +127,7 @@ $(document).ready(function() {
  * 初始化Grid
  */
 function initGrid() {
-    resizePageGrid(grid_selector);
+    resizeTreePageGrid(grid_selector);
     // 数据表格初始化
     $(grid_selector).jqGrid({
         url : basePath + '/group/list',
@@ -375,8 +383,8 @@ $.ajax({
    type : "post",
    url : basePath + '/org/getOrgList',
    success : function(data) {
-       loadComboBox(data, "#srh_org");
-       $('#srh_org').selectpicker('refresh');
+//       loadComboBox(data, "#srh_org");
+//       $('#srh_org').selectpicker('refresh');
        loadComboBox(data, "#org");
        $('#org').selectpicker('refresh');
    }

gkaqv2/trunk/modules/web/src/main/webapp/static/js/frame/org.js

@@ -22,11 +22,19 @@ var setting = {
       }
   },
   callback : {
+      onAsyncSuccess: orgTreeOnAsyncSuccess,
       beforeClick : orgTreeBeforeClick,
       onClick : orgTreeOnClick
   }
 };
 
+function orgTreeOnAsyncSuccess() {
+    var nodes = orgTree.getNodes();
+    if (nodes.length == 1) {
+        orgTree.expandNode(nodes[0], true);
+    }
+};
+
 function orgTreeBeforeClick(treeId, treeNode) {
   var nodes = orgTree.getSelectedNodes();
 
@@ -53,6 +61,7 @@ $(document).ready(function() {
     initGrid();
     // 初始化zTree对象
     orgTree = $.fn.zTree.init($("#orgTree"), setting);
+    orgTree.expandAll(true);
     // 初始化下拉框
     orgTypeSelect();
     szdSelect();
@@ -131,7 +140,7 @@ $(document).ready(function() {
  * 初始化Grid
  */
 function initGrid() {
-    resizePageGrid(grid_selector);
+    resizeTreePageGrid(grid_selector);
     // 数据表格初始化
     $(grid_selector).jqGrid({
         url : basePath + '/org/list',

gkaqv2/trunk/modules/web/src/main/webapp/static/js/frame/xzqh.js

@@ -106,7 +106,7 @@ function editInfo() {
             url : basePath + '/xzqh/getRecord',
             success : function(data) {
                 $("#id").val(data.id);
-                $("#code").val(data.cdoe);
+                $("#code").val(data.code);
                 $("#name").val(data.name);
                 $("#xh").val(data.xh);
                 showModelDialog("editWin", "编辑");

gkaqv2/trunk/modules/web/src/main/webapp/static/js/user/index.js

@@ -22,11 +22,19 @@ var setting = {
         }
     },
     callback : {
+        onAsyncSuccess: orgTreeOnAsyncSuccess,
         beforeClick : orgTreeBeforeClick,
         onClick : orgTreeOnClick
     }
 };
 
+function orgTreeOnAsyncSuccess() {
+    var nodes = orgTree.getNodes();
+    if (nodes.length == 1) {
+        orgTree.expandNode(nodes[0], true);
+    }
+};
+
 function orgTreeBeforeClick(treeId, treeNode) {
     var nodes = orgTree.getSelectedNodes();