From a9218167a5dcd08bb3eb8b01413d67da330d30f1 Mon Sep 17 00:00:00 2001 From: "yubaolee@163.com" Date: Fri, 1 Sep 2017 18:36:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8F=AF=E4=BB=A5=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAuth.Mvc/BllScripts/orgManager.js | 376 ++++----- OpenAuth.Mvc/BllScripts/roleManager.js | 442 +++++------ OpenAuth.Mvc/BllScripts/stockManager.js | 378 ++++----- OpenAuth.Mvc/BllScripts/userRoleManager.js | 218 +++--- OpenAuth.Mvc/BllScripts/usermanager.js | 484 ++++++------ OpenAuth.Mvc/OpenAuth.Mvc.csproj | 2 +- OpenAuth.Mvc/Views/UserManager/Index.cshtml | 15 +- OpenAuth.Mvc/js/droptree.js | 126 +++ OpenAuth.Mvc/js/parentTreeMultiple.js | 118 --- OpenAuth.Mvc/js/users.js | 5 +- OpenAuth.Mvc/layui/font/iconfont.svg | 804 ++++++++++---------- 11 files changed, 1484 insertions(+), 1484 deletions(-) create mode 100644 OpenAuth.Mvc/js/droptree.js delete mode 100644 OpenAuth.Mvc/js/parentTreeMultiple.js diff --git a/OpenAuth.Mvc/BllScripts/orgManager.js b/OpenAuth.Mvc/BllScripts/orgManager.js index 0ad79629..43bb224d 100644 --- a/OpenAuth.Mvc/BllScripts/orgManager.js +++ b/OpenAuth.Mvc/BllScripts/orgManager.js @@ -1,189 +1,189 @@ -$(function () { - $("#ParentName").on("click", function () { - parent.reload(); - }); -}); - -//左边导航 -var ztree = function () { - var url = '/UserSession/GetOrgs'; - var setting = { - view: { selectedMulti: false }, - data: { - key: { - name: 'Name', - title: 'Name' - }, - simpleData: { - enable: true, - idKey: 'Id', - pIdKey: 'ParentId', - rootPId: 'null' - } - }, - callback: { - onClick: function (event, treeId, treeNode) { - list.reload(treeNode.Id); - } - } - }; - var load = function () { - $.getJSON(url, function (json) { - var zTreeObj = $.fn.zTree.init($("#orgtree"), setting, json); - list.reload(); - zTreeObj.expandAll(true); - }); - }; - load(); - - return { - reload: load - } -}(); - -//grid列表模块 -function MainGrid() { - var url = '/OrgManager/LoadChildren?Id='; - var selectedId = '00000000-0000-0000-0000-000000000000'; //ztree选中的模块 - this.maingrid = $('#maingrid') - .jqGrid({ - colModel: [ - { - name: 'Id', - index: 'Id', - label: '流水号', - hidden: true - }, - { - index: 'CascadeId', - name: 'CascadeId', - label: '节点语义ID' - }, - { - index: 'Name', - name: 'Name', - label: '组织名称' - }, - { - index: 'ParentName', - name: 'ParentName', - label: '父节点名称' - }, - { - index: 'ParentId', - name: 'ParentId', - hidden: true - }, - - { - index: 'SortNo', - name: 'SortNo', - label: '排序号' - - } - ], - url: url + selectedId, - datatype: "json", - - viewrecords: true, - rowNum: 18, - pager: "#grid-pager", - altRows: true, - height: 'auto', - multiselect: true, - multiboxonly: true, - - loadComplete: function () { - var table = this; - setTimeout(function () { - updatePagerIcons(table); - }, - 0); - } - }).jqGrid('navGrid', "#grid-pager", { - edit: false, add: false, del: false, refresh: false, search: false - }); - - this.reload = function (id) { - if (id != undefined) selectedId = id; - this.maingrid.jqGrid("setGridParam", { url: url + selectedId }) - .trigger("reloadGrid", [{ page: 1 }]); //重载JQGrid - - }; -}; -MainGrid.prototype = new Grid(); -var list = new MainGrid(); -var vm = new Vue({ - el: '#editDlg' -}); - -//上级机构选择框 -var parent = new ParentTree("/UserSession/GetOrgs","ParentName", "ParentId"); - -//添加（编辑）对话框 -var editDlg = function () { - var update = false; - var show = function () { - layer.open({ - type: 1, - skin: 'layui-layer-rim', //加上边框 - title: "部门管理", //不显示标题 - area: ['400px', '300px'], //宽高 - content: $('#editDlg'), //捕获的元素 - btn: ['保存', '关闭'], - yes: function (index, layero) { - $.post("/OrgManager/AddOrg", vm.$data, function (data) { - layer.msg(data.Message); - if (data.Status) { - list.reload(); - ztree.reload(); - } - }, "json"); - }, - cancel: function (index) { - layer.close(index); - } - }); - } - return { - add: function () { //弹出添加 - update = false; - show(); - vm.$set('$data', - { - Id: '00000000-0000-0000-0000-000000000000', - SortNo: 0 - }); - }, - update: function (ret) { //弹出编辑框 - update = true; - show(); - vm.$set('$data', ret); - } - }; -}(); - -//删除 -function del() { - list.del("Id", "/OrgManager/DelOrg", function () { - list.reload(); - ztree.reload(); - }); -} - -//自定义的编辑按钮 -function edit() { - var selected = list.getSelectedObj(); - if (selected == null) { - return; - } - editDlg.update(selected); -} - -function add() { - editDlg.add(); -} - -function refresh() { - list.reload(); +$(function () { + $("#ParentName").on("click", function () { + parent.reload(); + }); +}); + +//左边导航 +var ztree = function () { + var url = '/UserSession/GetOrgs'; + var setting = { + view: { selectedMulti: false }, + data: { + key: { + name: 'Name', + title: 'Name' + }, + simpleData: { + enable: true, + idKey: 'Id', + pIdKey: 'ParentId', + rootPId: 'null' + } + }, + callback: { + onClick: function (event, treeId, treeNode) { + list.reload(treeNode.Id); + } + } + }; + var load = function () { + $.getJSON(url, function (json) { + var zTreeObj = $.fn.zTree.init($("#orgtree"), setting, json); + list.reload(); + zTreeObj.expandAll(true); + }); + }; + load(); + + return { + reload: load + } +}(); + +//grid列表模块 +function MainGrid() { + var url = '/OrgManager/LoadChildren?Id='; + var selectedId = '00000000-0000-0000-0000-000000000000'; //ztree选中的模块 + this.maingrid = $('#maingrid') + .jqGrid({ + colModel: [ + { + name: 'Id', + index: 'Id', + label: '流水号', + hidden: true + }, + { + index: 'CascadeId', + name: 'CascadeId', + label: '节点语义ID' + }, + { + index: 'Name', + name: 'Name', + label: '组织名称' + }, + { + index: 'ParentName', + name: 'ParentName', + label: '父节点名称' + }, + { + index: 'ParentId', + name: 'ParentId', + hidden: true + }, + + { + index: 'SortNo', + name: 'SortNo', + label: '排序号' + + } + ], + url: url + selectedId, + datatype: "json", + + viewrecords: true, + rowNum: 18, + pager: "#grid-pager", + altRows: true, + height: 'auto', + multiselect: true, + multiboxonly: true, + + loadComplete: function () { + var table = this; + setTimeout(function () { + updatePagerIcons(table); + }, + 0); + } + }).jqGrid('navGrid', "#grid-pager", { + edit: false, add: false, del: false, refresh: false, search: false + }); + + this.reload = function (id) { + if (id != undefined) selectedId = id; + this.maingrid.jqGrid("setGridParam", { url: url + selectedId }) + .trigger("reloadGrid", [{ page: 1 }]); //重载JQGrid + + }; +}; +MainGrid.prototype = new Grid(); +var list = new MainGrid(); +var vm = new Vue({ + el: '#editDlg' +}); + +//上级机构选择框 +var parent = new ParentTree("/UserSession/GetOrgs","ParentName", "ParentId"); + +//添加（编辑）对话框 +var editDlg = function () { + var update = false; + var show = function () { + layer.open({ + type: 1, + skin: 'layui-layer-rim', //加上边框 + title: "部门管理", //不显示标题 + area: ['400px', '300px'], //宽高 + content: $('#editDlg'), //捕获的元素 + btn: ['保存', '关闭'], + yes: function (index, layero) { + $.post("/OrgManager/AddOrg", vm.$data, function (data) { + layer.msg(data.Message); + if (data.Status) { + list.reload(); + ztree.reload(); + } + }, "json"); + }, + cancel: function (index) { + layer.close(index); + } + }); + } + return { + add: function () { //弹出添加 + update = false; + show(); + vm.$set('$data', + { + Id: '00000000-0000-0000-0000-000000000000', + SortNo: 0 + }); + }, + update: function (ret) { //弹出编辑框 + update = true; + show(); + vm.$set('$data', ret); + } + }; +}(); + +//删除 +function del() { + list.del("Id", "/OrgManager/DelOrg", function () { + list.reload(); + ztree.reload(); + }); +} + +//自定义的编辑按钮 +function edit() { + var selected = list.getSelectedObj(); + if (selected == null) { + return; + } + editDlg.update(selected); +} + +function add() { + editDlg.add(); +} + +function refresh() { + list.reload(); } \ No newline at end of file diff --git a/OpenAuth.Mvc/BllScripts/roleManager.js b/OpenAuth.Mvc/BllScripts/roleManager.js index db6db3c1..4093cc33 100644 --- a/OpenAuth.Mvc/BllScripts/roleManager.js +++ b/OpenAuth.Mvc/BllScripts/roleManager.js @@ -1,221 +1,221 @@ -$(function () { - $("#Organizations").on("click", function () { - parent.reload(); - }); -}); - -//左边导航 -var ztree = function () { - var url = '/UserSession/GetOrgs'; - var setting = { - view: { selectedMulti: false }, - data: { - key: { - name: 'Name', - title: 'Name' - }, - simpleData: { - enable: true, - idKey: 'Id', - pIdKey: 'ParentId', - rootPId: 'null' - } - }, - callback: { - onClick: function (event, treeId, treeNode) { - list.reload(treeNode.Id); - } - } - }; - var load = function () { - $.getJSON(url, function (json) { - var zTreeObj = $.fn.zTree.init($("#orgtree"), setting, json); - list.reload(); - zTreeObj.expandAll(true); - }); - }; - load(); - - return { - reload: load - } -}(); - -//grid列表模块 -function MainGrid() { - var url = '/RoleManager/Load?orgId='; - var selectedId = '00000000-0000-0000-0000-000000000000'; //ztree选中的模块 - this.maingrid = $('#maingrid') - .jqGrid({ - colModel: [ - { - name: 'Id', - index: 'Id', - hidden: true - }, - { - index: 'Name', - name: 'Name', - label: '姓名' - }, - { - index: 'OrganizationIds', - name: 'OrganizationIds', - hidden: true - }, - { - index: 'Organizations', - name: 'Organizations', - label: '所属机构' - - } - ], - url: url + selectedId, - datatype: "json", - - viewrecords: true, - rowNum: 18, - pager: "#grid-pager", - altRows: true, - height: 'auto', - multiselect: true, - multiboxonly: true, - - loadComplete: function () { - var table = this; - setTimeout(function () { - updatePagerIcons(table); - }, - 0); - } - }).jqGrid('navGrid', "#grid-pager", { - edit: false, add: false, del: false, refresh: false, search: false - }); - - this.reload = function (id) { - if (id != undefined) selectedId = id; - this.maingrid.jqGrid("setGridParam", { url: url + selectedId }) - .trigger("reloadGrid", [{ page: 1 }]); //重载JQGrid - - }; -}; -MainGrid.prototype = new Grid(); -var list = new MainGrid(); -var vm = new Vue({ - el: '#editDlg' -}); - -//上级机构选择框 -var parent = new ParentTreeMultiple("/UserSession/GetOrgs", "Organizations", "OrganizationIds"); - -//添加（编辑）对话框 -var editDlg = function () { - var update = false; - var show = function () { - layer.open({ - type: 1, - skin: 'layui-layer-rim', //加上边框 - title: "角色管理", //不显示标题 - area: ['400px', '300px'], //宽高 - content: $('#editDlg'), //捕获的元素 - btn: ['保存', '关闭'], - yes: function (index, layero) { - $.post("/RoleManager/Add", vm.$data, function (data) { - layer.msg(data.Message); - if (data.Status) { - list.reload(); - ztree.reload(); - } - }, "json"); - }, - cancel: function (index) { - layer.close(index); - } - }); - } - return { - add: function () { //弹出添加 - update = false; - show(); - vm.$set('$data', - { - Id: '00000000-0000-0000-0000-000000000000', - Sex: 0 - }); - }, - update: function (ret) { //弹出编辑框 - update = true; - show(); - vm.$set('$data', ret); - } - }; -}(); - - - -//删除 -function del() { - list.del("Id", "/RoleManager/Delete",function() { - list.reload(); - ztree.reload(); - }); -} - -//自定义的编辑按钮 -function edit() { - var selected = list.getSelectedObj(); - if (selected == null) { - return; - } - editDlg.update(selected); -} - -function add() { - editDlg.add(); -} - -function refresh() { - list.reload(); -} - -//为角色分配模块 -function assignRoleModule(obj) { - - var selected = list.getSelectedObj(); - if (selected == null) return; - - layer.open({ - type: 2, - skin: 'layui-layer-rim', //加上边框 - area: ['410px', '390px'], //宽高 - content: '/ModuleManager/Assign?key=RoleModule&firstId=' + selected.Id - }); -} - -//为角色分配资源 -function openRoleReourceAccess(obj) { - var selected = list.getSelectedObj(); - if (selected == null) return; - - layer.open({ - type: 2, - skin: 'layui-layer-rim', //加上边框 - area: ['600px', '300px'], //宽高 - content: '/ResourceManager/AssignRes?key=RoleResource&firstId=' + selected.Id - }); -} - -//为角色分配菜单 -function assignRoleElement(obj) { - var selected = list.getSelectedObj(); - if (selected == null) return; - - layer.open({ - type: 2, - skin: 'layui-layer-rim', //加上边框 - area: ['600px', '300px'], //宽高 - content: '/ModuleElementManager/AssignModuleElement?key=RoleElement&firstId=' + selected.Id - }); -} - - +$(function () { + $("#Organizations").on("click", function () { + parent.reload(); + }); +}); + +//左边导航 +var ztree = function () { + var url = '/UserSession/GetOrgs'; + var setting = { + view: { selectedMulti: false }, + data: { + key: { + name: 'Name', + title: 'Name' + }, + simpleData: { + enable: true, + idKey: 'Id', + pIdKey: 'ParentId', + rootPId: 'null' + } + }, + callback: { + onClick: function (event, treeId, treeNode) { + list.reload(treeNode.Id); + } + } + }; + var load = function () { + $.getJSON(url, function (json) { + var zTreeObj = $.fn.zTree.init($("#orgtree"), setting, json); + list.reload(); + zTreeObj.expandAll(true); + }); + }; + load(); + + return { + reload: load + } +}(); + +//grid列表模块 +function MainGrid() { + var url = '/RoleManager/Load?orgId='; + var selectedId = '00000000-0000-0000-0000-000000000000'; //ztree选中的模块 + this.maingrid = $('#maingrid') + .jqGrid({ + colModel: [ + { + name: 'Id', + index: 'Id', + hidden: true + }, + { + index: 'Name', + name: 'Name', + label: '姓名' + }, + { + index: 'OrganizationIds', + name: 'OrganizationIds', + hidden: true + }, + { + index: 'Organizations', + name: 'Organizations', + label: '所属机构' + + } + ], + url: url + selectedId, + datatype: "json", + + viewrecords: true, + rowNum: 18, + pager: "#grid-pager", + altRows: true, + height: 'auto', + multiselect: true, + multiboxonly: true, + + loadComplete: function () { + var table = this; + setTimeout(function () { + updatePagerIcons(table); + }, + 0); + } + }).jqGrid('navGrid', "#grid-pager", { + edit: false, add: false, del: false, refresh: false, search: false + }); + + this.reload = function (id) { + if (id != undefined) selectedId = id; + this.maingrid.jqGrid("setGridParam", { url: url + selectedId }) + .trigger("reloadGrid", [{ page: 1 }]); //重载JQGrid + + }; +}; +MainGrid.prototype = new Grid(); +var list = new MainGrid(); +var vm = new Vue({ + el: '#editDlg' +}); + +//上级机构选择框 +var parent = new ParentTreeMultiple("/UserSession/GetOrgs", "Organizations", "OrganizationIds"); + +//添加（编辑）对话框 +var editDlg = function () { + var update = false; + var show = function () { + layer.open({ + type: 1, + skin: 'layui-layer-rim', //加上边框 + title: "角色管理", //不显示标题 + area: ['400px', '300px'], //宽高 + content: $('#editDlg'), //捕获的元素 + btn: ['保存', '关闭'], + yes: function (index, layero) { + $.post("/RoleManager/Add", vm.$data, function (data) { + layer.msg(data.Message); + if (data.Status) { + list.reload(); + ztree.reload(); + } + }, "json"); + }, + cancel: function (index) { + layer.close(index); + } + }); + } + return { + add: function () { //弹出添加 + update = false; + show(); + vm.$set('$data', + { + Id: '00000000-0000-0000-0000-000000000000', + Sex: 0 + }); + }, + update: function (ret) { //弹出编辑框 + update = true; + show(); + vm.$set('$data', ret); + } + }; +}(); + + + +//删除 +function del() { + list.del("Id", "/RoleManager/Delete",function() { + list.reload(); + ztree.reload(); + }); +} + +//自定义的编辑按钮 +function edit() { + var selected = list.getSelectedObj(); + if (selected == null) { + return; + } + editDlg.update(selected); +} + +function add() { + editDlg.add(); +} + +function refresh() { + list.reload(); +} + +//为角色分配模块 +function assignRoleModule(obj) { + + var selected = list.getSelectedObj(); + if (selected == null) return; + + layer.open({ + type: 2, + skin: 'layui-layer-rim', //加上边框 + area: ['410px', '390px'], //宽高 + content: '/ModuleManager/Assign?key=RoleModule&firstId=' + selected.Id + }); +} + +//为角色分配资源 +function openRoleReourceAccess(obj) { + var selected = list.getSelectedObj(); + if (selected == null) return; + + layer.open({ + type: 2, + skin: 'layui-layer-rim', //加上边框 + area: ['600px', '300px'], //宽高 + content: '/ResourceManager/AssignRes?key=RoleResource&firstId=' + selected.Id + }); +} + +//为角色分配菜单 +function assignRoleElement(obj) { + var selected = list.getSelectedObj(); + if (selected == null) return; + + layer.open({ + type: 2, + skin: 'layui-layer-rim', //加上边框 + area: ['600px', '300px'], //宽高 + content: '/ModuleElementManager/AssignModuleElement?key=RoleElement&firstId=' + selected.Id + }); +} + + diff --git a/OpenAuth.Mvc/BllScripts/stockManager.js b/OpenAuth.Mvc/BllScripts/stockManager.js index 0fff9658..76fc5bdd 100644 --- a/OpenAuth.Mvc/BllScripts/stockManager.js +++ b/OpenAuth.Mvc/BllScripts/stockManager.js @@ -1,189 +1,189 @@ -$(function () { - $("#ParentName").on("click", function () { - parent.reload(); - }); -}); - -//左边导航 -var ztree = function () { - var url = '/UserSession/GetOrgs'; - var setting = { - view: { selectedMulti: false }, - data: { - key: { - name: 'Name', - title: 'Name' - }, - simpleData: { - enable: true, - idKey: 'Id', - pIdKey: 'ParentId', - rootPId: 'null' - } - }, - callback: { - onClick: function (event, treeId, treeNode) { - list.reload(treeNode.Id); - } - } - }; - var load = function () { - $.getJSON(url, function (json) { - var zTreeObj = $.fn.zTree.init($("#orgtree"), setting, json); - list.reload(); - zTreeObj.expandAll(true); - }); - }; - load(); - - return { - reload: load - } -}(); - -//grid列表模块 -function MainGrid() { - var url = '/StockManager/Load?parentId='; - var selectedId = '00000000-0000-0000-0000-000000000000'; //ztree选中的模块 - this.maingrid = $('#maingrid') - .jqGrid({ - colModel: [ - { - name: 'Id', - index: 'Id', - hidden: true - }, - { - index: 'Name', - name: 'Name', - label: '产品名称' - }, - { - index: 'Viewable', - name: 'Viewable', - label: '可见范围' - }, - { - index: 'OrgId', - name: 'OrgId', - hidden: true - }, - - { - index: 'Number', - name: 'Number', - label: '数量' - - }, - { - index: 'ParentName', - name: 'ParentName', - label: '所属机构' - } - ], - url: url + selectedId, - datatype: "json", - - viewrecords: true, - rowNum: 18, - pager: "#grid-pager", - altRows: true, - height: 'auto', - multiselect: true, - multiboxonly: true, - - loadComplete: function () { - var table = this; - setTimeout(function () { - updatePagerIcons(table); - }, - 0); - } - }).jqGrid('navGrid', "#grid-pager", { - edit: false, add: false, del: false, refresh: false, search: false - }); - - this.reload = function (id) { - if (id != undefined) selectedId = id; - this.maingrid.jqGrid("setGridParam", { url: url + selectedId }) - .trigger("reloadGrid", [{ page: 1 }]); //重载JQGrid - - }; -}; -MainGrid.prototype = new Grid(); -var list = new MainGrid(); -var vm = new Vue({ - el: '#editDlg' -}); - -//上级机构选择框 -var parent = new ParentTree("/UserSession/GetOrgs", "ParentName", "OrgId"); - -//添加（编辑）对话框 -var editDlg = function () { - var update = false; - var show = function () { - layer.open({ - type: 1, - skin: 'layui-layer-rim', //加上边框 - title: "进出库管理", //不显示标题 - area: ['400px', '300px'], //宽高 - content: $('#editDlg'), //捕获的元素 - btn: ['保存', '关闭'], - yes: function (index, layero) { - $.post("/StockManager/Add", vm.$data, function (data) { - layer.msg(data.Message); - if (data.Status) { - list.reload(); - ztree.reload(); - } - }, "json"); - }, - cancel: function (index) { - layer.close(index); - } - }); - } - return { - add: function () { //弹出添加 - update = false; - show(); - vm.$set('$data', { - Id: '00000000-0000-0000-0000-000000000000', - Number: 1 - }); - }, - update: function (ret) { //弹出编辑框 - update = true; - show(); - vm.$set('$data', ret); - } - }; -}(); - -//删除 -function del() { - list.del("Id", "/StockManager/Delete", function () { - list.reload(); - ztree.reload(); - }); -} - -//自定义的编辑按钮 -function edit() { - var selected = list.getSelectedObj(); - if (selected == null) { - return; - } - editDlg.update(selected); -} - -function add() { - editDlg.add(); -} - -function refresh() { - list.reload(); -} - - +$(function () { + $("#ParentName").on("click", function () { + parent.reload(); + }); +}); + +//左边导航 +var ztree = function () { + var url = '/UserSession/GetOrgs'; + var setting = { + view: { selectedMulti: false }, + data: { + key: { + name: 'Name', + title: 'Name' + }, + simpleData: { + enable: true, + idKey: 'Id', + pIdKey: 'ParentId', + rootPId: 'null' + } + }, + callback: { + onClick: function (event, treeId, treeNode) { + list.reload(treeNode.Id); + } + } + }; + var load = function () { + $.getJSON(url, function (json) { + var zTreeObj = $.fn.zTree.init($("#orgtree"), setting, json); + list.reload(); + zTreeObj.expandAll(true); + }); + }; + load(); + + return { + reload: load + } +}(); + +//grid列表模块 +function MainGrid() { + var url = '/StockManager/Load?parentId='; + var selectedId = '00000000-0000-0000-0000-000000000000'; //ztree选中的模块 + this.maingrid = $('#maingrid') + .jqGrid({ + colModel: [ + { + name: 'Id', + index: 'Id', + hidden: true + }, + { + index: 'Name', + name: 'Name', + label: '产品名称' + }, + { + index: 'Viewable', + name: 'Viewable', + label: '可见范围' + }, + { + index: 'OrgId', + name: 'OrgId', + hidden: true + }, + + { + index: 'Number', + name: 'Number', + label: '数量' + + }, + { + index: 'ParentName', + name: 'ParentName', + label: '所属机构' + } + ], + url: url + selectedId, + datatype: "json", + + viewrecords: true, + rowNum: 18, + pager: "#grid-pager", + altRows: true, + height: 'auto', + multiselect: true, + multiboxonly: true, + + loadComplete: function () { + var table = this; + setTimeout(function () { + updatePagerIcons(table); + }, + 0); + } + }).jqGrid('navGrid', "#grid-pager", { + edit: false, add: false, del: false, refresh: false, search: false + }); + + this.reload = function (id) { + if (id != undefined) selectedId = id; + this.maingrid.jqGrid("setGridParam", { url: url + selectedId }) + .trigger("reloadGrid", [{ page: 1 }]); //重载JQGrid + + }; +}; +MainGrid.prototype = new Grid(); +var list = new MainGrid(); +var vm = new Vue({ + el: '#editDlg' +}); + +//上级机构选择框 +var parent = new ParentTree("/UserSession/GetOrgs", "ParentName", "OrgId"); + +//添加（编辑）对话框 +var editDlg = function () { + var update = false; + var show = function () { + layer.open({ + type: 1, + skin: 'layui-layer-rim', //加上边框 + title: "进出库管理", //不显示标题 + area: ['400px', '300px'], //宽高 + content: $('#editDlg'), //捕获的元素 + btn: ['保存', '关闭'], + yes: function (index, layero) { + $.post("/StockManager/Add", vm.$data, function (data) { + layer.msg(data.Message); + if (data.Status) { + list.reload(); + ztree.reload(); + } + }, "json"); + }, + cancel: function (index) { + layer.close(index); + } + }); + } + return { + add: function () { //弹出添加 + update = false; + show(); + vm.$set('$data', { + Id: '00000000-0000-0000-0000-000000000000', + Number: 1 + }); + }, + update: function (ret) { //弹出编辑框 + update = true; + show(); + vm.$set('$data', ret); + } + }; +}(); + +//删除 +function del() { + list.del("Id", "/StockManager/Delete", function () { + list.reload(); + ztree.reload(); + }); +} + +//自定义的编辑按钮 +function edit() { + var selected = list.getSelectedObj(); + if (selected == null) { + return; + } + editDlg.update(selected); +} + +function add() { + editDlg.add(); +} + +function refresh() { + list.reload(); +} + + diff --git a/OpenAuth.Mvc/BllScripts/userRoleManager.js b/OpenAuth.Mvc/BllScripts/userRoleManager.js index 1d2d5b0f..88ea93af 100644 --- a/OpenAuth.Mvc/BllScripts/userRoleManager.js +++ b/OpenAuth.Mvc/BllScripts/userRoleManager.js @@ -1,109 +1,109 @@ -// *********************************************************************** -// Assembly : OpenAuth.Mvc -// Author : yubaolee -// Created : 04-13-2016 -// -// Last Modified By : yubaolee -// Last Modified On : 04-13-2016 -// *********************************************************************** -// -// 版权所有(C) 2015 -// -// 用户分配角色模块 -// *********************************************************************** -function renderLayui() { - layui.use(['layer', 'form'], function () { - var form = layui.form(); - - form.on('checkbox', function (data) { - if (data.elem.checked) { - $.post('/RelevanceManager/Assign', { - type: $("#moduleType").val(), - firstId: $('#firstId').val(), - secIds: data.value - }, function (json) { - json = $.parseJSON(json); - - }); - } - else { - $.post('/RelevanceManager/UnAssign', { - type: $("#moduleType").val(), - firstId: $('#firstId').val(), - secIds: data.value - }, function (json) { - json = $.parseJSON(json); - - }); - } - }); - - form.render(); - }); -} - -var list = function () { - var selectedId = '00000000-0000-0000-0000-000000000000'; //选中的ID - var url = '/RoleManager/LoadForOrgAndUser?userId=' + $("#firstId").val() - + "&key=" + $("#moduleType").val() + "&orgId="; - return { - reload: function (id) { - if (id != undefined) selectedId = id; - $.getJSON(url + selectedId, - function (data) { - var str = ''; - if (data.length > 0) { - $.each(data, - function () { - str += " +// 版权所有(C) 2015 +// +// 用户分配角色模块 +// *********************************************************************** +function renderLayui() { + layui.use(['layer', 'form'], function () { + var form = layui.form(); + + form.on('checkbox', function (data) { + if (data.elem.checked) { + $.post('/RelevanceManager/Assign', { + type: $("#moduleType").val(), + firstId: $('#firstId').val(), + secIds: data.value + }, function (json) { + json = $.parseJSON(json); + + }); + } + else { + $.post('/RelevanceManager/UnAssign', { + type: $("#moduleType").val(), + firstId: $('#firstId').val(), + secIds: data.value + }, function (json) { + json = $.parseJSON(json); + + }); + } + }); + + form.render(); + }); +} + +var list = function () { + var selectedId = '00000000-0000-0000-0000-000000000000'; //选中的ID + var url = '/RoleManager/LoadForOrgAndUser?userId=' + $("#firstId").val() + + "&key=" + $("#moduleType").val() + "&orgId="; + return { + reload: function (id) { + if (id != undefined) selectedId = id; + $.getJSON(url + selectedId, + function (data) { + var str = ''; + if (data.length > 0) { + $.each(data, + function () { + str += " - + diff --git a/OpenAuth.Mvc/Views/UserManager/Index.cshtml b/OpenAuth.Mvc/Views/UserManager/Index.cshtml index 49b6b8e8..971f334a 100644 --- a/OpenAuth.Mvc/Views/UserManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/UserManager/Index.cshtml @@ -54,19 +54,12 @@ placeholder="请输入昵称或姓名" autocomplete="off" class="layui-input"> +
- -
-
- -
- -
- - + + @@ -93,6 +86,6 @@
- + \ No newline at end of file diff --git a/OpenAuth.Mvc/js/droptree.js b/OpenAuth.Mvc/js/droptree.js new file mode 100644 index 00000000..f111718a --- /dev/null +++ b/OpenAuth.Mvc/js/droptree.js @@ -0,0 +1,126 @@ +// *********************************************************************** +// Assembly : OpenAuth.Mvc +// Author : yubaolee +// Created : 10-16-2016 +// +// Last Modified By : yubaolee +// Last Modified On : 10-16-2016 +// *********************************************************************** +// +// 版权所有(C) 2015 +// +// 单击文本框弹出的选择列表,可以多选 +// *********************************************************************** + +layui.define(['jquery', 'layer'], function (exports) { + var $ = layui.jquery; + var layer = layui.layer; + var options; + var zTreeObj; + var setting; + + var showMenu = function () { + $("#menuContent").css({ left: "10px", top: $(options.nameDOM).outerHeight() + "px" }).slideDown("fast"); + $("body").bind("mousedown", onBodyDown); + }; + function hideMenu() { + $("#menuContent").fadeOut("fast"); + $("body").unbind("mousedown", onBodyDown); + } + + var setCheck = function () { //设置初始选中的值 + zTreeObj.checkAllNodes(false); + + var value = $(options.idDOM).val(); + if (value == undefined) return; + var nodeids = value.split(","); + $.each(nodeids, + function () { + var node = zTreeObj.getNodeByParam("Id", this, null); + if (node != null) { + zTreeObj.checkNode(node, true, false); + } + }); + + } + function onClick(e, treeId, treeNode) { + var nodes = zTreeObj.getSelectedNodes(); + + for (var i = 0, l = nodes.length; i < l; i++) { + $(options.nameDOM).val(nodes[i].Name); + $(options.idDOM).val(nodes[i].Id); + break; + } + hideMenu(); + } + function onCheck(e, treeId, treeNode) { + var nodes = zTreeObj.getCheckedNodes(true); + + var ids = nodes.map(function (e) { return e.Id; }).join(","); + var names = nodes.map(function (e) { return e.Name; }).join(","); + $(options.nameDOM).val(names); + $(options.idDOM).val(ids); + } + + function onBodyDown(event) { + if (!(event.target.id == "menuContent" || $(event.target).parents("#menuContent").length > 0)) { + hideMenu(); + } + } + + var load = function () { + var index = layer.load(); + $.getJSON(options.url, + { + page: 1, rows: 10000 + }, + function (json) { + layer.close(index); + if (json.length == 0) { + $(options.nameDOM).val(''); + $(options.idDOM).val(''); + return; + } + zTreeObj = $.fn.zTree.init($("#org"), setting, json); + setCheck(); + zTreeObj.expandAll(true); + showMenu(); + }); + } + + exports('droptree', function (url, name, id) { + options = { + text: 'Name', + key: 'Id', + parentKey: 'ParentId', + nameDOM: name, //显示的文本框ID，如："#catetoryName" + idDOM: id, //隐藏的文本框，如："#categoryId" + url: url + } + setting = { + view: { selectedMulti: true }, + check: { + enable: true, + chkStyle: "checkbox", + chkboxType: { "Y": "", "N": "" } //去掉勾选时级联 + }, + data: { + key: { + name: options.text, + title: options.text + }, + simpleData: { + enable: true, + idKey: options.key, + pIdKey: options.parentKey, + rootPId: 'null' + } + }, + callback: { + onClick: onClick, + onCheck: onCheck + } + }; + load(); + }); +}); \ No newline at end of file diff --git a/OpenAuth.Mvc/js/parentTreeMultiple.js b/OpenAuth.Mvc/js/parentTreeMultiple.js deleted file mode 100644 index 8cf8459c..00000000 --- a/OpenAuth.Mvc/js/parentTreeMultiple.js +++ /dev/null @@ -1,118 +0,0 @@ -// *********************************************************************** -// Assembly : OpenAuth.Mvc -// Author : yubaolee -// Created : 10-16-2016 -// -// Last Modified By : yubaolee -// Last Modified On : 10-16-2016 -// *********************************************************************** -// -// 版权所有(C) 2015 -// -// 单击文本框弹出的选择列表,可以多选 -// *********************************************************************** - -function ParentTreeMultiple(url, name, id) { - var zTreeObj; - var options = { - text: 'Name', - key: 'Id', - parentKey: 'ParentId', - nameDOM: name, //显示的文本框ID，如："#catetoryName" - idDOM: id //隐藏的文本框，如："#categoryId" - } - var setting = { - view: { selectedMulti: true }, - check: { - enable: true, - chkStyle: "checkbox", - chkboxType: { "Y": "", "N": "" } //去掉勾选时级联 - }, - data: { - key: { - name: options.text, - title: options.text - }, - simpleData: { - enable: true, - idKey: options.key, - pIdKey: options.parentKey, - rootPId: 'null' - } - }, - callback: { - onClick: onClick, - onCheck: onCheck - } - }; - var showMenu = function () { - $("#menuContent").css({ left: "10px", top: $("#" + options.nameDOM).outerHeight() + "px" }).slideDown("fast"); - $("body").bind("mousedown", onBodyDown); - }; - - var setCheck = function () { //设置初始选中的值 - zTreeObj.checkAllNodes(false); - - var value = vm.$get(options.idDOM); - if (value == undefined) return; - var nodeids = value.split(","); - $.each(nodeids, - function() { - var node = zTreeObj.getNodeByParam("Id", this, null); - if (node != null) { - zTreeObj.checkNode(node, true, false); - } - }); - - } - function onClick(e, treeId, treeNode) { - var nodes = zTreeObj.getSelectedNodes(); - - for (var i = 0, l = nodes.length; i < l; i++) { - vm.$set(options.nameDOM, nodes[i].Name); - vm.$set(options.idDOM, nodes[i].Id); - break; - } - hideMenu(); - } - function onCheck(e, treeId, treeNode) { - var nodes = zTreeObj.getCheckedNodes(true); - - var ids = nodes.map(function (e) { return e.Id; }).join(","); - var names = nodes.map(function (e) { return e.Name; }).join(","); - - vm.$set(options.nameDOM, names); - vm.$set(options.idDOM, ids); - } - - function onBodyDown(event) { - if (!(event.target.id == "menuContent" || $(event.target).parents("#menuContent").length > 0)) { - hideMenu(); - } - } - function hideMenu() { - $("#menuContent").fadeOut("fast"); - $("body").unbind("mousedown", onBodyDown); - } - return { - reload: function (layer, $) { - var index = layer.load(); - $.getJSON(url, - { - page: 1, rows: 10000 - }, - function (json) { - layer.close(index); - if (json.length == 0) { - vm.$set(options.nameDOM, ''); - vm.$set(options.idDOM, ''); - return; - } - zTreeObj = $.fn.zTree.init($("#org"), setting, json); - setCheck(); - zTreeObj.expandAll(true); - showMenu(); - }); - } - } -} \ No newline at end of file diff --git a/OpenAuth.Mvc/js/users.js b/OpenAuth.Mvc/js/users.js index 8cf5d0b7..21b8e410 100644 --- a/OpenAuth.Mvc/js/users.js +++ b/OpenAuth.Mvc/js/users.js @@ -1,6 +1,6 @@ layui.config({ base: "/js/" -}).use(['form', 'ztree', 'layer', 'jquery', 'table'], function () { +}).use(['form', 'ztree', 'layer', 'jquery', 'table','droptree'], function () { var form = layui.form, //layer = parent.layer === undefined ? layui.layer : parent.layer, layer =layui.layer, @@ -57,9 +57,8 @@ layui.config({ }(); //上级机构选择框 - var parent = new ParentTreeMultiple("/UserSession/GetOrgs", "Organizations", "OrganizationIds"); $("#Organizations").on("click", function () { - parent.reload(layer, $); + layui.droptree("/UserSession/GetOrgs", "#Organizations", "#OrganizationIds"); }); //监听表格复选框选择 diff --git a/OpenAuth.Mvc/layui/font/iconfont.svg b/OpenAuth.Mvc/layui/font/iconfont.svg index 53db2f6d..e1e37c9a 100644 --- a/OpenAuth.Mvc/layui/font/iconfont.svg +++ b/OpenAuth.Mvc/layui/font/iconfont.svg @@ -1,402 +1,402 @@ - - - - - -Created by iconfont - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + +Created by iconfont + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +