pal

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);
+	}
+
+
+
+
 	
 	/**
 	 * 查询导出组织模型等结构

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 += '<table  class="awsui-table">';
 	t += '<tr><td>';
 	t += '<div class="filetableHeader"><i class="awsui-iconfont" style="color: #999999;margin-top: 2px;">&#xe7cf;</i> 流程手册：</div>';
 	t += '<div class="tableContent"><a href="javascript:void(0);" onclick="openOutputFile(\''+ taskId +'\')">'+ fileName +'</a></div>';
-	t += '<i class="awsui-iconfont" style="color: #999999;margin-top: 2px;" onclick="downloadProcessFile(\''+taskId+'\')">&#xe653;</i>';
+	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 += '</td></tr>';
 	t += '</table>';
+
 	$('#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 += '<div class="tableContent"><a href="javascript:void(0);" onclick="readFile(\''+ obj.id +'\')">'+ obj.name +'</a></div>';
+				t +='<button id="ProcessManual" type="button" class="awsui-btn awsui-btn-blue awsui-btn-sm">';
+				t += '<i class="awsui-iconfont" onclick="downloadFile(\''+obj.id+'\')">&#xe653;</i>';
+				t +='</button>';
+
 			}
 			t += '</td></tr></table>';
 		}
@@ -1655,18 +1688,21 @@ function initUpfileData(obj) {
 				for(var i = 0; i < processShape.length; i++) {
 					var obj = processShape[i];
 					t += '<div class="tableContent"><a href="javascript:void(0);" onclick="readFile(\''+ obj.id +'\')">'+ obj.name +'</a></div>';
+					t +='<button id="ProcessManual" type="button" class="awsui-btn awsui-btn-blue awsui-btn-sm">';
+					t += '<i class="awsui-iconfont" onclick="downloadFile(\''+obj.id+'\')">&#xe653;</i>';
+					t +='</button>';
 					t += '</td></tr>';
 				}
 				t += '</table>';
 			}
 		}
-		$('#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();
 	}
 }