Просмотр исходного кода

用户管理功能组织树修改

git-svn-id: https://192.168.57.71/svn/jsgkj@985 931142cf-59ea-a443-aa0e-51397b428577
ld_zhouk 8 лет назад
Родитель
Сommit
0edac21a4d

+ 5 - 4
gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/UserCtl.java

@@ -110,7 +110,7 @@ public class UserCtl extends BaseCtl {
             } else {
                 userInfoModel.setIfOperator(GlobalData.CHK_YES);
             }
-            // ËùÊô´¬´ú TODO
+            // ËùÊô´¬´ú
             if (GlobalData.CHK_YES.equals(vo.getIfShip())) {
                 userInfoModel.setBelongsOrg(userInfoModel.getBelongsShip());
             }
@@ -151,15 +151,16 @@ public class UserCtl extends BaseCtl {
 
     @RequestMapping("del")
     @ResponseBody
+    @Transactional
     public int del(String ids) {
     	int cnt = 0;
 		if (StringUtils.isNotEmpty(ids)) {
 			String[] idArr = ids.split(",");
 			for(String id : idArr) {
 				if(StringUtils.isNotEmpty(id)) {
-					cnt += userService.deleteByID(id);
-					userInfoService.deleteByID(id);
-					userGroupService.deleteByUserId(id);
+					cnt += userService.deleteLogicByID(id);
+					userInfoService.deleteLogicByID(id);
+					userGroupService.deleteLogicByID(id);
 				}
 			}
 		}

+ 0 - 5
gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/frame/menu.jsp

@@ -5,11 +5,6 @@
 <title>²Ëµ¥¹ÜÀí</title>
 
 <%@ include file="../layouts/header.jsp"%>
-<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/static/js/common/zTree_v3/css/zTreeStyle/zTreeStyle.css" />
-<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/static/js/common/bootstrap-select/css/bootstrap-select.min.css" />
-<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/zTree_v3/js/jquery.ztree.all-3.5.min.js"></script>
-<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/bootstrap-select/js/bootstrap-select.min.js"></script>
-<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
 <script src="<%=base%>/static/js/frame/menu.js"></script>
 </head>
 <body class="p_body">

+ 5 - 0
gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/layouts/header.jsp

@@ -19,6 +19,11 @@
 <link rel="stylesheet" href="<%=request.getContextPath()%>/static/bootstrap-3.3.0/dist/css/bootstrap.css">
 <link rel="stylesheet" href="<%=request.getContextPath()%>/static/js/common/jqgrid/ui.jqgrid.css" />
 
+<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/static/js/common/bootstrap-select/css/bootstrap-select.min.css" />
+<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/static/js/common/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css" />
+<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/static/js/common/bootstrap-validator/css/bootstrapValidator.min.css" />
+<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/static/js/common/zTree_v3/css/zTreeStyle/zTreeStyle.css" />
+
 <link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/static/jquery-easyui-1.5/themes/default/easyui.css">
 <link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/static/jquery-easyui-1.5/themes/icon.css">
     

+ 8 - 0
gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/layouts/scripts.jsp

@@ -17,6 +17,14 @@
 <script src="<%=request.getContextPath()%>/static/js/common/jqgrid/jquery.jqGrid.src.js"></script>
 <script src="<%=request.getContextPath()%>/static/js/common/jqgrid/i18n/grid.locale-cn.js"></script>
 
+<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/bootstrap-select/js/bootstrap-select.min.js"></script>
+<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
+<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
+<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"></script>
+<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/bootstrap-validator/js/bootstrapValidator.min.js"></script>
+<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/bootstrap-validator/js/language/zh_CN.js"></script>
+<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/zTree_v3/js/jquery.ztree.all-3.5.min.js"></script>
+
 <script type="text/javascript" src="<%=request.getContextPath()%>/static/jquery-easyui-1.5/jquery.easyui.min.js"></script>
 <script type="text/javascript" src="<%=request.getContextPath()%>/static/js/easyui-lang-zh_CN.js"></script>
 

+ 0 - 11
gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/user/main.jsp

@@ -4,17 +4,6 @@
 <head>
 <title>Óû§¹ÜÀí</title>
 <%@ include file="../layouts/header.jsp"%>
-<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/static/js/common/bootstrap-select/css/bootstrap-select.min.css" />
-<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/static/js/common/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css" />
-<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/static/js/common/bootstrap-validator/css/bootstrapValidator.min.css" />
-<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/static/js/common/zTree_v3/css/zTreeStyle/zTreeStyle.css" />
-<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/bootstrap-select/js/bootstrap-select.min.js"></script>
-<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
-<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
-<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"></script>
-<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/bootstrap-validator/js/bootstrapValidator.min.js"></script>
-<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/bootstrap-validator/js/language/zh_CN.js"></script>
-<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/zTree_v3/js/jquery.ztree.all-3.5.min.js"></script>
 <script src="<%=base%>/static/js/user/index.js"></script>
 </head>
 <body class="p_body">

+ 42 - 9
gkaqv2/trunk/modules/web/src/main/webapp/static/js/user/index.js

@@ -3,6 +3,10 @@ var pager_selector = "#grid-pager";
 var orgTree;
 //zTree的参数配置,setting主要是设置一些tree的属性,是本地数据源,还是远程,动画效果,是否含有复选框等等
 var setting = {
+ view: {
+     autoCancelSelected: false,
+     selectedMulti: false
+ },
  async : {
      enable : true,
      type : 'post',
@@ -19,12 +23,30 @@ var setting = {
      }
  },
  callback : {
+     beforeClick : orgTreeBeforeClick,
      onClick : orgTreeOnClick
  }
 };
 
-function orgTreeOnClick(event, treeId, treeNode) {
-    searchRecord(treeNode.id);
+function orgTreeBeforeClick(treeId, treeNode) {
+    var nodes = orgTree.getSelectedNodes();
+
+    if (nodes.length == 1){
+        if (nodes[0].tId == treeNode.tId) {
+            orgTree.cancelSelectedNode(treeNode);
+            searchRecord();
+            return false;
+        }
+    } else if (nodes.length > 1) {
+        orgTree.cancelSelectedNode();
+        searchRecord();
+        return false;
+    }
+    return true;
+};
+
+function orgTreeOnClick() {
+    searchRecord();
 };
 
 jQuery(function($) {
@@ -182,6 +204,8 @@ function initGrid() {
 function addInfo() {
     // 清空表单信息
     comClearFormData("#myForm");
+    $("#realName").removeProp("readonly");
+    $("#loginName").removeProp("readonly");
     $('#orgid').selectpicker('refresh');
     changeSzd();
     $('#groupid').selectpicker('refresh');
@@ -217,9 +241,9 @@ function editInfo() {
             success : function(data) {
                 $("#id").val(data.id);
                 $("#realName").val(data.realName);
-                $("#realName").attr('readonly', 'readonly');
+                $("#realName").prop('readonly', 'readonly');
                 $("#loginName").val(data.loginName);
-                $("#loginName").attr('readonly', 'readonly');
+                $("#loginName").prop('readonly', 'readonly');
                 $("#orgid").selectpicker('val', data.orgid);
                 changeSzd();
                 $("#groupid").selectpicker('val', data.groupid);
@@ -263,6 +287,7 @@ function editInfo() {
                 showModelDialog("myModal", "编辑");
             },
             error : function(XMLHttpRequest, textStatus, errorThrown) {
+                layer.alert("error:" + errorThrown);
             }
         });
     }
@@ -288,10 +313,15 @@ function delInfo() {
                 url : basePath + '/user/del',// 请求的路径
                 success : function(data) {
                     layer.close(index);
-                    searchRecord();
+                    if (!isNull(data.success) && data.success == false) {
+                        layer.alert("数据删除异常!");
+                    } else {
+                        searchRecord();
+                    }
                 },
                 error : function(XMLHttpRequest, textStatus, errorThrown) {
                     layer.close(index);
+                    layer.alert("error:" + errorThrown);
                 }
             });
         });
@@ -303,13 +333,16 @@ function delInfo() {
 /**
  * 查询信息
  */
-function searchRecord(orgId) {
+function searchRecord() {
     var realName = encodeURI(encodeURI($("#srh_realName").val()));
     var loginName = $("#srh_loginName").val();
     var orgIdStr = "";
-    if (!isNull(orgId)) {
-        orgIdStr = "&orgid=" + orgId;
+
+    var nodes = orgTree.getSelectedNodes();
+    if (nodes.length == 1) {
+        orgIdStr = "&orgid=" + nodes[0].id;
     }
+
     $(grid_selector).jqGrid('setGridParam', {
         url : basePath + "/user/list?realName=" + realName + "&loginName=" + loginName + orgIdStr,
         page : 1
@@ -342,7 +375,7 @@ function save() {
         data : $('#myForm').serialize(), // 表单序列化,获取数据
         success : function(data) {
             // 成功删除后刷新页面
-            if (data && data.success == true) {
+            if (data && data.success) {
                 layer.alert("数据已成功保存!");
                 closeWin();
                 searchRecord();