更改PDM文件

删除为用户分配可见机构（本身有机构功能）
删除为角色分配机构（本身有机构多对多功能）

OpenAuth.Mvc/BllScripts/assignModule.js

@@ -176,4 +176,4 @@ var selected = function () {
 
 selected.reLoad();
 
-//@@ sourceURL=assignOrg.js
+//@@ sourceURL=assignModule.js

OpenAuth.Mvc/BllScripts/assignOrg.js

@@ -1,179 +0,0 @@
-// ***********************************************************************
-// Assembly         : OpenAuth.Mvc
-// Author           : yubaolee
-// Created          : 04-16-2016
-//
-// Last Modified By : yubaolee
-// Last Modified On : 04-16-2016
-// ***********************************************************************
-// <copyright file="userRes.js" company="www.cnblogs.com/yubaolee">
-//     版权所有(C) 2015
-// </copyright>
-// <summary>分配组织</summary>
-// ***********************************************************************
-
-
-$(document).ready(function () {
-    $.CurrentDialog.find("#btnAccess").on("click", function () {
-        var ids = ztree.getSelected();
-        if (ids == null) return;
-
-        $.post('/RelevanceManager/Assign', {
-            type: $("#moduleType").val(),
-            firstId: $('#firstId').val(),
-            secIds: ids
-        }, function (json) {
-            json = $.parseJSON(json);
-            if (json.statusCode != "200") {
-                $(this).alertmsg('warn', json.message);
-                return;
-            }
-            selected.reLoad();
-        });
-    });
-    $.CurrentDialog.find("#btnDelAccess").on("click", function () {
-        var ids = selected.getSelected();
-        if (ids == null) return;
-
-        $.post('/RelevanceManager/UnAssign', {
-            type: $("#moduleType").val(),
-            firstId: $('#firstId').val(),
-            secIds: ids
-        }, function (json) {
-            json = $.parseJSON(json);
-            if (json.statusCode != "200") {
-                $(this).alertmsg('warn', json.message);
-                return;
-            }
-            selected.reLoad();
-        });
-    });
-});
-
-
-//待选的树
-var ztree = function () {
-    var moduleIds = new Array();
-    var zTreeObj;
-    var setting = {
-        view: {
-            selectedMulti: false
-        },
-        check: {
-            enable: true,
-            chkStyle: "checkbox",
-            chkboxType: { "Y": "", "N": "" } //去掉勾选时级联
-        },
-        data: {
-            key: {
-                name: 'Name',
-                title: 'Name'
-            },
-            simpleData: {
-                enable: true,
-                idKey: 'Id',
-                pIdKey: 'ParentId',
-                rootPId: 'null'
-            }
-        },
-        callback: {
-            onClick: zTreeOnClick,
-            onCheck: zTreeCheck
-        }
-    };
-
-    function zTreeCheck(e, treeId, treeNode) {
-        var nodes = zTreeObj.getCheckedNodes(true);
-        if (nodes.length != 0) {
-            moduleIds = nodes.map(function (e) { return e.Id; });
-        }
-    }
-    function zTreeOnClick(event, treeId, treeNode) {
-        zTreeObj.checkNode(treeNode, !treeNode.checked, true, true);
-        event.preventDefault();
-    }
-
-    $.getJSON('/OrgManager/LoadOrg', function (json) {
-        zTreeObj = $.fn.zTree.init($.CurrentDialog.find("#tree"), setting, json);
-        zTreeObj.expandAll(true);
-    });
-
-    return {
-        getSelected: function() {
-            return moduleIds;
-        }
-}
-}();
-
-
-//已分配的机构
-var selected = function () {
-    var moduleIds = new Array();
-    var zTreeObj;
-    var setting = {
-        view: {
-            selectedMulti: false
-        },
-        check: {
-            enable: true,
-            chkStyle: "checkbox",
-            chkboxType: { "Y": "", "N": "" } //去掉勾选时级联
-        },
-        data: {
-            key: {
-                name: 'Name',
-                title: 'Name'
-            },
-            simpleData: {
-                enable: true,
-                idKey: 'Id',
-                pIdKey: 'ParentId',
-                rootPId: 'null'
-            }
-        },
-        callback: {
-            onClick: zTreeOnClick,
-            onCheck: zTreeCheck
-        }
-    };
-
-    function zTreeCheck(e, treeId, treeNode) {
-        var nodes = zTreeObj.getCheckedNodes(true);
-        if (nodes.length != 0) {
-            moduleIds = nodes.map(function (e) { return e.Id; });
-        }
-    }
-    function zTreeOnClick(event, treeId, treeNode) {
-        zTreeObj.checkNode(treeNode, !treeNode.checked, true, true);
-        event.preventDefault();
-    }
-
-    var load = function() {
-        var url;
-        var type = $("#moduleType").val();
-        if (type == "UserAccessedOrg") {
-            url = '/OrgManager/LoadForUser';
-        } else {
-            url = '/OrgManager/LoadForRole';
-        }
-        $.getJSON(url, {
-            firstId: $('#firstId').val()
-        }, function (json) {
-            zTreeObj = $.fn.zTree.init($.CurrentDialog.find("#selected"), setting, json);
-            zTreeObj.expandAll(true);
-        });
-    }
-
-    return {
-        getSelected: function () {
-            return moduleIds;
-        },
-        reLoad: function() {
-            return load();
-        }
-    }
-}();
-
-selected.reLoad();
-
-//@@ sourceURL=assignOrg.js

OpenAuth.Mvc/BllScripts/roleManager.js

@@ -76,7 +76,7 @@ function MainGrid() {
                    items: [{ '0': '默认' }, { '1': '状态1' }],
                },
                {
-                   name: 'OrgName',
+                   name: 'Organizations',
                    label: '所属部门名称',
                    width: 100
                },
@@ -100,8 +100,8 @@ var list = new MainGrid();
 
 //编辑时，选择上级弹出的树
 var parentTree = function () {
-    var nameDom = "#OrgName";
-    var idDom = "#OrgId";
+    var nameDom = "#Organizations";
+    var idDom = "#OrganizationIds";
     var zTreeObj;
     var setting = {
         view: {
@@ -109,8 +109,8 @@ var parentTree = function () {
         },
         check: {
             enable: true,
-            chkStyle: "radio",  //单选
-            radioType: "all"
+            chkStyle: "checkbox",
+            chkboxType: { "Y": "", "N": "" } //去掉勾选时级联
         },
         data: {
             key: {
@@ -130,6 +130,7 @@ var parentTree = function () {
         }
     };
 
+
     function zTreeCheck(event, treeId, treeNode) {
         var nodes = zTreeObj.getCheckedNodes(true);
         var ids = nodes.map(function (e) { return e.Id; }).join(",");
@@ -189,8 +190,7 @@ var editDlg = function () {
             $('#Name').val(ret.Name);
             $('#Status').selectpicker('val', ret.Status);
             $('#Type').selectpicker('val', ret.Type);
-            $('#OrgId').val(ret.OrgId);
-            $('#OrgName').val(ret.OrgName);
+            $("#OrganizationIds").val(ret.OrganizationIds);
             parentTree.show();
         },
         save: function () {  //编辑-->保存
@@ -264,24 +264,6 @@ function assignRoleModule(obj) {
     });
 }
 
-//为角色分配可见机构
-function assignRoleOrg(obj) {
-    var selected =  list.getSelectedObj();
-    if (selected == null) return;
-
-    $(obj).dialog({
-        id: 'accessRoleOrg',
-        url: '/OrgManager/Assign',
-        title: '为角色分配可见部门',
-        width: 620,
-        height: 500,
-        data: {
-            firstId: selected.Id,
-            key: "RoleAccessedOrg"
-        }
-    });
-}
-
 //为角色分配资源
 function openRoleReourceAccess(obj) {
     var selected =  list.getSelectedObj();

OpenAuth.Mvc/BllScripts/userRoleManager.js

@@ -57,7 +57,7 @@ function UserRolesList() {
                 width: 100
             },
               {
-                  name: 'OrgName',
+                  name: 'Organizations',
                   label: '所属组织',
                   width: 100
               },

OpenAuth.Mvc/BllScripts/usermanager.js

@@ -275,24 +275,6 @@ function openUserModuleAccess(obj) {
     });
 }
 
-//用户可见组织授权按钮
-function openUserOrgAccess(obj) {
-    var selected = list.getSelectedObj();
-    if (selected == null) return;
-
-    $(obj).dialog({
-        id: 'accessUserOrg',
-        url: '/OrgManager/Assign',
-        title: '为用户分配可见部门',
-        width: 620,
-        height: 500,
-        data: {
-            firstId: selected.Id,
-            key: "UserAccessedOrg"
-        }
-    });
-}
-
 //用户角色授权
 function openUserRoleAccess(obj) {
     var selected = list.getSelectedObj();