diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java index 708a9bc7..fcd492ca 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java @@ -657,6 +657,7 @@ public class UpfileWeb extends ActionWeb { public String coePALProcessManualLogData(String ruuid) throws Exception { ResponseObject ro = ResponseObject.newOkResponse(); BO outputreportBO=SDK.getBOAPI().query("BO_EU_PAL_OUTPUTREPORT").addQuery("PLID=",ruuid).addQuery("RESULT=","手册转换成功！").detail(); + System.out.println("outputreportBO========="+outputreportBO); if(outputreportBO!=null){ Map map=new HashMap<>(); map.put("taskId",outputreportBO.getString("TASKID")); 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 33b90c7a..4616a2fc 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 @@ -1478,7 +1478,7 @@ function initProcessDesc() { continue; } if(obj.name=="ARIS流程名称"){ - continue; + continue; } //判断如果为相关文件/支持文件显示在右侧区域 if(obj.name=="相关文件" || obj.name=="支持文件"){ @@ -1615,6 +1615,7 @@ function changeArributeByShape() { } } + function ProcessManual(obj) { var manualName; if(methodId=="data.form"){ @@ -1695,7 +1696,6 @@ function ProcessManual(obj) { t +=''; } - $('#processFileDock').append(t); //相关文件/相关附件 @@ -1703,6 +1703,28 @@ function ProcessManual(obj) { } +function getProcessManuallogData() { + var resultData; + $.ajax({ + type : "POST", + url : "./jd?sid=" + sid + + "&cmd=com.actionsoft.apps.coe.pal_outputreport_output_query_manual_logdata", + data : { + ruuid : ruuid + }, + async:false, + success : function(msg) { + if (msg.result == "ok") { + if(msg.data!=undefined){ + resultData=msg.data.resultMap; + } + + } + } + }); + + return resultData; +} function openOutputFile(taskId) { // 打开流程手册 @@ -1714,6 +1736,7 @@ function openOutputFile(taskId) { data : { taskId : taskId }, + async:false, success : function(msg) { if (msg.result == "ok") { $.simpleAlert("close"); @@ -1731,24 +1754,6 @@ function openOutputFile(taskId) { -function getProcessManuallogData() { - var resultData; - $.ajax({ - type : "POST", - url : "./jd?sid=" + sid - + "&cmd=com.actionsoft.apps.coe.pal_outputreport_output_query_manual_logdata", - data : { - ruuid : ruuid - }, - success : function(msg) { - if (msg.result.result == "ok") { - resultData=msg.result.result.resultMap; - } - } - }); - - return resultData; -} function downloadProcessFile(taskId) { @@ -1797,7 +1802,7 @@ function downloadZipFile(splitId,toolbarname) { url : "./jd?sid=" + sid + "&cmd=com.actionsoft.apps.coe.pal_outputreport_output_downloadZipfile", data : { - splitId : splitId, + splitId : splitId, toolbarname:toolbarname, taskIdParams:taskId, methodId:methodId @@ -1855,7 +1860,7 @@ function initUpfileData(obj,transitionflag) { var s=''; $("#manualDownload").empty(); s += ''; - s += '
'+ obj.name+"替换后" +''; + s += '
'+ obj.name+ +''; s +=''; @@ -1880,7 +1885,7 @@ function initUpfileData(obj,transitionflag) { var processShape = upfileData[ele.id]; if(processShape != null && processShape.length > 0) { var fileTile=""; - if(ele.category=="data_form"){ + if(ele.category=="data_form"){ fileTile="表单/模板:"; }else{ fileTile="节点附件:"; @@ -1897,7 +1902,7 @@ function initUpfileData(obj,transitionflag) { t +='
'; t += ''; t += ''; - t +=''; + t +=''; t += ''; splitId+=obj.id+','; diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js index a510aede..892e737b 100644 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js @@ -1640,6 +1640,7 @@ function changeArributeByShape(name) { } + function ProcessManual(obj) { var manualName; if(methodId=="data.form"){ @@ -1663,47 +1664,93 @@ function ProcessManual(obj) { }else if(methodId=="control.kpi"){ manualName="流程绩效文件 :"; } - $('#processFileDock').empty(); - var t = ''; - /*t += ''; - t += ''; - t += '
'; - t += '
'+manualName+'
'; - t += '
'+ fileName +''; - t +=''; - t +='
'; - t += '
';*/ + $('#processFileDock').empty(); + var t = ''; + /*t += ''; + t += ''; + t += '
'; + t += '
'+manualName+'
'; + t += '
'+ fileName +''; + t +=''; + t +='
'; + t += '
';*/ - t += '
'; - t +=''+manualName+''; - t += ''; - t +=''; - t += ''; - t += ''; - t += ''; - t +=''; - t += '
'; - t += '
'+ fileName +''; - t +=''; + var resultMap=getProcessManuallogData(); + var transitionflag; + if(resultMap!=null){ + transitionflag=true; + var gettaskId=resultMap["taskId"]; + var getplname=resultMap["plname"]; + t += '
'; + t +=''+manualName+''; + t += ''; + t +=''; + t += ''; + t += ''; + t += ''; + t +=''; + t += '
'; + t += '
'+ getplname +''; + t +=''; + t +='
'; + t += '
'; + t +='
'; - t +='
'; + }else{ + transitionflag=false; + t += '
'; + t +=''+manualName+''; + t += ''; + t +=''; + t += ''; + t += ''; + t += ''; + t +=''; + t += '
'; + t += '
'+ fileName +''; + t +=''; + t +='
'; + t += '
'; + t +='
'; + } - t += '
'; - t +='
'; + $('#processFileDock').append(t); - $('#processFileDock').append(t); - - //相关文件/相关附件 - initUpfileData(obj); + //相关文件/相关附件 + initUpfileData(obj,transitionflag); } +function getProcessManuallogData() { + var resultData; + $.ajax({ + type : "POST", + url : "./jd?sid=" + sid + + "&cmd=com.actionsoft.apps.coe.pal_outputreport_output_query_manual_logdata", + data : { + ruuid : ruuid + }, + async:false, + success : function(msg) { + if (msg.result == "ok") { + if(msg.data!=undefined){ + resultData=msg.data.resultMap; + } + + } + } + }); + + return resultData; +} function openOutputFile(taskId) { @@ -1775,7 +1822,7 @@ function downloadZipFile(splitId,toolbarname) { } // 初始化上传附件 -function initUpfileData(obj) { +function initUpfileData(obj,transitionflag) { $('#alertMessage').remove(); if (obj == undefined || obj == '0') { $('#portalFileDock').empty(); @@ -1811,6 +1858,20 @@ function initUpfileData(obj) { t +=''; t += ''; splitId+=obj.id+','; + + var spiltName=obj.name; + if(spiltName.substring(0,spiltName.lastIndexOf("."))==fileName && transitionflag==false){ + var s=''; + $("#manualDownload").empty(); + s += ''; + s += '
'+ obj.name+ +''; + s +=''; + s +='
'; + s += ''; + $("#manualDownload").append(s); + } }