桌面版流程列表调整

src/main/webapp/yw/master1_bpm/instance/listFlowForAll.jsp

@@ -46,7 +46,7 @@ function searchByKword(s){
 					 var arr = allList[i];
 					 var bdiv=1;
 					 bdiv=1+j;
-					 if(j<7){j++;}else{j=0;};
+					 if(j<7){j++;}else{j=0;}; 
 					 var cancelRemark = subStr(arr.cancelRemark,0,20);
 					 html+= '<div class="tr_cont_new mar4 f5_new'+bdiv+'">';
 					 if(arr.modelId.control.value == "1"){
@@ -60,7 +60,13 @@ function searchByKword(s){
 					 html+= '<p><img src="/shares/images/master1/rw_ico_menu.png" width="17" height="15"  />【'+arr.modelId.modelName+'】【'+arr.state.dataName+'】&nbsp;&nbsp;'+arr.creator.username+'&nbsp;&nbsp;'+arr.createdate+' </p>';
 					 html+= '<p class="mar5">'+arr.insName ;
 					 if(arr.insSubName){
-						 html+= "&nbsp;&nbsp;" + arr.insSubName;
+						 var insSubName = "";
+						 if(arr.state.value == 0){
+							 insSubName = subStr(arr.insSubName,0,25);
+						 }else{
+							 insSubName = subStr(arr.insSubName,0,60);
+						 }
+						 html+= "&nbsp;&nbsp;" + insSubName;
 					 }
 					 if(arr.state.value == 0){
 						 html+= '&nbsp;【撤销原因：'+cancelRemark+'】';

src/main/webapp/yw/master1_bpm/instance/listFlowForDeal.jsp

@@ -62,7 +62,8 @@ function searchByKword(s){
 					 html+= '<p><img src="/shares/images/master1/rw_ico_menu.png" width="17" height="15"  />【'+arr.modelId.modelName+'】&nbsp;&nbsp;'+arr.insId.creator.username+'&nbsp;&nbsp;'+arr.insId.createdate+' </p>';
 					 html+= '<p class="mar5">'+arr.insId.insName;
 					 if(arr.insId.insSubName){
-						 html+= "&nbsp;&nbsp;" + arr.insId.insSubName;
+						 var insSubName = subStr(arr.insId.insSubName,0,60);
+						 html+= "&nbsp;&nbsp;" + insSubName;
 					 }
 					 html+= '</p>';
 					 html+= '</div>';

src/main/webapp/yw/master1_bpm/instance/listFlowForDealed.jsp

@@ -59,7 +59,8 @@ function searchByKword(s){
 					 html+= '<p><img src="/shares/images/master1/rw_ico_menu.png" width="17" height="15"  />【'+arr.modelId.modelName+'】&nbsp;&nbsp;'+arr.creator.username+'&nbsp;&nbsp;'+arr.createdate+' </p>';
 					 html+= '<p class="mar5">'+arr.insName;
 					 if(arr.insSubName){
-						 html+= "&nbsp;&nbsp;" + arr.insSubName;
+						 var insSubName = subStr(arr.insSubName,0,60);
+						 html+= "&nbsp;&nbsp;" + insSubName;
 					 }
 					 html+= '</p>';
 					 html+= '</div>';

src/main/webapp/yw/master1_bpm/instance/listFlowForDealing.jsp

@@ -61,7 +61,8 @@ function searchByKword(s){
 					 html+= '<p><img src="/shares/images/master1/rw_ico_menu.png" width="17" height="15"  />【'+arr.modelId.modelName+'】&nbsp;&nbsp;'+arr.creator.username+'&nbsp;&nbsp;'+arr.createdate+' </p>';
 					 html+= '<p class="mar5">'+arr.insName;
 					 if(arr.insSubName){
-						 html+= "&nbsp;&nbsp;" + arr.insSubName;
+						 var insSubName = subStr(arr.insSubName,0,60);
+						 html+= "&nbsp;&nbsp;" + insSubName;
 					 }
 					 html+= '</p>';
 					 html+= '</div>';

src/main/webapp/yw/master1_bpm/instance/listFlowForGroup.jsp

@@ -57,11 +57,18 @@ function searchByKword(s){
 					 html+= '<div class="tr_rw_d_new fl">'
 					 html+= '<p><img src="/shares/images/master1/rw_ico_menu.png" width="17" height="15"  />【'+arr.modelId.modelName+'】【'+arr.state.dataName+'】&nbsp;&nbsp;'+arr.creator.username+'&nbsp;&nbsp;'+arr.createdate+' </p>';
 					 html+= '<p class="mar5">'+arr.insName;
-					 if(arr.insSubName){
-						 html+= "&nbsp;&nbsp;" + arr.insSubName;
+					 if(arr.insSubName){ 
+						 var insSubName = "";
+						 if(arr.state.value == 0){
+							 insSubName = subStr(arr.insSubName,0,25);
+						 }else{
+							 insSubName = subStr(arr.insSubName,0,60);
+						 }
+						 html+= "&nbsp;&nbsp;" + insSubName;
 					 }
 					 if(arr.state.value == 0){
-						 html+= '&nbsp;【撤销原因：'+arr.cancelRemark+'】';
+						 var cancelRemark = subStr(arr.cancelRemark,0,20);
+						 html+= '&nbsp;【撤销原因：'+cancelRemark+'】';
 					 }
 					 html+= '</p>';
 					 html+= '</div>';

src/main/webapp/yw/master1_bpm/instance/listFlowForMine.jsp

@@ -92,11 +92,18 @@ function searchByKword(s){
 					 html+= '<div class="tr_rw_d_new fl">'
 					 html+= '<p><img src="/shares/images/master1/rw_ico_menu.png" width="17" height="15"  />【'+arr.modelId.modelName+'】【'+arr.state.dataName+'】&nbsp;&nbsp;'+arr.creator.username+'&nbsp;&nbsp;'+arr.createdate+' </p>';
 					 html+= '<p class="mar5">'+arr.insName;
-					 if(arr.insSubName){
-						 html+= "&nbsp;&nbsp;" + arr.insSubName;
+					 if(arr.insSubName){ 
+						 var insSubName = "";
+						 if(arr.state.value == 0){
+							 insSubName = subStr(arr.insSubName,0,25);
+						 }else{
+							 insSubName = subStr(arr.insSubName,0,60);
+						 }
+						 html+= "&nbsp;&nbsp;" + insSubName;
 					 }
-					 if(arr.state.value == 0){
-						 html+= '&nbsp;【撤销原因：'+arr.cancelRemark+'】';
+					 if(arr.state.value == 0){ 
+						 var cancelRemark = subStr(arr.cancelRemark,0,20);
+						 html+= '&nbsp;【撤销原因：'+cancelRemark+'】';
 					 }
 					 html+= '</p>';
 					 html+= '</div>';

src/main/webapp/yw/master1_bpm/instance/listFlowForMineTask.jsp

@@ -60,7 +60,8 @@ function searchByKword(s){
 					 html+= '<p><img src="/shares/images/master1/rw_ico_menu.png" width="17" height="15"  />【'+arr.taskName+'】&nbsp;&nbsp;'+arr.dUsername+'&nbsp;&nbsp;'+arr.createdate+' </p>';
 					 html+= '<p class="mar5">'+arr.insName;
 					 if(arr.insSubName){
-						 html+= "&nbsp;&nbsp;" + arr.insSubName;
+						 var insSubName = subStr(arr.insSubName,0,60);
+						 html+= "&nbsp;&nbsp;" + insSubName;
 					 }
 				
 					 html+= '</p>';

src/main/webapp/yw/master1_bpm/instance/listFlowForUrge.jsp

@@ -54,8 +54,9 @@ function searchByKword(s){
 					 html+= '<div class="tr_rw_d_new fl">'
 					 html+= '<p><img src="/shares/images/master1/rw_ico_menu.png" width="17" height="15"  />【'+arr.modelId.modelName+'】&nbsp;&nbsp;流程发起人：'+arr.creator.username+'&nbsp;&nbsp;发起时间：'+arr.createdate+'&nbsp;&nbsp;当前环节超时时间：'+arr.urgeTime+' </p>';
 					 html+= '<p class="mar5">'+arr.insName;
-					 if(arr.insSubName){
-						 html+= "&nbsp;&nbsp;" + arr.insSubName;
+					 if(arr.insSubName){ 
+						 var insSubName = subStr(arr.insSubName,0,60);
+						 html+= "&nbsp;&nbsp;" + insSubName;
 					 }
 					 html+= '</p>';
 					 html+= '</div>';