阅览手册显示问题

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<String,Object> map=new HashMap<>();
 		     map.put("taskId",outputreportBO.getString("TASKID"));

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 +='</div>';
 	}
 
-
 	$('#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 += '<td id="manualDownload">';
-					s += '<div class="tablefileContent"><a href="javascript:void(0);" title="'+obj.name+'" onclick="readFile(\''+ obj.id +'\')">'+ obj.name+"替换后" +'</a>';
+					s += '<div class="tablefileContent"><a href="javascript:void(0);" title="'+obj.name+'" onclick="readFile(\''+ obj.id +'\')">'+ obj.name+ +'</a>';
 					s +='<button id="ProcessManual" type="button" class="awsui-btn awsui-btn-blue awsui-btn-sm">';
 					s += '<i class="awsui-iconfont" title="手册下载" onclick="singleFileDownload(\''+obj.id+'\')">&#xe653;</i>';
 					s +='</button>';
@@ -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 +='</div>';
 					t += '</td>';
 					t += '</tr>';
-                    t +='</tbody>';
+					t +='</tbody>';
 					t += '</table>';
 					splitId+=obj.id+',';
 

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 += '<table  class="awsui-table">';
-    t += '<tr><td>';
-    t += '<div class="filetableHeader"><i class="awsui-iconfont" style="color: #999999;margin-top: 2px;">&#xe7cf;</i>'+manualName+'</div>';
-    t += '<div class="tablefileContent"><a href="javascript:void(0);" onclick="openOutputFile(\''+ taskId +'\')">'+ fileName +'</a>';
-    t +='<button id="ProcessManual" type="button" class="awsui-btn awsui-btn-blue awsui-btn-sm">';
-    t += '<i class="awsui-iconfont" onclick="downloadProcessFile(\''+taskId+'\')">&#xe653;</i>';
-    t +='</button>';
-    t +='</div>';
-    t += '</td></tr>';
-    t += '</table>';*/
 
+	$('#processFileDock').empty();
+	var t = '';
+	/*t += '<table  class="awsui-table">';
+	t += '<tr><td>';
+	t += '<div class="filetableHeader"><i class="awsui-iconfont" style="color: #999999;margin-top: 2px;">&#xe7cf;</i>'+manualName+'</div>';
+	t += '<div class="tablefileContent"><a href="javascript:void(0);" onclick="openOutputFile(\''+ taskId +'\')">'+ fileName +'</a>';
+	t +='<button id="ProcessManual" type="button" class="awsui-btn awsui-btn-blue awsui-btn-sm">';
+	t += '<i class="awsui-iconfont" onclick="downloadProcessFile(\''+taskId+'\')">&#xe653;</i>';
+	t +='</button>';
+	t +='</div>';
+	t += '</td></tr>';
+	t += '</table>';*/
 
-    t += '<div>';
+	var resultMap=getProcessManuallogData();
-    t +='<strong>'+manualName+'</strong>';
+	var transitionflag;
-    t += '<table class="awsui-table">';
+	if(resultMap!=null){
-    t +='<tbody>';
+		transitionflag=true;
-    t += '<tr>';
+		var gettaskId=resultMap["taskId"];
-    t += '<td>';
+		var getplname=resultMap["plname"];
-    t += '<div class="tablefileContent"><a href="javascript:void(0);" title="'+fileName+'" onclick="openOutputFile(\''+ taskId +'\')">'+ fileName +'</a>';
+		t += '<div>';
-    t +='<button id="ProcessManual" type="button" class="awsui-btn awsui-btn-blue awsui-btn-sm">';
+		t +='<strong>'+manualName+'</strong>';
-  /*  t += '<i class="awsui-iconfont" title="手册下载" onclick="downloadProcessFile(\''+taskId+'\')">&#xe653;</i>';*/
+		t += '<table class="awsui-table">';
-    t +='</button>';
+		t +='<tbody>';
+		t += '<tr>';
+		t += '<td id="manualDownload">';
+		t += '<div class="tablefileContent"><a href="javascript:void(0);" title="'+getplname+'" onclick="openOutputFile(\''+ gettaskId +'\')">'+ getplname +'</a>';
+		t +='<button id="ProcessManual" type="button" class="awsui-btn awsui-btn-blue awsui-btn-sm">';
+		t += '<i class="awsui-iconfont" title="手册下载" onclick="downloadProcessFile(\''+gettaskId+'\')">&#xe653;</i>';
+		t +='</button>';
+		t +='</div>';
+		t += '</td>';
+		t += '</tr>';
+		t +='</tbody>';
+		t += '</table>';
+		t +='</div>';
 
-    t +='</div>';
+	}else{
+		transitionflag=false;
+		t += '<div>';
+		t +='<strong>'+manualName+'</strong>';
+		t += '<table class="awsui-table">';
+		t +='<tbody>';
+		t += '<tr>';
+		t += '<td id="manualDownload">';
+		t += '<div class="tablefileContent"><a href="javascript:void(0);" title="'+fileName+'" onclick="openOutputFile(\''+ taskId +'\')">'+ fileName +'</a>';
+		t +='<button id="ProcessManual" type="button" class="awsui-btn awsui-btn-blue awsui-btn-sm">';
+		t += '<i class="awsui-iconfont" title="手册下载" onclick="downloadProcessFile(\''+taskId+'\')">&#xe653;</i>';
+		t +='</button>';
+		t +='</div>';
+		t += '</td>';
+		t += '</tr>';
+		t +='</tbody>';
+		t += '</table>';
+		t +='</div>';
+	}
 
-    t += '</td>';
+	$('#processFileDock').append(t);
-    t += '</tr>';
-    t +='</tbody>';
-    t += '</table>';
-    t +='</div>';
 
-    $('#processFileDock').append(t);
+	//相关文件/相关附件
-
+	initUpfileData(obj,transitionflag);
-    //相关文件/相关附件
-    initUpfileData(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) {
@@ -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 +='</tbody>';
                 t += '</table>';
                 splitId+=obj.id+',';
+
+				var spiltName=obj.name;
+				if(spiltName.substring(0,spiltName.lastIndexOf("."))==fileName && transitionflag==false){
+					var s='';
+					$("#manualDownload").empty();
+					s += '<td id="manualDownload">';
+					s += '<div class="tablefileContent"><a href="javascript:void(0);" title="'+obj.name+'" onclick="readFile(\''+ obj.id +'\')">'+ obj.name+ +'</a>';
+					s +='<button id="ProcessManual" type="button" class="awsui-btn awsui-btn-blue awsui-btn-sm">';
+					s += '<i class="awsui-iconfont" title="手册下载" onclick="singleFileDownload(\''+obj.id+'\')">&#xe653;</i>';
+					s +='</button>';
+					s +='</div>';
+					s += '</td>';
+					$("#manualDownload").append(s);
+				}
             }