PAL流程阅览

com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html

@@ -813,8 +813,9 @@
         #designer_layout{background: none!important;margin:10px!important;}
         .awsui-table-bordered td{border:0!important;}
         .awsui-table-bordered{border:0!important;line-height: 20px;}
-        .tableContent{float:left; width:38%;padding:5px 0!important; }
+        .tableContent{padding:5px 0!important; }
-        .tableright{width:59%;padding-left:2%!important;}
+        .tableleft{float:left; width:38%;}
+        .tableright{width:59%;padding-left:2%!important; float: left}
         #designer_canvas{background: none!important;}
         .task-box {
             border: 1px solid #f1f5f7;border-top:2px solid #f1f5f7; padding: 10px;
@@ -843,7 +844,6 @@
         .suofang{height:40px;background-color:white;border-top:1px solid #efefef;vertical-align:middle;position: relative;border-bottom-left-radius: 10px;border-bottom-right-radius: 10px;}
         .processfiledown li{line-height: 20px;}
         .awsui-table td{border:0!important;}
-        /********样式***********/
         .borderbottom{border-bottom:1px dashed #999b9f!important;
             display: -webkit-box;
 
@@ -867,6 +867,7 @@
 
             align-items: center;/*新版本*/
         }
+
         .iconTabClass{
             float: left;display: block; width: 18px; height: 18px; background:url("iconnew.png") no-repeat; background-size: 100%;}
         #ProcessManual{
@@ -1016,7 +1017,6 @@
             <div id="relevantDocument" class="fileheaderTab">相关/支持文件</div>
             <!-- 制度/操作指导 -->
             <!--<div class="dock_view_portalFileShow" id="portalFileDock"></div>-->
-
         </div>
     </div>
     <div class="clearfix"></div>

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js

@@ -299,7 +299,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
 			}
 			var constr = '<tr>';
 			/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
-			constr += '<td  class="tableContent">' + obj.name + ':' + obj.value + '</td>';
+			constr += '<td  class="tableContent">' + obj.name + ':&nbsp;' +obj.value+ '</td>';
 			constr += '</tr>';
 			if ((!obj.readonly && obj.type == "string")
 				|| (!obj.readonly && obj.type == "list")) {
@@ -312,7 +312,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
 				constr = '<tr>';
 				/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
 				// constr += '<td id="' + shape.id + obj.id + '" colspan="2" class="tableContent">' + obj.value + '</td>';
-				constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' +  '【' + obj.name + '】'+'&nbsp;'+ '<a href="' + obj.value + '" target="_blank">' + obj.value + '</a>' + '</td>';
+				constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' +  '【' + obj.name + '】'+'&nbsp;' + '<a href="' + obj.value + '" target="_blank">' + obj.value + '</a>' +  '</td>';
 				constr += '</tr>';
 			} else if (!obj.readonly && obj.type == "number") {
 				constr = '<tr>';
@@ -322,7 +322,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
 			} else if (!obj.readonly && obj.type == "boolean") {
 				constr = '<tr>';
 				/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
-				constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+'&nbsp;'+ '</td>';
+				constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+'&nbsp;'+'</td>';
 				constr += '</tr>';
 			} else if (!obj.readonly && obj.type == "textarea") {
 				constr = '<tr>';
@@ -330,7 +330,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
 				if (obj.value == undefined) {
 					obj.value = '';
 				}
-				constr += '<td id="' + shape.id + obj.id + '"class="tableContent">' + '【' + obj.name + '】'+'&nbsp;'+ obj.value.replace(/\n/g, '<br>') + '</td>';
+				constr += '<td id="' + shape.id + obj.id + '"class="tableContent">' + '【' + obj.name + '】'+'&nbsp;'+ obj.value.replace(/\n/g, '<br>') +'</td>';
 				constr += '</tr>';
 			} else if (obj.readonly && obj.type == "relation") {
 				var relationValue = "";
@@ -339,12 +339,12 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
 				}
 				constr = '<tr>';
 				/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
-				constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+'&nbsp;'+ relationValue + '</td>';
+				constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+'&nbsp;'+ relationValue +'</td>';
 				constr += '</tr>';
 			} else if (obj.type == "select" || obj.type == "select_m") {
 				constr = '<tr>';
 				/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
-				constr += '<td id="' + shape.id + obj.id + '"   class="tableContent">' + '【' + obj.name + '】'+'&nbsp;'+ obj.value + '</td>';
+				constr += '<td id="' + shape.id + obj.id + '"   class="tableContent">' + '【' + obj.name + '】'+ '&nbsp;'+  obj.value  +'</td>';
 				constr += '</tr>';
 
 				selectFlag = true;
@@ -363,7 +363,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
 				}
 				constr = '<tr>';
 				/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
-				constr += '<td id="' + shape.id + obj.id + '"  class="tableContent">' + '【' + obj.name  +'】'+'&nbsp;'+ relationValue + '</td>';
+				constr += '<td id="' + shape.id + obj.id + '"  class="tableContent">' + '【' + obj.name  +'】'+ '&nbsp;'+  relationValue  +'</td>';
 				constr += '</tr>';
 			} else if (obj.readonly && obj.type == "deptAddress") {
 				deptAddress = true;
@@ -375,7 +375,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
 				}
 				constr = '<tr>';
 				/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
-				constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name  +'】'+'&nbsp;'+ relationValue + '</td>';
+				constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name  +'】'+ '&nbsp;'+  relationValue  +'</td>';
 				constr += '</tr>';
 			} else if (obj.readonly && obj.type == "awsorg") {
 				var relationValue = "";
@@ -384,7 +384,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
 				}
 				constr = '<tr>';
 				/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
-				constr += '<td id="' + shape.id + obj.id + '"  class="tableContent">' + '【' + obj.name  +'】'+'&nbsp;'+ relationValue + '</td>';
+				constr += '<td id="' + shape.id + obj.id + '"  class="tableContent">' + '【' + obj.name  +'】'+ '&nbsp;'+  relationValue  +'</td>';
 				constr += '</tr>';
 			} else if (obj.readonly && obj.type == "hidden") {
 				constr = '<tr ' + mouseout + mouseover + ' objid="' + obj.id+ '" class="tagContentTableTr" style="display:none;">'
@@ -400,7 +400,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
 				}
 				constr = '<tr>';
 				/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
-				constr += '<td id="' + shape.id + obj.id + '"  class="tableContent">' + '【' + obj.name  +'】'+'&nbsp;'+ '<span id="' + obj.id + ' " onclick="openDialog(' + JSON.stringify(obj.value).replace(/\"/g, "'") + ')"> ' + tableInput + '</span>' + '</td>';
+				constr += '<td id="' + shape.id + obj.id + '"  class="tableContent">' + '【' + obj.name  +'】'+  '<span id="' + obj.id + ' " onclick="openDialog(' + JSON.stringify(obj.value).replace(/\"/g, "'") + ')"> ' + tableInput + '</span>'  +'</td>';
 				constr += '</tr>';
 			}
 			$('#' + tbodyId + ' table[name=' + shape.id + ']').append(constr);
@@ -1457,6 +1457,7 @@ function initProcessDesc() {
 	var b='';
 	for(var i = 1; i <= length; i++) {
 		var obj = processDesc[i];
+
 		//判断如果为相关文件/支持文件显示在右侧区域
 		if(obj.name=="相关文件" || obj.name=="支持文件"){
 			b += '<table  class="awsui-table">';
@@ -1467,7 +1468,7 @@ function initProcessDesc() {
 			b += '</table>';
 		}else{
 			t += '<tr class="borderbottom">';
-			t += '<td class="tableContent">' + "【"+obj.name +"】"+ '</td>';
+			t += '<td class="tableContent tableleft">' + "【"+obj.name +"】"+ '</td>';
 
 			var value = obj.value;
 			if (value == undefined) {
@@ -1487,26 +1488,25 @@ function initProcessDesc() {
 					t += '<td  class="tableContent tableright" onclick="openDialog(' + JSON.stringify(tableValue).replace(/\"/g,"'") +')">' +'<span style="color:blue">'+tableFlag+'</span>'+'</td>';
 					t += '</tr>';
 				}
-			}
+			} else {
-			else {
 				value = value.replace(/\n/g,'<br>')
 				t += '<td   class="tableContent tableright" >' + value + '</td>';
 				t += '</tr>';
 			}
-			// t += '<td colspan="2" class="tableContent">' + value + '</td>';
-			// t += '</tr>';
 		}
 
+		// t += '<td colspan="2" class="tableContent">' + value + '</td>';
+		// t += '</tr>';
 	}
-	    if(b.length>0){
-			$('#relevantDocument').append(b);
-		}
-        $('#portalDescDock').find('table').append(t);
 
+	if(b.length>0){
+		$('#relevantDocument').append(b);
+	}
+
+	$('#portalDescDock').find('table').append(t);
 	// $('#portalDescDock').append('<table class="awsui-table"><tr><td>&nbsp;</td></tr></table>');
 }
 
-
 function autoClickAttr() {
 	// 属性自动切换
 	if ($('#openTab').is(':hidden')) {
@@ -1593,6 +1593,7 @@ function ProcessManual(obj) {
 	t += '</table>';
 
 	$('#processFileDock').append(t);
+
 	//相关文件/相关附件
 	initUpfileData(obj);
 
@@ -1645,28 +1646,6 @@ function  downloadProcessFile(taskId) {
 	});
 }
 
-function downloadReport(uuid, taskId) {
-	awsui.ajax.request({
-		type: "POST",
-		url: "./jd",
-		async: false,
-		data: {
-			sid: sid,
-			cmd: "com.actionsoft.apps.coe.pal.publisher_output_download",
-			taskId: taskId,
-			uuid: uuid
-		},
-		success : function(r) {
-			debugger;
-			if (r.result == "ok") {
-				debugger;
-				window.open (r.data.url);
-			} else {
-
-			}
-		}
-	});
-}
 
 /**
  * 相关文件/制度文件下载