diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.cshtml index 4f0aefb0d..65d50ce89 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.cshtml @@ -17,20 +17,20 @@ } @Html.AppendCssFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.css") +
+ 打印表单 +
-
- 打印表单 -
-
+
-
- -
+
+ +
@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.css index c7ae0ee2e..cb5c6ca34 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.css +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.css @@ -4,13 +4,14 @@ width: 100%; padding: 5px; } + .lr-layout-panel { position: relative; height: 100%; width: 100%; border: 1px solid #ccc; background: #fff; - padding-top: 41px; + margin-top: 40px; } .lr-layout-panel-btn { @@ -103,7 +104,10 @@ } .tab-pane { - position:relative; - height:100%; - width:100%; -} \ No newline at end of file + position: relative; +/* height: auto; + width: auto; +*/} +#wf_timeline { + margin-top: 41px +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js index 07b88164d..3181196a6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js @@ -182,9 +182,7 @@ var bootstrap = function ($, learun) { } }); - custmerForm.loadForm(nodeInfo.wfForms, true, true); - console.log(nodeInfo); if (!processId && nodeId) { learun.httpAsync('GET', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetChildProcessDetails', { processId: processId, nodeId: nodeId }, function (data) { @@ -212,12 +210,13 @@ var bootstrap = function ($, learun) { history = info.TaskLogList; currentIds = info.CurrentNodeIds; - // page.loadFlowInfo(); + // page.loadFlowInfo(); page.loadTimeLine(); } }); } + custmerForm.loadForm(nodeInfo.wfForms, true, true); }, bind: function () { @@ -238,17 +237,7 @@ var bootstrap = function ($, learun) { $('#print').on('click', function () { //打印checkbox 选中效果打印不出来 $("input[type='checkbox']:checked").attr('checked', 'checked'); - var $iframes = $('#form_list_iframes'); - var iframeId = $iframes.find('.form-list-iframe.active').attr('id'); - if (iframeId) { - var $iframe = learun.iframe(iframeId, frames); - $iframe.$('.lr-form-wrap:visible').jqprint(); - } - else { - //$iframes.find('.form-list-container.active').find('.lr-form-wrap:visible').jqprint(); - //$('#form_list_iframes').jqprint(); - $.print('#form_list_iframes'); - } + $.print('.lr-layout-panel'); }); $('#print').show(); }, @@ -345,6 +334,7 @@ var bootstrap = function ($, learun) { callback: function (departmentMap) { learun.clientdata.getAllAsync('user', { callback: function (userMap) { + history.sort(compareFunction("F_CreateDate")); for (var i = 0, l = history.length; i < l; i++) { var item = history[i]; @@ -415,7 +405,7 @@ var bootstrap = function ($, learun) { nodelist.push(point); } - $('#wf_timeline').lrtimeline(nodelist); + $('#wf_timeline').lrtimelineEsc(nodelist); } }); } @@ -428,4 +418,22 @@ var bootstrap = function ($, learun) { }; page.init(); +} + +function compareFunction(propertyName) { + return function (src, tar) { + //获取比较的值 + var v1 = src[propertyName]; + var v2 = tar[propertyName]; + if (v1 > v2) { + return 1; + } + if (v1 < v2) { + return -1; + + } + return 0; + + }; + } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index dc976bc2e..20f42bc7b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -3784,6 +3784,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/timeline/lr-timelineEsc.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/timeline/lr-timelineEsc.js new file mode 100644 index 000000000..8f3639867 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/timeline/lr-timelineEsc.js @@ -0,0 +1,64 @@ +/* + * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：Learun智慧校园-前端开发组 + * 日 期：2017.03.22 + * 描 述：时间轴方法（升序） + */ +$.fn.lrtimelineEsc = function (nodelist) { + + // title 标题 + // people 审核人 + // content 内容 + // time 时间 + + var $self = $(this); + if ($self.length == 0) { + return $self; + } + $self.addClass('lr-timeline'); + var $wrap = $('
'); + var $ul = $('
    '); + + if (nodelist.length > 0) { + // 开始节点 + var $begin = $('
  • 开始
    • ') + $ul.append($begin); + + $.each(nodelist, function (_index, _item) { + // 中间节点 + var $li = $('
    • '); + if (_index == 0) { + $li.find('div').addClass('lr-timeline-current'); + } + var $itemwrap = $li.find('.lr-timeline-wrap'); + var $itemcontent = $('
    '); + $itemcontent.append('
    ' + _item.title + '
    '); + $itemcontent.append('
    ' + _item.people + '' + _item.content + '
    ') + $itemwrap.append('' + _item.time + ''); + $itemwrap.append($itemcontent); + + var $event = $itemcontent.find('.lr-event'); + if ($event.length > 0) { + $event[0].lrdata = _item; + $itemcontent.find('.lr-event').on('click', function () { + var data = $(this)[0].lrdata; + data.callback && data.callback(data); + }); + } + + + $ul.append($li); + + + + }); + + // 结束节点 + $ul.append('
  • 当前
    • '); + } + + $wrap.html($ul); + $self.html($wrap); + +}; \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_AllIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_AllIndex.cshtml index db1b7c6db..dd943940a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_AllIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_AllIndex.cshtml @@ -90,6 +90,7 @@ "/Views/LR_Content/plugin/wizard/wizard.js", "/Views/LR_Content/plugin/layerselect/lr-layerselect.js", "/Views/LR_Content/plugin/timeline/lr-timeline.js", + "/Views/LR_Content/plugin/timeline/lr-timelineEsc.js", "/Views/LR_Content/plugin/formselect/lr-formselect.js", "/Views/LR_Content/plugin/uploader/lr-uploader.js", "/Views/LR_Content/plugin/date/lr-datepicker.js", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Form.cshtml index ca7962d3d..436ddec67 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Form.cshtml @@ -63,6 +63,7 @@ "/Views/LR_Content/plugin/select/lr-select.js", "/Views/LR_Content/plugin/layerselect/lr-layerselect.js", "/Views/LR_Content/plugin/timeline/lr-timeline.js", + "/Views/LR_Content/plugin/timeline/lr-timelineEsc.js", "/Views/LR_Content/plugin/formselect/lr-formselect.js", "/Views/LR_Content/plugin/inputsearch/lr-isearch.js", "/Views/LR_Content/plugin/uploader/lr-uploader.js", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Index.cshtml index be8cde902..db9f10cb5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Index.cshtml @@ -62,6 +62,7 @@ "/Views/LR_Content/plugin/tree/lr-tree.js", "/Views/LR_Content/plugin/select/lr-select.js", "/Views/LR_Content/plugin/timeline/lr-timeline.js", + "/Views/LR_Content/plugin/timeline/lr-timelineEsc.js", "/Views/LR_Content/plugin/formselect/lr-formselect.js", "/Views/LR_Content/plugin/custmerquery/lr-custmerquery.js", "/Views/LR_Content/plugin/date/lr-datepicker.js", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_WorkFlowForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_WorkFlowForm.cshtml index 216cf63a4..67b93b55f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_WorkFlowForm.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_WorkFlowForm.cshtml @@ -56,6 +56,7 @@ "/Views/LR_Content/plugin/tree/lr-tree.js", "/Views/LR_Content/plugin/select/lr-select.js", "/Views/LR_Content/plugin/timeline/lr-timeline.js", + "/Views/LR_Content/plugin/timeline/lr-timelineEsc.js", "/Views/LR_Content/plugin/formselect/lr-formselect.js", "/Views/LR_Content/plugin/inputsearch/lr-isearch.js", "/Views/LR_Content/plugin/workflow/lr-workflow-ui.js", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_WorkFlowNewForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_WorkFlowNewForm.cshtml index 053237c25..8f4c7d5d7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_WorkFlowNewForm.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_WorkFlowNewForm.cshtml @@ -60,6 +60,7 @@ "/Views/LR_Content/plugin/tree/lr-tree.js", "/Views/LR_Content/plugin/select/lr-select.js", "/Views/LR_Content/plugin/timeline/lr-timeline.js", + "/Views/LR_Content/plugin/timeline/lr-timelineEsc.js", "/Views/LR_Content/plugin/formselect/lr-formselect.js", "/Views/LR_Content/plugin/inputsearch/lr-isearch.js", "/Views/LR_Content/plugin/custmerform/lr-formcomponts.js",