diff --git a/OpenAuth.App/StockManagerApp.cs b/OpenAuth.App/StockManagerApp.cs index f33ff2f5..d515cef8 100644 --- a/OpenAuth.App/StockManagerApp.cs +++ b/OpenAuth.App/StockManagerApp.cs @@ -17,12 +17,12 @@ namespace OpenAuth.App /// /// 根据部门ID得到进出库信息 /// - public dynamic Load(string username, Guid orgId, int pageindex, int pagesize) + public dynamic Load(string username, Guid orgId, int page, int rows) { - return _service.Load(username, orgId, pageindex, pagesize); + return _service.Load(username, orgId, page, rows); } - public void Delete(Guid id) + public void Delete(Guid[] id) { _service.Delete(id); } diff --git a/OpenAuth.Domain/Service/ResManagerService.cs b/OpenAuth.Domain/Service/ResManagerService.cs index 388d3c10..a93ba382 100644 --- a/OpenAuth.Domain/Service/ResManagerService.cs +++ b/OpenAuth.Domain/Service/ResManagerService.cs @@ -47,7 +47,7 @@ namespace OpenAuth.Domain.Service /// /// 加载用户一个节点下面的一个或全部Resources /// - public dynamic Load(string username, Guid categoryId, int pageindex, int pagesize) + public dynamic Load(string username, Guid categoryId, int page, int rows) { var service = _factory.Create(username); if (!service.GetResourcesQuery().Any()) //用户没有任何资源 @@ -75,7 +75,7 @@ namespace OpenAuth.Domain.Service }; var listVms = new List(); - var resources = query.OrderBy(u => u.SortNo).Skip((pageindex - 1) * pagesize).Take(pagesize); + var resources = query.OrderBy(u => u.SortNo).Skip((page - 1) * rows).Take(rows); foreach (var element in resources) { var accessed = _categoryRepository.FindSingle(u => u.Id == element.CategoryId); @@ -94,9 +94,9 @@ namespace OpenAuth.Domain.Service return new { records = total, - total = (int)Math.Ceiling((double)total / pagesize), + total = (int)Math.Ceiling((double)total / rows), rows = listVms, - page = pageindex + page = page }; } diff --git a/OpenAuth.Domain/Service/StockManagerService.cs b/OpenAuth.Domain/Service/StockManagerService.cs index b99b31e8..cb7661b5 100644 --- a/OpenAuth.Domain/Service/StockManagerService.cs +++ b/OpenAuth.Domain/Service/StockManagerService.cs @@ -35,7 +35,8 @@ namespace OpenAuth.Domain.Service return new { total = 0, - pageCurrent = pageindex + records = 0, + page = pageindex }; } @@ -54,9 +55,10 @@ namespace OpenAuth.Domain.Service return new { - total = total, - list = stocks, - pageCurrent = pageindex + records = total, + total = (int)Math.Ceiling((double)total / pagesize), + rows = stocks, + page = pageindex }; } @@ -68,9 +70,9 @@ namespace OpenAuth.Domain.Service return stock; } - public void Delete(Guid id) + public void Delete(Guid[] id) { - _repository.Delete(id); + _repository.Delete(u =>id.Contains(u.Id)); } public void AddOrUpdate(Stock stock) diff --git a/OpenAuth.Mvc/BllScripts/stockManager.js b/OpenAuth.Mvc/BllScripts/stockManager.js index 40bd1df7..3951c5c7 100644 --- a/OpenAuth.Mvc/BllScripts/stockManager.js +++ b/OpenAuth.Mvc/BllScripts/stockManager.js @@ -1,4 +1,10 @@ -//左边分类导航树 +$(function () { + $("#ParentName").on("click", function () { + parent.reload(); + }); +}); + +//左边导航 var ztree = function () { var url = '/OrgManager/LoadOrg'; var setting = { @@ -23,14 +29,8 @@ var ztree = function () { }; var load = function () { $.getJSON(url, function (json) { - var zTreeObj = $.fn.zTree.init($("#tree"), setting, json); - var firstId; //tree的第一个ID - if (json.length > 0) { - firstId = json[0].Id; - } else { - firstId = -1; - } - list.reload(firstId); + var zTreeObj = $.fn.zTree.init($("#orgtree"), setting, json); + list.reload(); zTreeObj.expandAll(true); }); }; @@ -40,205 +40,141 @@ var ztree = function () { reload: load } }(); + //grid列表模块 function MainGrid() { var url = '/StockManager/Load?parentId='; 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', - hide: true - }, - { - name: 'OrgId', - label: '组织ID', - hide:true - }, - { - name: 'Name', - label: '产品名称', - width: 100 - }, - { - name: 'Number', - label: '产品数量', - width: 100 - }, - { - name: 'Price', - label: '产品单价', - width: 100 - }, - { - name: 'Status', - label: '出库/入库', - width: 100 - , align: 'center', - items: [{ '0': '出库' }, { '1': '入库' }], - }, - { - name: 'Viewable', - label: '可见范围(测试资源使用)', - width: 100, - items: [{ '': '全部可见' }, { 'ADMIN': '管理员可见' },{'DEV':'开发可见'}], - }, - { - name: 'Time', - label: '操作时间', - width: 100 - } - ], - dataUrl: url + selectedId, - fullGrid: true, - showLinenumber: true, - showCheckboxcol: true, - paging: true, - filterMult: false, - showTfoot: false, - - }); + 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.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 = "#ParentName"; - var idDom = "#OrgId"; - var zTreeObj; - var setting = { - view: { - selectedMulti: false - }, - check: { - enable: true, - chkStyle: "radio", //单选 - radioType: "all" - }, - data: { - key: { - name: 'Name', - title: 'Name' - }, - simpleData: { - enable: true, - idKey: 'Id', - pIdKey: 'ParentId', - rootPId: 'null' - } - }, - callback: { - onClick: zTreeOnClick, - onCheck: zTreeCheck - } - }; - - 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); - } - function zTreeOnClick(event, treeId, treeNode) { - zTreeObj.checkNode(treeNode, !treeNode.checked, true, true); - event.preventDefault(); - } - - 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)); //显示名称 - } - zTreeObj.expandAll(true); - }); - } - }; -}(); - +//上级机构选择框 +var parent = new ParentTree("/OrgManager/LoadOrg", "ParentName", "OrgId"); //添加(编辑)对话框 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("/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(); - $.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); - $('#Name').val(ret.Name); - $('#Number').val(ret.Number); - $('#Price').val(ret.Price); - $('#Status').selectpicker('val', ret.Status); - $('#Viewable').selectpicker('val', ret.Viewable); - $('#Time').val(ret.Time); - $('#OrgId').val(ret.OrgId); - 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('/StockManager/Delete?Id=' + selected.Id, function (data) { + $.post('/StockManager/Delete', + { ids: selected }, + function (data) { if (data.Status) { list.reload(); ztree.reload(); } else { - $(this).alertmsg('warn', data.message); + layer.msg(data.Message); } }, "json"); } @@ -260,4 +196,4 @@ function refresh() { list.reload(); } - + diff --git a/OpenAuth.Mvc/BllScripts/workflowSchemaManager.js b/OpenAuth.Mvc/BllScripts/workflowSchemaManager.js index 57694758..8ed0bc82 100644 --- a/OpenAuth.Mvc/BllScripts/workflowSchemaManager.js +++ b/OpenAuth.Mvc/BllScripts/workflowSchemaManager.js @@ -1,46 +1,68 @@ //grid列表模块 function MainGrid() { var url = '/workflowschemas/Load'; - this.maingrid = $('#maingrid').datagrid({ - showToolbar: false, - filterThead: false, - loadType: 'GET', - target: $(this), - columns: [ - { - name: 'Code', - label: '模板名称' - } - ], - data:[], - fullGrid: true, - showLinenumber: true, - showCheckboxcol: true, - paging: true, - filterMult: false, - showTfoot: false, - - }); + this.maingrid = $('#maingrid') + .jqGrid({ + colModel: [ + { + name: 'Id', + index: 'Id', + hidden: true + }, + { + index: 'Code', + name: 'Code', + label: '模板名称' + } + + ], + url: url, + 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) { - this.maingrid.datagrid('reload', { dataUrl: url }); + this.maingrid.jqGrid("setGridParam", { url: url }) + .trigger("reloadGrid", [{ page: 1 }]); //重载JQGrid + }; }; MainGrid.prototype = new Grid(); var list = new MainGrid(); -list.reload(); +var vm = new Vue({ + el: '#editDlg' +}); //删除 function del() { - var selected = list.getSelectedObj(); + var selected = list.getSelectedProperties("Code"); if (selected == null) return; - $.post('/StockManager/Delete?Id=' + selected.Id, function (data) { + $.post('/WorkflowSchemas/Delete', + { codes: selected }, + function (data) { if (data.Status) { list.reload(); - ztree.reload(); } else { - $(this).alertmsg('warn', data.message); + layer.msg(data.Message); } }, "json"); } @@ -60,19 +82,4 @@ function add() { } -//删除 -function del() { - var selected = list.getSelectedObj(); - if (selected == null) return; - - $.post('/WorkflowSchemas/Del?code=' +selected.Code, function (data) { - if (data.Status) { - list.reload(); - } - else { - $(this).alertmsg('warn', data.message); - } - }, "json"); -} - diff --git a/OpenAuth.Mvc/Controllers/StockManagerController.cs b/OpenAuth.Mvc/Controllers/StockManagerController.cs index 9e3844aa..cb3e4f5b 100644 --- a/OpenAuth.Mvc/Controllers/StockManagerController.cs +++ b/OpenAuth.Mvc/Controllers/StockManagerController.cs @@ -55,11 +55,11 @@ namespace OpenAuth.Mvc.Controllers return JsonHelper.Instance.Serialize(_app.Load(AuthUtil.GetUserName(), parentId, page, rows)); } - public string Delete(Guid Id) + public string Delete(Guid[] ids) { try { - _app.Delete(Id); + _app.Delete(ids); } catch (Exception e) { diff --git a/OpenAuth.Mvc/Views/CategoryManager/Index.cshtml b/OpenAuth.Mvc/Views/CategoryManager/Index.cshtml index 0daffdbd..8d1eea0d 100644 --- a/OpenAuth.Mvc/Views/CategoryManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/CategoryManager/Index.cshtml @@ -83,5 +83,6 @@ + \ No newline at end of file diff --git a/OpenAuth.Mvc/Views/StockManager/Index.cshtml b/OpenAuth.Mvc/Views/StockManager/Index.cshtml index 6a866a17..5ec78862 100644 --- a/OpenAuth.Mvc/Views/StockManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/StockManager/Index.cshtml @@ -2,90 +2,100 @@ Layout = "~/Views/Shared/_Layout.cshtml"; } -@{ Html.RenderAction("MenuHeader", "Home");} -
-
-
-
    -
    - -
    -
    -
    -
    + + + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
      +
      +
      +
      +
      +
      +
      +
      + @Html.Action("MenuHeader", "Home") +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      -