From 43c44d30af3a7a7b7c25165fa9dce9a49a52e250 Mon Sep 17 00:00:00 2001 From: yubaolee Date: Sat, 15 Oct 2016 01:27:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=94=A8=E6=88=B7=E5=88=97?= =?UTF-8?q?=E8=A1=A8/=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8=E6=94=B9?= =?UTF-8?q?=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAuth.App/ResourceManagerApp.cs | 4 +- OpenAuth.App/UserManagerApp.cs | 19 +- OpenAuth.Domain/Service/ResManagerService.cs | 4 +- OpenAuth.Mvc/BllScripts/commonApply.js | 4 +- OpenAuth.Mvc/BllScripts/modulemanager.js | 4 +- OpenAuth.Mvc/BllScripts/orgManager.js | 8 +- OpenAuth.Mvc/BllScripts/processDetail.js | 4 +- OpenAuth.Mvc/BllScripts/resourceManager.js | 314 +++++++++--------- OpenAuth.Mvc/BllScripts/roleManager.js | 2 +- OpenAuth.Mvc/BllScripts/stockManager.js | 2 +- OpenAuth.Mvc/BllScripts/usermanager.js | 286 ++++++++-------- .../BllScripts/workflowSchemaManager.js | 4 +- .../Controllers/ResourceManagerController.cs | 5 +- .../Controllers/UserManagerController.cs | 9 +- .../Views/ResourceManager/Index.cshtml | 154 +++++---- OpenAuth.Mvc/Views/UserManager/Index.cshtml | 155 ++++----- 16 files changed, 509 insertions(+), 469 deletions(-) diff --git a/OpenAuth.App/ResourceManagerApp.cs b/OpenAuth.App/ResourceManagerApp.cs index 9743a84c..1c30f775 100644 --- a/OpenAuth.App/ResourceManagerApp.cs +++ b/OpenAuth.App/ResourceManagerApp.cs @@ -39,9 +39,9 @@ namespace OpenAuth.App - public void Delete(Guid id) + public void Delete(Guid[] ids) { - _resManagerService.Delete(id); + _resManagerService.Delete(ids); } public void AddOrUpdate(Resource model) diff --git a/OpenAuth.App/UserManagerApp.cs b/OpenAuth.App/UserManagerApp.cs index 07cc75e9..20cf14b2 100644 --- a/OpenAuth.App/UserManagerApp.cs +++ b/OpenAuth.App/UserManagerApp.cs @@ -47,17 +47,17 @@ namespace OpenAuth.App { if (pageindex < 1) pageindex = 1; //TODO:如果列表为空新增加一个用户后，前端会传一个0过来，奇怪？？ IEnumerable users; - int total = 0; + int records = 0; if (orgId ==Guid.Empty) { users = _repository.LoadUsers(pageindex, pagesize); - total = _repository.GetCount(); + records = _repository.GetCount(); } else { var ids = GetSubOrgIds(orgId); users = _repository.LoadInOrgs(pageindex, pagesize, ids); - total = _repository.GetUserCntInOrgs(ids); + records = _repository.GetUserCntInOrgs(ids); } var userviews = new List(); foreach (var user in users) @@ -71,7 +71,8 @@ namespace OpenAuth.App return new GridData { - total = total, + records = records, + total = (int)Math.Ceiling((double)records / pagesize), rows = userviews, page = pageindex }; @@ -103,12 +104,12 @@ namespace OpenAuth.App return view; } - public void Delete(Guid id) + public void Delete(Guid[] ids) { - _repository.Delete(u => u.Id == id); - _relevanceRepository.DeleteBy("UserOrg", id); - _relevanceRepository.DeleteBy("UserModule", id); - _relevanceRepository.DeleteBy("UserRole", id); + _repository.Delete(u => ids.Contains(u.Id)); + _relevanceRepository.DeleteBy("UserOrg", ids); + _relevanceRepository.DeleteBy("UserModule", ids); + _relevanceRepository.DeleteBy("UserRole", ids); } public void AddOrUpdate(UserView view) diff --git a/OpenAuth.Domain/Service/ResManagerService.cs b/OpenAuth.Domain/Service/ResManagerService.cs index c69f78a0..72770d06 100644 --- a/OpenAuth.Domain/Service/ResManagerService.cs +++ b/OpenAuth.Domain/Service/ResManagerService.cs @@ -94,9 +94,9 @@ namespace OpenAuth.Domain.Service return resource; } - public void Delete(Guid id) + public void Delete(Guid[] ids) { - _repository.Delete(id); + _repository.Delete(u =>ids.Contains(u.Id)); } public void AddOrUpdate(Resource resource) diff --git a/OpenAuth.Mvc/BllScripts/commonApply.js b/OpenAuth.Mvc/BllScripts/commonApply.js index 72622952..6b31ecea 100644 --- a/OpenAuth.Mvc/BllScripts/commonApply.js +++ b/OpenAuth.Mvc/BllScripts/commonApply.js @@ -134,11 +134,11 @@ function del() { if (selected == null) return; $.post('/CommonApplies/Delete?Id=' + selected.Id, function (data) { - if (data.statusCode == "200") { + if (data.Status) { list.reload(); } else { - $(this).alertmsg('warn', data.message); + $(this).alertmsg('warn', data.Message); } }, "json"); } diff --git a/OpenAuth.Mvc/BllScripts/modulemanager.js b/OpenAuth.Mvc/BllScripts/modulemanager.js index 1d446b8d..816f260b 100644 --- a/OpenAuth.Mvc/BllScripts/modulemanager.js +++ b/OpenAuth.Mvc/BllScripts/modulemanager.js @@ -264,12 +264,12 @@ function del() { if (selected == null) return; $.post('/moduleManager/Delete?Id=' + selected.Id, function (data) { - if (data.statusCode == "200") { + if (data.Status) { list.reload(); ztree.reload(); } else { - $(this).alertmsg('warn', data.message); + $(this).alertmsg('warn', data.Message); } }, "json"); } diff --git a/OpenAuth.Mvc/BllScripts/orgManager.js b/OpenAuth.Mvc/BllScripts/orgManager.js index 81e06e02..dd4310d8 100644 --- a/OpenAuth.Mvc/BllScripts/orgManager.js +++ b/OpenAuth.Mvc/BllScripts/orgManager.js @@ -210,9 +210,11 @@ var editDlg = function () { add: function () { //弹出添加 update = false; show(); - vm.$set('$data', null); - vm.$set('Id', '00000000-0000-0000-0000-000000000000'); - vm.$set('SortNo', 0); + vm.$set('$data', + { + Id: '00000000-0000-0000-0000-000000000000', + SortNo: 0 + }); }, update: function (ret) { //弹出编辑框 update = true; diff --git a/OpenAuth.Mvc/BllScripts/processDetail.js b/OpenAuth.Mvc/BllScripts/processDetail.js index bb74e7c3..26cfd1d9 100644 --- a/OpenAuth.Mvc/BllScripts/processDetail.js +++ b/OpenAuth.Mvc/BllScripts/processDetail.js @@ -39,11 +39,11 @@ $(function () { .on("click", function () { //执行命令 $.post("/CommonApplies/ExeCmd?id=" +$("#processId").val() +"&cmd=" +$(this).val() , function (data) { - if (data.statusCode == "200") { + if (data.Status) { BJUI.dialog('refresh', 'detailDlg'); } else { - $(this).alertmsg('warn', data.message); + $(this).alertmsg('warn', data.Message); } },'json'); }); diff --git a/OpenAuth.Mvc/BllScripts/resourceManager.js b/OpenAuth.Mvc/BllScripts/resourceManager.js index bab40821..a7748500 100644 --- a/OpenAuth.Mvc/BllScripts/resourceManager.js +++ b/OpenAuth.Mvc/BllScripts/resourceManager.js @@ -1,71 +1,10 @@ - -//grid列表模块 -function MainGrid() { - var url = '/ResourceManager/Load?categoryId='; - var selectedId = '00000000-0000-0000-0000-000000000000'; //ztree选中的模块 - this.maingrid = $('#maingrid').datagrid({ - showToolbar: false, - filterThead: false, - loadType: 'GET', - target: $(this), - columns: [ - { - name: 'Id', - label: '资源表ID', - width: 100 - , hide: true - }, - - { - name: 'Key', - label: 'Key', - width: 100 - }, - { - name: 'Name', - label: '名称', - width: 100 - }, - - { - name: 'Status', - label: '当前状态', - width: 100 - , align: 'center', - items: [{ '0': '默认' }, { '1': '状态1' }], - }, - { - name: 'SortNo', - label: '排序号', - width: 100 - , align: 'center', - items: [{ '0': '默认' }, { '1': '状态1' }], - }, - - { - name: 'Description', - label: '描述', - width: 100 - }, - ], - dataUrl: url + selectedId, - fullGrid: true, - showLinenumber: true, - showCheckboxcol: true, - paging: true, - filterMult: false, - showTfoot: false, - +$(function () { + $("#ParentName").on("click", function () { + parent.reload(); }); - this.reload = function (id) { - if (id != undefined) selectedId = id; - this.maingrid.datagrid('reload', { dataUrl: url + selectedId }); - }; -}; -MainGrid.prototype = new Grid(); -var list = new MainGrid(); +}); -//左边分类导航树 +//左边导航 var ztree = function () { var url = '/CategoryManager/LoadForTree'; var setting = { @@ -82,38 +21,106 @@ var ztree = function () { rootPId: 'null' } }, - callback: { onClick: zTreeOnClick } + callback: { + onClick: function (event, treeId, treeNode) { + list.reload(treeNode.Id); + } + } }; - $.getJSON(url, function (json) { - $.fn.zTree.init($("#tree"), setting, json).expandAll(true); - }); - function zTreeOnClick(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: function () { - $.getJSON(url, function (json) { - $.fn.zTree.init($("#tree"), setting, json).expandAll(true); - }); - } + reload: load } }(); -//编辑时，选择上级弹出的树 -var parentTree = function () { - var nameDom = "#CategoryName"; - var idDom = "#CategoryId"; +//grid列表模块 +function MainGrid() { + var url = '/ResourceManager/Load?categoryId='; + var selectedId = '00000000-0000-0000-0000-000000000000'; //ztree选中的模块 + this.maingrid = $('#maingrid') + .jqGrid({ + colModel: [ + { + name: 'Id', + index: 'Id', + hidden: true + }, + { + index: 'Key', + name: 'Key', + label: '资源标识' + }, + { + index: 'Name', + name: 'Name', + label: '分类名称' + }, + { + index: 'CategoryName', + name: 'CategoryName', + label: '所属分类' + }, + { + index: 'CategoryId', + name: 'CategoryId', + 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 = function (name,id) { //ztree搜索框 var zTreeObj; var setting = { - view: { - selectedMulti: false - }, - check: { - enable: true, - chkStyle: "radio", //单选 - radioType: "all" - }, + view: { selectedMulti: false }, data: { key: { name: 'Name', @@ -127,106 +134,107 @@ var parentTree = function () { } }, callback: { - onClick: zTreeOnClick, - onCheck: zTreeCheck + onClick: onClick } }; + var showMenu = function () { + $("#menuContent").css({ left: "10px", top: $("#"+name).outerHeight() + "px" }).slideDown("fast"); + $("body").bind("mousedown", onBodyDown); + }; + function onClick(e, treeId, treeNode) { + var nodes = zTreeObj.getSelectedNodes(); - function zTreeCheck(event, 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(","); - - $(nameDom).val(names); - $(idDom).val(ids); + for (var i = 0, l = nodes.length; i < l; i++) { + vm.$set(name, nodes[i].Name); + vm.$set(id, nodes[i].Id); + break; + } + hideMenu(); } - function zTreeOnClick(event, treeId, treeNode) { - zTreeObj.checkNode(treeNode, !treeNode.checked, true, true); - event.preventDefault(); + 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 { - show: function () { - $.getJSON('/CategoryManager/LoadForTree', function (json) { - zTreeObj = $.fn.zTree.init($('#j_select_tree1'), setting, json); - var orgstr = $(idDom).val(); - var name = ''; - if (orgstr != '') { - var nodeIds = orgstr.split(','); - $.each(nodeIds, function () { - var node = zTreeObj.getNodeByParam("Id", this, null); - name += ',' + node.Name; - zTreeObj.checkNode(node, true, true); - }); - $(nameDom).val(name.substr(1)); //显示名称 + reload: function () { + var index = layer.load(); + $.getJSON("/CategoryManager/LoadForTree", { + page: 1, rows: 10000 + }, function (json) { + layer.close(index); + if (json.length == 0) { + vm.$set(name, ''); + vm.$set(id, ''); + return; } + zTreeObj = $.fn.zTree.init($("#org"), setting, json); zTreeObj.expandAll(true); + showMenu(); }); } - }; -}(); + } +}("CategoryName","CategoryId"); //添加（编辑）对话框 var editDlg = function () { var update = false; var show = function () { - BJUI.dialog({ id: 'editDlg', title: '编辑对话框', target: '#editDlg' }); - $("#btnSave").on("click", function () { - editDlg.save(); + layer.open({ + type: 1, + skin: 'layui-layer-rim', //加上边框 + title: "用户管理", //不显示标题 + area: ['400px', '300px'], //宽高 + content: $('#editDlg'), //捕获的元素 + btn: ['保存', '关闭'], + yes: function (index, layero) { + $.post("/CategoryManager/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(); - $.CurrentDialog.find("form")[0].reset(); //reset方法只能通过dom调用 - $("#Id").val('00000000-0000-0000-0000-000000000000'); - - parentTree.show(); + vm.$set('$data', { + Id: '00000000-0000-0000-0000-000000000000', + SortNo: 0 + }); }, update: function (ret) { //弹出编辑框 update = true; show(); - $('#Id').val(ret.Id); - $('#Key').val(ret.Key); - $('#Name').val(ret.Name); - $('#Status').selectpicker('val', ret.Status); - $('#SortNo').val(ret.SortNo); - $('#CategoryId').val(ret.CategoryId); - $('#Description').val(ret.Description); - parentTree.show(); - }, - save: function () { //编辑-->保存 - $('#editForm').isValid(function (v) { - if (!v) return; //验证没通过 - $("#editForm").bjuiajax('ajaxForm', { - reload: false, - callback: function (json) { - if (json.statusCode != "200") { - $(this).alertmsg('warn', json.message); - return; - } - list.reload(); - ztree.reload(); - } - }); - }); + vm.$set('$data', ret); } }; }(); //删除 function del() { - var selected = list.getSelectedObj(); + var selected = list.getSelectedProperties("Id"); if (selected == null) return; - $.post('/ResourceManager/Delete?Id=' + selected.Id, function (data) { - if (data.statusCode == "200") { + $.post('/ResourceManager/Delete', + { ids: selected }, function (data) { + if (data.Status) { list.reload(); ztree.reload(); } else { - $(this).alertmsg('warn', data.message); + $(this).alertmsg('warn', data.Message); } }, "json"); } diff --git a/OpenAuth.Mvc/BllScripts/roleManager.js b/OpenAuth.Mvc/BllScripts/roleManager.js index fdf5135d..bbce1fff 100644 --- a/OpenAuth.Mvc/BllScripts/roleManager.js +++ b/OpenAuth.Mvc/BllScripts/roleManager.js @@ -219,7 +219,7 @@ function del() { if (selected == null) return; $.post('/RoleManager/Delete?Id=' + selected.Id, function (data) { - if (data.statusCode == "200") { + if (data.Status) { list.reload(); orgtree.reload(); } diff --git a/OpenAuth.Mvc/BllScripts/stockManager.js b/OpenAuth.Mvc/BllScripts/stockManager.js index 977d0365..94bb0244 100644 --- a/OpenAuth.Mvc/BllScripts/stockManager.js +++ b/OpenAuth.Mvc/BllScripts/stockManager.js @@ -233,7 +233,7 @@ function del() { if (selected == null) return; $.post('/StockManager/Delete?Id=' + selected.Id, function (data) { - if (data.statusCode == "200") { + if (data.Status) { list.reload(); ztree.reload(); } diff --git a/OpenAuth.Mvc/BllScripts/usermanager.js b/OpenAuth.Mvc/BllScripts/usermanager.js index 0c849c4a..f523aacc 100644 --- a/OpenAuth.Mvc/BllScripts/usermanager.js +++ b/OpenAuth.Mvc/BllScripts/usermanager.js @@ -1,5 +1,11 @@ -//左边分类导航树 -var maintree = function () { +$(function () { + $("#Organizations").on("click", function () { + parent.reload(); + }); +}); + +//左边导航 +var ztree = function () { var url = '/OrgManager/LoadOrg'; var setting = { view: { selectedMulti: false }, @@ -24,13 +30,7 @@ var maintree = function () { var load = function () { $.getJSON(url, function (json) { var zTreeObj = $.fn.zTree.init($("#orgtree"), setting, json); - var firstId; //tree的第一个ID - if (json.length > 0) { - firstId = json[0].Id; - } else { - firstId = -1; - } - list.reload(firstId); + list.reload(); zTreeObj.expandAll(true); }); }; @@ -44,79 +44,83 @@ var maintree = function () { //grid列表模块 function MainGrid() { var url = '/UserManager/Load?orgId='; - var selectedId ='00000000-0000-0000-0000-000000000000'; //ztree选中的模块 - this.maingrid = $('#maingrid').datagrid({ - showToolbar: false, - filterThead: false, - target: $(this), - loadType: 'GET', - columns: [ - { - name: 'Id', - label: 'Id', - width: 100 - , hide: true - }, - { - name: 'Account', - label: '账号', - width: 100 - }, - { - name: 'Name', - label: '名称', - width: 100 - }, - { - name: 'Sex', - label: '性别', - width: 100 - , align: 'center', - items: [{ '0': '男' }, { '1': '女' }], - }, - { - name: 'Status', - label: '状态', - width: 100 - , align: 'center', - items: [{ '0': '默认' }, { '1': '状态1' }], - }, - { - name: 'Type', - label: '用户类型', - width: 100 - , align: 'center', - items: [{ '0': '默认' }, { '1': '类型' }], - } - - ], - dataUrl: url + selectedId, //todo:这里如果配置data:[]的话，不会自动加载，但在分页的下拉中会有undefined - fullGrid: true, - showLinenumber: true, - showCheckboxcol: true, - paging: true, - filterMult: false, - showTfoot: false, - - }); + 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: 'Account', + name: 'Account', + label: '账号' + }, + { + index: 'Sex', + name: 'Sex', + 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.datagrid('reload', { dataUrl: url + selectedId }); + 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 parentTree = function () { - var nameDom = "#Organizations"; - var idDom = "#OrganizationIds"; +//上级机构选择框 +var parent = function () { //ztree搜索框 var zTreeObj; var setting = { - view: { - selectedMulti: false - }, + view: { selectedMulti: true }, check: { enable: true, chkStyle: "checkbox", @@ -135,113 +139,127 @@ var parentTree = function () { } }, callback: { - onClick: zTreeOnClick, - onCheck: zTreeCheck + onClick: onClick, + onCheck: onCheck } }; + var showMenu = function () { + $("#menuContent").css({ left: "10px", top: $("#Organizations").outerHeight() + "px" }).slideDown("fast"); + $("body").bind("mousedown", onBodyDown); + }; + function onClick(e, treeId, treeNode) { + var nodes = zTreeObj.getSelectedNodes(); + for (var i = 0, l = nodes.length; i < l; i++) { + vm.$set('Organizations', nodes[i].Name); + vm.$set('OrganizationIds', nodes[i].Id); + break; + } + hideMenu(); + } - function zTreeCheck(event, treeId, treeNode) { + 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(","); - $(nameDom).val(names); - $(idDom).val(ids); + vm.$set('Organizations', names); + vm.$set('OrganizationIds', ids); } - function zTreeOnClick(event, treeId, treeNode) { - zTreeObj.checkNode(treeNode, !treeNode.checked, true, true); - event.preventDefault(); + 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 { - show: function () { - $.getJSON('/OrgManager/LoadOrg', function (json) { - zTreeObj = $.fn.zTree.init($('#j_select_tree1'), setting, json); - var orgstr = $(idDom).val(); - var name = ''; - if (orgstr != '') { - var nodeIds = orgstr.split(','); - $.each(nodeIds, function () { - var node = zTreeObj.getNodeByParam("Id", this, null); - name += ',' + node.Name; - zTreeObj.checkNode(node, true, true); - }); - $(nameDom).val(name.substr(1)); //显示名称 + reload: function () { + var index = layer.load(); + $.getJSON("/OrgManager/LoadOrg", { + page: 1, rows: 10000 + }, function (json) { + layer.close(index); + if (json.length == 0) { + vm.$set('Organizations', ''); + vm.$set('OrganizationIds', ''); + return; } + zTreeObj = $.fn.zTree.init($("#org"), setting, json); zTreeObj.expandAll(true); + showMenu(); }); } - }; + } }(); //添加（编辑）对话框 var editDlg = function () { var update = false; var show = function () { - BJUI.dialog({ id: 'editDlg', title: '编辑对话框', target: '#editDlg' }); - $("#btnSave").on("click", function () { - editDlg.save(); + layer.open({ + type: 1, + skin: 'layui-layer-rim', //加上边框 + title: "用户管理", //不显示标题 + area: ['400px', '300px'], //宽高 + content: $('#editDlg'), //捕获的元素 + btn: ['保存', '关闭'], + yes: function (index, layero) { + $.post("/UserManager/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(); - $.CurrentDialog.find("form")[0].reset(); //reset方法只能通过dom调用 - $("#Id").val('00000000-0000-0000-0000-000000000000'); - parentTree.show(); - + vm.$set('$data', + { + Id:'00000000-0000-0000-0000-000000000000', + Sex:0 + }); }, update: function (ret) { //弹出编辑框 update = true; show(); - $('#Id').val(ret.Id); - $('#Account').val(ret.Account); - $('#Name').val(ret.Name); - $('#Sex').selectpicker('val', ret.Sex); - $('#Status').selectpicker('val', ret.Status); - $('#Type').selectpicker('val', ret.Type); - $("#OrganizationIds").val(ret.OrganizationIds); - parentTree.show(); - }, - save: function () { //编辑-->保存 - $('#editForm').isValid(function (v) { - if (!v) return; //验证没通过 - $("#editForm").bjuiajax('ajaxForm', { - reload: false, - callback: function (json) { - if (json.statusCode != "200") { - $(this).alertmsg('warn', json.message); - return; - } - list.reload(); - maintree.reload(); - } - }); - }); + vm.$set('$data', ret); } }; }(); + + //删除 function del() { - var selected = list.getSelectedObj(); + var selected = list.getSelectedProperties("Id"); if (selected == null) return; - $.post('/UserManager/Delete?Id=' + selected.Id, function (data) { - if (data.statusCode == "200") { + $.post('/UserManager/Delete', + { ids: selected }, + function (data) { + if (data.Status) { list.reload(); - maintree.reload(); + ztree.reload(); } else { - $(this).alertmsg('warn', data.message); + layer.msg(data.Message); } }, "json"); } - //自定义的编辑按钮 function edit() { var selected = list.getSelectedObj(); @@ -329,6 +347,4 @@ function openAssignUserElement(obj) { key: "UserElement" } }); -} - -//@@ sourceURL=UserManager.js \ No newline at end of file +} \ No newline at end of file diff --git a/OpenAuth.Mvc/BllScripts/workflowSchemaManager.js b/OpenAuth.Mvc/BllScripts/workflowSchemaManager.js index 298eab90..722fd088 100644 --- a/OpenAuth.Mvc/BllScripts/workflowSchemaManager.js +++ b/OpenAuth.Mvc/BllScripts/workflowSchemaManager.js @@ -35,7 +35,7 @@ function del() { if (selected == null) return; $.post('/StockManager/Delete?Id=' + selected.Id, function (data) { - if (data.statusCode == "200") { + if (data.Status) { list.reload(); ztree.reload(); } @@ -66,7 +66,7 @@ function del() { if (selected == null) return; $.post('/WorkflowSchemas/Del?code=' +selected.Code, function (data) { - if (data.statusCode == "200") { + if (data.Status) { list.reload(); } else { diff --git a/OpenAuth.Mvc/Controllers/ResourceManagerController.cs b/OpenAuth.Mvc/Controllers/ResourceManagerController.cs index c64a3032..4f50f624 100644 --- a/OpenAuth.Mvc/Controllers/ResourceManagerController.cs +++ b/OpenAuth.Mvc/Controllers/ResourceManagerController.cs @@ -56,11 +56,12 @@ namespace OpenAuth.Mvc.Controllers return JsonHelper.Instance.Serialize(models); } - public string Delete(Guid Id) + [HttpPost] + public string Delete(Guid[] ids) { try { - _app.Delete(Id); + _app.Delete(ids); } catch (Exception e) { diff --git a/OpenAuth.Mvc/Controllers/UserManagerController.cs b/OpenAuth.Mvc/Controllers/UserManagerController.cs index f945176b..a8296ec8 100644 --- a/OpenAuth.Mvc/Controllers/UserManagerController.cs +++ b/OpenAuth.Mvc/Controllers/UserManagerController.cs @@ -50,15 +50,12 @@ namespace OpenAuth.Mvc.Controllers return JsonHelper.Instance.Serialize(_app.Load(orgId, pageCurrent, pageSize)); } - public string Delete(Guid Id) + [HttpPost] + public string Delete(Guid[] ids) { try { - _app.Delete(Id); - //foreach (var obj in Id.Split(',')) - //{ - // _app.Delete(int.Parse(obj)); - //} + _app.Delete(ids); } catch (Exception e) { diff --git a/OpenAuth.Mvc/Views/ResourceManager/Index.cshtml b/OpenAuth.Mvc/Views/ResourceManager/Index.cshtml index 9b628fa0..7c988cb3 100644 --- a/OpenAuth.Mvc/Views/ResourceManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/ResourceManager/Index.cshtml @@ -1,85 +1,95 @@ @{ Layout = "~/Views/Shared/_Layout.cshtml"; } - -@{ Html.RenderAction("MenuHeader", "Home");} -
-
-
-
    -
    - -
    -
    -
    -
    + + - -