PAL流程阅览

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java

@@ -759,6 +759,7 @@ public class DesignerRelationShapeWeb extends ActionWeb {
 		//JSONObject jsonObject = JSONObject.parseObject(json);
 		JSONArray jsonArr_new= new JSONArray();
 		JSONArray objects=JSONArray.parseArray(treeJson);
+		System.out.println("objects================="+objects);
 		//角色图属性代码是role/绩效图属性代码为Process_performance_metrics进行判断
 		if (attrId.equals("role") || attrId.equals("Process_performance_metrics")) {
 			if (objects != null) {
@@ -767,14 +768,14 @@ public class DesignerRelationShapeWeb extends ActionWeb {
 					String url = jsonObject.getString("url");
 					String id = jsonObject.getString("id");
 
-					System.out.println("Jsonobject=========="+jsonObject);
-					System.out.println("url======================"+url);
 					if (UtilString.isNotEmpty(url)) {
 						List data=new ArrayList();
 						data.add(0,jsonObject.getString("plMethodId"));
 						data.add(1,ruuid);
 						System.out.println("data=================="+data);
+						System.out.println("id===================="+id);
 						RowMap rowMap = DBSql.getMap("SELECT EXT2 FROM APP_ACT_COE_PAL_REPOSITORY WHERE ID=? AND EXT2=?", id, data.toString());
+						System.out.println("rowmap============"+rowMap);
 						if (rowMap != null) {
 							jsonArr_new.add(objects.getJSONObject(i));
 						}

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/upfile/web/UpfileWeb.java

@@ -419,6 +419,7 @@ public class UpfileWeb extends ActionWeb {
 
 		String downUrl=SDK.getConfAPI().getPortalUrl() + "/r/" + dcContext.getDownloadURL().replace("./", "");
 		ro.put("url",downUrl);
+
 		return ro.toString();
 	}
 

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

@@ -811,8 +811,10 @@
             border-bottom: 2px solid #4e7ff9; color:#4e7ff9
         }
         #designer_layout{background: none!important;margin:10px!important;}
-        .awsui-table-bordered td{border:0!important; padding: 5px 0!important;}
+        .awsui-table-bordered td{border:0!important;}
-        .awsui-table-bordered,.tableContent{border:0!important;line-height: 20px; float:left;}
+        .awsui-table-bordered{border:0!important;line-height: 20px;}
+        .tableContent{float:left; width:38%;padding:5px 0!important; }
+        .tableright{width:59%;padding-left:2%!important;}
         #designer_canvas{background: none!important;}
         .task-box {
             border: 1px solid #f1f5f7;border-top:2px solid #f1f5f7; padding: 10px;
@@ -840,7 +842,30 @@
         #pinglun{clear: both;overflow: hidden;height: auto;}
         .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; padding: 2px 0!important;}
+        .awsui-table td{border:0!important;}
+        .borderbottom{border-bottom:1px dashed #999b9f!important;
+            display: -webkit-box;
+
+            display: -moz-box;
+
+            display: -ms-flexbox;
+
+            display: -webkit-flex;
+
+            display: flex;
+
+            /*垂直居中*/
+
+            -webkit-box-align: center;/*旧版本*/
+
+            -moz-box-align: center;/*旧版本*/
+
+            -ms-flex-align: center;/*混合版本*/
+
+            -webkit-align-items: center;/*新版本*/
+
+            align-items: center;/*新版本*/
+        }
         .iconTabClass{
             float: left;display: block; width: 18px; height: 18px; background:url("iconnew.png") no-repeat; background-size: 100%;}
         #ProcessManual{
@@ -920,10 +945,10 @@
             <!-- 步骤说明 -->
             <div class="dock_view_portalAttrShow newadd_portalAttr" id="portalAttrDock"></div>
             <div class="dock_view_portalFileShow newadd_portalAttr" id="processFileDock">
-               <!-- <ul class="processfiledown">
+                <!-- <ul class="processfiledown">
-                    <li>asdfsaf:asdfsaf</li>
+                     <li>asdfsaf:asdfsaf</li>
-                    <li>asdfsaf:asdfsaf</li>
+                     <li>asdfsaf:asdfsaf</li>
-                </ul>-->
+                 </ul>-->
             </div>
         </div>
 
@@ -987,9 +1012,10 @@
     </div>
     <div class="newadd_nav" id="newaddfile">
         <div class="newadd_wen">
-            <div id="processFile" class="fileheaderTab">相关/支持文件</div>
+            <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

@@ -294,119 +294,119 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
 	for (var index = 0; index < attributesJsonArray.length; index++) {
 		var obj = attributesJsonArray[index];
 		if (obj != null && obj != undefined && obj.value != undefined) {
-			   if(obj.name=="活动序号"){
+			if(obj.name=="活动序号"){
-			   	    continue;
+				continue;
-			   }
-				var constr = '<tr>';
-				/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
-				constr += '<td  class="tableContent">' + obj.name + ':' + obj.value + '</td>';
-				constr += '</tr>';
-				if ((!obj.readonly && obj.type == "string")
-					|| (!obj.readonly && obj.type == "list")) {
-					// 目前支持到文本的输入 ,需求定下了再改
-						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 += '</tr>';
-				} else if (!obj.readonly && obj.type == "link") {
-					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 += '</tr>';
-				} else if (!obj.readonly && obj.type == "number") {
-					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 += '</tr>';
-				} 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 += '</tr>';
-				} else if (!obj.readonly && obj.type == "textarea") {
-					constr = '<tr>';
-					/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
-					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 += '</tr>';
-				} else if (obj.readonly && obj.type == "relation") {
-					var relationValue = "";
-					if (relationShapesData[shape.id] !== null && relationShapesData[shape.id][obj.id] != null) {
-						relationValue = relationShapesData[shape.id][obj.id];
-					}
-					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 += '</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 += '</tr>';
-
-					selectFlag = true;
-					var selectValue = {
-						"objId": obj.id,
-						"objValue": obj.value,
-						"objType": obj.type
-					};
-					selectValues.push(selectValue);
-				} else if (obj.readonly && obj.type == "userAddress") {
-					userAddress = true;
-					userObjIds.push(obj.id);
-					var relationValue = "";
-					if (relationShapesData[shape.id] !== null && relationShapesData[shape.id][obj.id] != null) {
-						relationValue = relationShapesData[shape.id][obj.id];
-					}
-					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 += '</tr>';
-				} else if (obj.readonly && obj.type == "deptAddress") {
-					deptAddress = true;
-					deptObjIds.push(obj.id);
-					deptIds += "," + obj.value;
-					var relationValue = "";
-					if (relationShapesData[shape.id] !== null && relationShapesData[shape.id][obj.id] != null) {
-						relationValue = relationShapesData[shape.id][obj.id];
-					}
-					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 += '</tr>';
-				} else if (obj.readonly && obj.type == "awsorg") {
-					var relationValue = "";
-					if (relationShapesData[shape.id] !== null && relationShapesData[shape.id][obj.id] != null) {
-						relationValue = relationShapesData[shape.id][obj.id];
-					}
-					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 += '</tr>';
-				} else if (obj.readonly && obj.type == "hidden") {
-					constr = '<tr ' + mouseout + mouseover + ' objid="' + obj.id+ '" class="tagContentTableTr" style="display:none;">'
-						+ '	<td>' + obj.name + '</td>'
-						+ '	<td class="tagContentTableTrTd">'
-						+ '		<input  objid="' + obj.id + '" class="attribute_input_css" name="attribute_name_input_' + obj.id + '" value="' + obj.value + '" scope="' + obj.groupPath + '" readonly="' + obj.readonly + '"  />'
-						//+ '<div objid="' + obj.id + '" onclick="removeTrAttribute(this)" id= "ico_attribute_delete_"' + obj.id + ' class="ico_attribute_delete"></div>'
-						+ '</td></tr>';
-				} else if (obj.type == "table") {
-					let tableInput = '请输入'
-					if (obj.value.table.length > 1) {
-						tableInput = '请查看'
-					}
-					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 += '</tr>';
-				}
-			$('#' + tbodyId + ' table[name=' + shape.id + ']').append(constr);
 			}
+			var constr = '<tr>';
+			/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
+			constr += '<td  class="tableContent">' + obj.name + ':' + obj.value + '</td>';
+			constr += '</tr>';
+			if ((!obj.readonly && obj.type == "string")
+				|| (!obj.readonly && obj.type == "list")) {
+				// 目前支持到文本的输入 ,需求定下了再改
+				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 += '</tr>';
+			} else if (!obj.readonly && obj.type == "link") {
+				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 += '</tr>';
+			} else if (!obj.readonly && obj.type == "number") {
+				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 += '</tr>';
+			} 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 += '</tr>';
+			} else if (!obj.readonly && obj.type == "textarea") {
+				constr = '<tr>';
+				/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
+				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 += '</tr>';
+			} else if (obj.readonly && obj.type == "relation") {
+				var relationValue = "";
+				if (relationShapesData[shape.id] !== null && relationShapesData[shape.id][obj.id] != null) {
+					relationValue = relationShapesData[shape.id][obj.id];
+				}
+				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 += '</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 += '</tr>';
 
+				selectFlag = true;
+				var selectValue = {
+					"objId": obj.id,
+					"objValue": obj.value,
+					"objType": obj.type
+				};
+				selectValues.push(selectValue);
+			} else if (obj.readonly && obj.type == "userAddress") {
+				userAddress = true;
+				userObjIds.push(obj.id);
+				var relationValue = "";
+				if (relationShapesData[shape.id] !== null && relationShapesData[shape.id][obj.id] != null) {
+					relationValue = relationShapesData[shape.id][obj.id];
+				}
+				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 += '</tr>';
+			} else if (obj.readonly && obj.type == "deptAddress") {
+				deptAddress = true;
+				deptObjIds.push(obj.id);
+				deptIds += "," + obj.value;
+				var relationValue = "";
+				if (relationShapesData[shape.id] !== null && relationShapesData[shape.id][obj.id] != null) {
+					relationValue = relationShapesData[shape.id][obj.id];
+				}
+				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 += '</tr>';
+			} else if (obj.readonly && obj.type == "awsorg") {
+				var relationValue = "";
+				if (relationShapesData[shape.id] !== null && relationShapesData[shape.id][obj.id] != null) {
+					relationValue = relationShapesData[shape.id][obj.id];
+				}
+				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 += '</tr>';
+			} else if (obj.readonly && obj.type == "hidden") {
+				constr = '<tr ' + mouseout + mouseover + ' objid="' + obj.id+ '" class="tagContentTableTr" style="display:none;">'
+					+ '	<td>' + obj.name + '</td>'
+					+ '	<td class="tagContentTableTrTd">'
+					+ '		<input  objid="' + obj.id + '" class="attribute_input_css" name="attribute_name_input_' + obj.id + '" value="' + obj.value + '" scope="' + obj.groupPath + '" readonly="' + obj.readonly + '"  />'
+					//+ '<div objid="' + obj.id + '" onclick="removeTrAttribute(this)" id= "ico_attribute_delete_"' + obj.id + ' class="ico_attribute_delete"></div>'
+					+ '</td></tr>';
+			} else if (obj.type == "table") {
+				let tableInput = '请输入'
+				if (obj.value.table.length > 1) {
+					tableInput = '请查看'
+				}
+				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 += '</tr>';
+			}
+			$('#' + tbodyId + ' table[name=' + shape.id + ']').append(constr);
 		}
+
+	}
 	if (selectFlag) {
 		getSelectOptions(shape.category, selectValues);	//处理select类型
 	}
@@ -1452,48 +1452,61 @@ function isObjectRelationshipModel(linker, isAlert) {
 
 // 文件属性的处理
 function initProcessDesc() {
-	console.log(processDesc)
 	var length = Object.keys(processDesc).length;
 	var t = '';
-	var wid='60%';
+	var b='';
 	for(var i = 1; i <= length; i++) {
 		var obj = processDesc[i];
-		t += '<tr><td>';
+		//判断如果为相关文件/支持文件显示在右侧区域
-		t += '<div class="tableContent">' + "【"+obj.name +"】"+ '</div>';
+		if(obj.name=="相关文件" || obj.name=="支持文件"){
-		if(obj.name.length >=5){
+			b += '<table  class="awsui-table">';
-			wid='60%';
+			b += '<tr class="borderbottom">';
-		}
+			b += '<td class="tableContent">' + "【"+obj.name +"】"+ '</td>';
-		var value = obj.value;
+			b += '<td>' + obj.value + '</td>';
-		if (value == undefined) {
+			b += '</tr>';
-			value = '';
+			b += '</table>';
-			t += '<div class="tableContent" style="width:'+wid+'"  >'+ value + '</div>';
+		}else{
-			t += '</td></tr>';
+			t += '<tr class="borderbottom">';
-		} else if(obj.type == 'table') {
+			t += '<td class="tableContent">' + "【"+obj.name +"】"+ '</td>';
-			if(value == '') {
+
-				t += '<div  class="tableContent" style="width: '+wid+'">' + value + '</div>';
+			var value = obj.value;
-				t += '</td></tr>';
+			if (value == undefined) {
-			} else {
+				value = '';
-				let tableValue = JSON.parse(value.replace(/&quot;/g,'\"'))
+				t += '<td class="tableContent tableright" >'+ value + '</td>';
-				let tableFlag = '请输入'
+				t += '</tr>';
-				if (tableValue.table.length > 1) {
+			} else if(obj.type == 'table') {
-					tableFlag = '请查看'
+				if(value == '') {
+					t += '<td  class="tableContent tableright">' + value + '</td>';
+					t += '</tr>';
+				} else {
+					let tableValue = JSON.parse(value.replace(/&quot;/g,'\"'))
+					let tableFlag = '请输入'
+					if (tableValue.table.length > 1) {
+						tableFlag = '请查看'
+					}
+					t += '<td  class="tableContent tableright" onclick="openDialog(' + JSON.stringify(tableValue).replace(/\"/g,"'") +')">' +'<span style="color:blue">'+tableFlag+'</span>'+'</td>';
+					t += '</tr>';
 				}
-				t += '<div  class="tableContent" style="width: '+wid+'" onclick="openDialog(' + JSON.stringify(tableValue).replace(/\"/g,"'") +')">' +'<span style="color:blue">'+tableFlag+'</span>'+'</div>';
-				t += '</td></tr>';
 			}
+			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>';
 		}
-		else {
+
-			value = value.replace(/\n/g,'<br>')
-			t += '<div   class="tableContent" style="width: '+wid+'">' + value + '</div>';
-			t += '</td></tr>';
-		}
-		// t += '<td colspan="2" class="tableContent">' + value + '</td>';
-		// t += '</tr>';
 	}
-	$('#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')) {
@@ -1633,6 +1646,28 @@ 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 {
+
+			}
+		}
+	});
+}
 
 /**
  * 相关文件/制度文件下载
@@ -1777,7 +1812,7 @@ function sortModelByNumber() {
 		}
 	}*/
 
-   /*******************************排序方法重构***by zhaolei**********************************************/
+	/*******************************排序方法重构***by zhaolei**********************************************/
 	for (var shapeId in Model.define.elements) {
 		var shape = Model.define.elements[shapeId];
 		for (var i = 0; i < shape.dataAttributes.length; i++) {
@@ -1955,10 +1990,10 @@ function initShapeAttribute(obj) {
 			var shape = elements[temp.id];
 			if(shape.title=="线上审批" || shape.title=="线下审批" || shape.title=="系统任务" ||shape.title=="人工任务") {
 
-			if(obj==shape.id){
+				if(obj==shape.id){
-				 continue;
+					continue;
-			}
+				}
-			document.getElementById("box"+shape.id).style.display="none";
+				document.getElementById("box"+shape.id).style.display="none";
 			}
 			//document.getElementById("span"+shape.id).innerHTML=no+"."+shape.text;
 		}