diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java index 7d4fcda4..5c9375f7 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java @@ -2501,6 +2501,14 @@ public class CoEPALController { } + @Mapping("com.actionsoft.apps.coe.pal_outputreport_output_downloadfile") + public String COEPALOUTPUTREPORTOutputProcessDownloadFILE(UserContext me, String taskId) { + return PALRepositoryQueryAPIManager.getInstance().outputReportDownload(me, taskId); + } + + + + /** * 查询导出组织模型等结构 diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/img/portal_banner.jpg b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/img/portal_banner.jpg index 464a1f35..45d6a586 100755 Binary files a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/img/portal_banner.jpg and b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/img/portal_banner.jpg differ diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js index 7e8142dd..fd65ed09 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js @@ -1543,7 +1543,7 @@ function changeArributeByShape() { if (Utils.getSelected()[0] == null) { initShapeAttribute('0'); initUpfileData('0'); - ProcessManual(); + ProcessManual('0'); $('table[name=lastTable]').remove(); if($('#portalAttrDock').children('table').length > 0) { // $('#portalAttrDock').append(lastTable); @@ -1555,7 +1555,7 @@ function changeArributeByShape() { selectShape = Utils.getSelected()[0]; initShapeAttribute(Utils.getSelected()[0].id); initUpfileData(Utils.getSelected()[0].id); - + ProcessManual(Utils.getSelected()[0].id); $('table[name=lastTable]').remove(); if ($('#portalAttrDock table[name=' + Utils.getSelected()[0].id + ']').length > 0) { // $('#portalAttrDock').append(lastTable); @@ -1566,21 +1566,29 @@ function changeArributeByShape() { } } -function ProcessManual() { +function ProcessManual(obj) { $('#processFileDock').empty(); var t = ''; t += ''; t += ''; t += '
'; t += '
流程手册:
'; t += ''; - t += ''; + t +=''; t += '
'; + $('#processFileDock').append(t); + //相关文件/相关附件 + initUpfileData(obj); + } + + function openOutputFile(taskId) { // 打开流程手册 $.simpleAlert('正在打开', 'loading'); @@ -1618,16 +1626,37 @@ function downloadProcessFile(taskId) { success : function(msg) { if (msg.result == "ok") { window.location.href = msg.data.url; + }else{ + $.simpleAlert("请确认是否已生成流程手册", 'info'); } } }); } + +function downloadFile(uuid) { + $.ajax({ + type : "POST", + url : "./jd?sid=" + sid + + "&cmd=com.actionsoft.apps.coe.pal_outputreport_output_downloadfile", + data : { + taskId : taskId + }, + success : function(msg) { + if (msg.result == "ok") { + window.location.href = msg.data.url; + } + } + }); +} + + + // 初始化上传附件 function initUpfileData(obj) { $('#alertMessage').remove(); if (obj == undefined || obj == '0') { - $('#portalFileDock').empty(); + /*$('#portalFileDock').empty();*/ var t = ''; var processFile = upfileData['file']; if(processFile.length > 0) { @@ -1637,6 +1666,10 @@ function initUpfileData(obj) { for(var i = 0; i < processFile.length; i++) { var obj = processFile[i]; t += '
'+ obj.name +'
'; + t +=''; + } t += ''; } @@ -1655,18 +1688,21 @@ function initUpfileData(obj) { for(var i = 0; i < processShape.length; i++) { var obj = processShape[i]; t += '
'+ obj.name +'
'; + t +=''; t += ''; } t += ''; } } - $('#portalFileDock').append(t); + $('#processFileDock').append(t); } else { - $('#portalFileDock table').show(); + $('#processFileDock table').show(); $('#portalFileDock table[name=' + obj + ']').show(); } var isHidden = true; - $('#portalFileDock table').each(function(){ + $('#processFileDock table').each(function(){ if ($(this).css('display') != 'none') { isHidden = false; } @@ -1674,7 +1710,7 @@ function initUpfileData(obj) { if (isHidden) { var $noContent = $('#noContent').clone(true); $noContent.attr('id', 'alertMessage'); - $('#portalFileDock').append($noContent); + $('#processFileDock').append($noContent); $('#alertMessage').show(); } }