diff --git a/OpenAuth.App/WFProcessInstanceService.cs b/OpenAuth.App/WFProcessInstanceService.cs index 3c9ff3cb..fe9906c1 100644 --- a/OpenAuth.App/WFProcessInstanceService.cs +++ b/OpenAuth.App/WFProcessInstanceService.cs @@ -305,6 +305,7 @@ namespace OpenAuth.App public GridData Load(string userid, string type, int pageCurrent, int pageSize) { + //todo:待办/已办/我的 var result = new GridData { page = pageCurrent diff --git a/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowNodeForm.cshtml b/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowNodeForm.cshtml index 6835cdfb..93a30921 100644 --- a/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowNodeForm.cshtml +++ b/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowNodeForm.cshtml @@ -193,36 +193,22 @@ showcheck: true, data: data, oncheckboxclick: function (item, et, s) { - var $item = $("#" + item.mytype + "Div"); + var $item = $("#UserDiv"); if (et == 1) { - var mytype = ""; - var _html = ""; - var _title = ''; - switch (item.mytype) { - case "Role": - mytype = 'label-success'; - break; - case "Post": - mytype = 'label-info'; - break; - case "UserGroup": - mytype = 'label-warning'; - break; - case "User": - mytype = 'label-danger'; - break; - } - _html += '' + item.text + ''; - $item.append(_html); + var html = '' + + item.text + ''; + + $item.append(html); $item.show(); - $(".flow-card-box").click(function () { + $(".flow-card-box").click(function() { $(this).remove(); $('#' + $(this).attr('data-value')).setNoCheckedNodes($(this).attr('id')); if ($item.find('.flow-card-box').length == 0) { $item.hide(); } - }) + }); } else if (et == 0) { $item.find('#' + item.id).remove(); diff --git a/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowSchemeBuider.cshtml b/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowSchemeBuider.cshtml index aa3614c9..8ea01c09 100644 --- a/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowSchemeBuider.cshtml +++ b/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowSchemeBuider.cshtml @@ -30,26 +30,24 @@ if (data.direction == "next") { switch (data.step) { case 1: - if (!bindingBase()) - { + if (!bindingBase()) { return false; } break; case 2://绑定表单 - - if (!bindingFrm()) { - dialogTop("请选择左侧表单", "error"); - return false; - } - var frmcotentls = frmapp.getData(); - if (!frmcotentls) { - return false; - } - frmData.FrmContent = JSON.stringify(frmcotentls); + + if (!bindingFrm()) { + dialogTop("请选择左侧表单", "error"); + return false; + } + var frmcotentls = frmapp.getData(); + if (!frmcotentls) { + return false; + } + frmData.FrmContent = JSON.stringify(frmcotentls); break; case 3://流程设计 - if (!bindingFlow()) - { + if (!bindingFlow()) { return false; } $finish.removeAttr('disabled'); @@ -73,16 +71,15 @@ $("#step-1").SetWebControls(data.schemeinfo); postData["SchemeVersion"] = data.schemeinfo.SchemeVersion; - if(data.schemeinfo.EnabledMark == 3) - { + if (data.schemeinfo.EnabledMark == 3) { flowData["SchemeVersion"] = "cg"; } SchemeContentOld = JSON.parse(data.schemecontent.SchemeContent); - - $('#FormFrmTree').setNodeChecked(SchemeContentOld.Frm.FrmId); - frmData.FrmId = SchemeContentOld.Frm.FrmId; - setFrmInfo(SchemeContentOld.Frm); - + + $('#FormFrmTree').setNodeChecked(SchemeContentOld.Frm.FrmId); + frmData.FrmId = SchemeContentOld.Frm.FrmId; + setFrmInfo(SchemeContentOld.Frm); + setFlowInfo(SchemeContentOld.Flow); } }); @@ -91,8 +88,7 @@ GetTree('User'); } /*=========基本配置（begin）==================================================================*/ - function bindingBase() - { + function bindingBase() { if (!$('#step-1').Validform()) { return false; } @@ -103,64 +99,11 @@ /*=========基本配置（end）====================================================================*/ function GetTree(type) { $.SetForm({ - url: "/UserManager/Get" + type + "CheckTreeJson", + //url: "/UserManager/Get" + type + "CheckTreeJson", + url:"/UserManager/GetAccessedUsers", success: function (data) { AllAuthorizeCheckData[type] = $.arrayClone(data); - //var item = { - // height: $(window).height() - 131, - // showcheck: true, - // //url: "../../FlowManage/FlowDesign/Get" + type + "CheckTreeJson", - // data: data, - // oncheckboxclick: function (item, et, s) { - // var $item = $("#" + item.mytype + "Div"); - // if (et == 1) { - // var mytype = ""; - // var _html = ""; - // var _title = ''; - // switch (item.mytype) { - // case "Role": - // mytype = "角色"; - // break; - // case "Post": - // mytype = "岗位"; - // break; - // case "UserGroup": - // mytype = "用户组"; - // break; - // case "User": - // mytype = "用户"; - // break; - // } - // _html += '
'; - // _html += '
'; - // _html += ' '; - // _html += '
'; - // _html += '
'; - // _html += '

名称：' + item.text + '

'; - // _html += '

类别：' + mytype + '

'; - // _html += '
'; - // _html += '
'; - // $item.append(_html); - // $item.show(); - - // $(".card-box").click(function () { - // $(this).remove(); - // $('#' + $(this).attr('data-value')).setNoCheckedNodes($(this).attr('id')); - // if ($item.find('.card-box-img').length == 0) { - // $item.hide(); - // } - // }) - // } - // else if (et == 0) { - // $item.find('#' + item.id).remove(); - // if ($item.find('.card-box-img').length == 0) { - // $item.hide(); - // } - // } - - // } - //}; - //$("#" + type).treeview(item); + } }); } @@ -168,33 +111,28 @@ /*=========表单选择（begin）==================================================================*/ var _frmdatabase = ""; var _frmflag = false; - function initFrmInfo() - { + function initFrmInfo() { //加载左边的树 var item = { height: $(window).height() - 87, url: "../../FlowManage/FormDesign/GetTreeJson", onnodeclick: function (item) { - if (item.Sort == "Frm") { - frmData.FrmId = item.id; - if (SchemeContentOld != undefined && frmData.FrmId == SchemeContentOld.Frm.FrmId) { - setFrmInfo(SchemeContentOld.Frm); - } - else { - $.SetForm({ - url: "../../FlowManage/FormDesign/GetFormJson", - param: { keyValue: item.id }, - success: function (data) { - setFrmInfo(data); - } - }); - } + + frmData.FrmId = item.id; + if (SchemeContentOld != undefined + && frmData.FrmId == SchemeContentOld.Frm.FrmId) { + setFrmInfo(SchemeContentOld.Frm); } else { - $('#frmdesign').hide(); - $('#frmpreview').hide(); - $('#frmDefaulting').show(); + $.SetForm({ + url: "../../FlowManage/FormDesign/GetFormJson", + param: { keyValue: item.id }, + success: function (data) { + setFrmInfo(data); + } + }); } + } }; $("#FormFrmTree").treeview(item); @@ -223,7 +161,7 @@ _frmflag = false; } else { - if ( frmData.FrmName != undefined) { + if (frmData.FrmName != undefined) { $('#frmpreview').hide(); $('#frmDefaulting').hide(); $('#frmdesign').show(); @@ -242,8 +180,7 @@ }); } //设置表单数据 - function setFrmInfo(data) - { + function setFrmInfo(data) { $('#frmdesign').hide(); $('#frmDefaulting').hide(); $('#frmpreview').show(); @@ -257,19 +194,18 @@ _frmflag = false; $('#frmpreview').frmPreview({ tablecotent: data.FrmContent, - width:870 + width: 870 + }); + + + frmapp = $('#frmdesign').frmDesign({ + Height: 480, + frmContent: frmData.FrmContent }); - - frmapp = $('#frmdesign').frmDesign({ - Height: 480, - frmContent: frmData.FrmContent - }); - } function bindingFrm() { - if (frmData.FrmName == undefined) - { + if (frmData.FrmName == undefined) { return false; } return true; @@ -281,15 +217,13 @@ var FlowDesignObject;// var LineId; var nodePramData = []; - function initFlowInfo() - { + function initFlowInfo() { FlowDesignPanel = $('#FlowPanel').flowdesign({ height: ($(window).height() - 87), widht: 1000, OpenNode: function (object) { FlowDesignObject = object; - if (object.$nodeData[object.$focus].type == 'startround') - { + if (object.$nodeData[object.$focus].type == 'startround') { return false; } @@ -316,8 +250,7 @@ LineId = id; var _line = object.$lineData[id]; var _fromNode = object.$nodeData[_line.from]; - if (_fromNode.type == "shuntnode") - { + if (_fromNode.type == "shuntnode") { dialogTop("前一个节点是分流节点无法设置流转条件", "error"); return false; } @@ -343,24 +276,19 @@ } }); } - function setFlowInfo(data) - { + function setFlowInfo(data) { FlowDesignPanel.loadData(data); } - function callBackNode(id, data, _nodePramData) - { + function callBackNode(id, data, _nodePramData) { nodePramData = _nodePramData; FlowDesignPanel.SetNodeEx(id, data); } - function callBackLine(id, data) - { + function callBackLine(id, data) { FlowDesignPanel.SetLineEx(id, data); } - function bindingFlow() - { + function bindingFlow() { var _content = FlowDesignPanel.exportDataEx(); - if (_content == -1) - { + if (_content == -1) { return false; } flowData["SchemeContent"] = JSON.stringify({ "Frm": frmData, "Flow": _content }); @@ -404,7 +332,7 @@

流程基本信息配置

-
+
@@ -430,7 +358,7 @@ - +
@@ -458,7 +386,7 @@
-

设计完成,请点击保存

+

设计完成,请点击保存

@@ -476,16 +404,19 @@ width: 50px; z-index: 1000; } + .standtab-pane { - width:224px; - border-right:1px solid #ccc; - float:left; - } - .SchemeAuthorizePanel { - width:828px; + width: 224px; + border-right: 1px solid #ccc; float: left; - display:none; } + + .SchemeAuthorizePanel { + width: 828px; + float: left; + display: none; + } + .card-box.active { background: url(../../Content/Images/item_close.png) right top no-repeat !important; } diff --git a/OpenAuth.Mvc/Controllers/UserManagerController.cs b/OpenAuth.Mvc/Controllers/UserManagerController.cs index f19776fd..493bd305 100644 --- a/OpenAuth.Mvc/Controllers/UserManagerController.cs +++ b/OpenAuth.Mvc/Controllers/UserManagerController.cs @@ -1,13 +1,10 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Web.Mvc; using Infrastructure; using OpenAuth.App; using OpenAuth.App.ViewModel; -using OpenAuth.Domain; using OpenAuth.Mvc.Models; -using OpenAuth.Mvc.WebCtrls.Tree; namespace OpenAuth.Mvc.Controllers { @@ -66,36 +63,6 @@ namespace OpenAuth.Mvc.Controllers #region 获取权限数据 - /// - /// 用户列表树 - /// - /// 返回树形Json - [HttpGet] - public ActionResult GetUserCheckTreeJson() - { - var treeList = new List(); - string companyid = ""; - string departmentid = ""; - foreach (UserView item in App.Load(Guid.Empty, 1, 10).rows) - { - TreeEntity tree = new TreeEntity(); - - tree.id = item.Id.ToString(); - tree.text = item.Name; - tree.value = item.Id.ToString(); - tree.isexpand = true; - tree.complete = true; - tree.hasChildren = false; - tree.parentId = "0"; - tree.showcheck = true; - tree.img = "fa fa-user"; - tree.Attribute = "mytype"; - tree.AttributeValue = "User"; - treeList.Add(tree); - } - return Content(treeList.TreeToJson()); - } - /// /// 获取用户可访问的账号 /// 李玉宝于2017-02-28 15:12:19 @@ -110,7 +77,12 @@ namespace OpenAuth.Mvc.Controllers { Account = user.Account, RealName = user.Name, - + id = user.Id.ToString(), + text = user.Name, + value = user.Account, + parentId = "0", + showcheck = true, + img = "fa fa-user", }; result.Add(user.Id.ToString(), item); } diff --git a/OpenAuth.Mvc/WebCtrls/Tree/TreeEntity.cs b/OpenAuth.Mvc/WebCtrls/Tree/TreeEntity.cs index b81097ea..fec55e87 100644 --- a/OpenAuth.Mvc/WebCtrls/Tree/TreeEntity.cs +++ b/OpenAuth.Mvc/WebCtrls/Tree/TreeEntity.cs @@ -1,7 +1,7 @@ namespace OpenAuth.Mvc.WebCtrls.Tree { /// - /// 树实体 + /// wdTree实体 /// public class TreeEntity {
流程编号*