Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r32277 -r32284
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 32277)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 32284)
@@ -495,7 +495,7 @@
 		readyFunction(serverTime);
 	});
 });
-
+var isFirst = true;
 //更新进度条的状态
 function updateprogressStatus(items){
 	var status = '';
@@ -599,11 +599,11 @@
 		var name = '';
 		var time = '';
 		if(sstsConfig.tousseStatusProgressBarConfig){
+			var colorOfUnpassedNode = sstsConfig.tousseStatusProgressBarConfig.colorOfUnpassedNode || '#367f21';
+			var colorOfPassedNode = sstsConfig.tousseStatusProgressBarConfig.colorOfPassedNode || '#f00000';
 			if(sstsConfig.tousseStatusProgressBarConfig.showPersonAndDateTime){
 				documentGetElementsByClassName('name'+i)[0].innerHTML = name;
 				documentGetElementsByClassName('time'+i)[0].innerHTML = time;
-				var colorOfUnpassedNode = sstsConfig.tousseStatusProgressBarConfig.colorOfUnpassedNode || '#367f21';
-				var colorOfPassedNode = sstsConfig.tousseStatusProgressBarConfig.colorOfPassedNode || '#f00000';
 				
 				documentGetElementsByClassName('name'+i)[0].style.color = colorOfUnpassedNode;
 				documentGetElementsByClassName('time'+i)[0].style.color = colorOfUnpassedNode;
@@ -621,6 +621,7 @@
 					documentGetElementsByClassName('step'+i+'-line')[0].style.border = '1px solid ' + colorOfUnpassedNode;
 				}
 			}else {
+
 				documentGetElementsByClassName('s-step'+i)[0].title = '<p>'+titleArr[i].split(',')[0]+'：'+name+'</p><p>'+titleArr[i].split(',')[1]+'：'+time+'</p>';
 			}
 		}else {
@@ -670,22 +671,27 @@
 				time = useRecordEnteringDate;
 			}
 			if(sstsConfig.tousseStatusProgressBarConfig){
+				var colorOfPassedNode = sstsConfig.tousseStatusProgressBarConfig.colorOfPassedNode || '#f00000';
 				if(sstsConfig.tousseStatusProgressBarConfig.showPersonAndDateTime){
 					documentGetElementsByClassName('name'+i)[0].innerHTML = name;
 					documentGetElementsByClassName('time'+i)[0].innerHTML = time;
-					var colorOfPassedNode = sstsConfig.tousseStatusProgressBarConfig.colorOfPassedNode;
-					if(colorOfPassedNode){
-						documentGetElementsByClassName('name'+i)[0].style.color = colorOfPassedNode;
-						documentGetElementsByClassName('time'+i)[0].style.color = colorOfPassedNode;
-						documentGetElementsByClassName('title'+i)[0].style.color = colorOfPassedNode;
-						if(documentGetElementsByClassName('line'+i)[0]){
-							documentGetElementsByClassName('line'+i)[0].style.border = '1px solid ' + colorOfPassedNode;
-						}
-						if(documentGetElementsByClassName('step'+i+'-line')[0]){
-							documentGetElementsByClassName('step'+i+'-line')[0].style.border = '1px solid ' + colorOfPassedNode;
-						}
+					documentGetElementsByClassName('name'+i)[0].style.color = colorOfPassedNode;
+					documentGetElementsByClassName('time'+i)[0].style.color = colorOfPassedNode;
+					documentGetElementsByClassName('title'+i)[0].style.color = colorOfPassedNode;
+					if(documentGetElementsByClassName('line'+i)[0]){
+						documentGetElementsByClassName('line'+i)[0].style.border = '1px solid ' + colorOfPassedNode;
 					}
+					if(documentGetElementsByClassName('step'+i+'-line')[0]){
+						documentGetElementsByClassName('step'+i+'-line')[0].style.border = '1px solid ' + colorOfPassedNode;
+					}
 				}else {
+					documentGetElementsByClassName('title'+i)[0].style.color = colorOfPassedNode;
+					if(documentGetElementsByClassName('line'+i)[0]){
+						documentGetElementsByClassName('line'+i)[0].style.border = '1px solid ' + colorOfPassedNode;
+					}
+					if(documentGetElementsByClassName('step'+i+'-line')[0]){
+						documentGetElementsByClassName('step'+i+'-line')[0].style.border = '1px solid ' + colorOfPassedNode;
+					}
 					documentGetElementsByClassName('s-step'+i)[0].title = '<p>'+titleArr[i].split(',')[0]+'：'+name+'</p><p>'+titleArr[i].split(',')[1]+'：'+time+'</p>';
 				}
 			}else {
@@ -706,14 +712,22 @@
 		documentGetElementsByClassName('green6')[0].style.display = 'none';
 		documentGetElementsByClassName('grey6')[0].style.display = 'block';
 		documentGetElementsByClassName('red6')[0].style.display = 'none';
-		documentGetElementsByClassName('name5')[0].style.color = grey;
-		documentGetElementsByClassName('time5')[0].style.color = grey;
 		documentGetElementsByClassName('title5')[0].style.color = grey;
-		documentGetElementsByClassName('line5')[0].style.border = '1px solid ' + grey;
-		documentGetElementsByClassName('name6')[0].style.color = grey;
-		documentGetElementsByClassName('time6')[0].style.color = grey;
 		documentGetElementsByClassName('title6')[0].style.color = grey;
-		documentGetElementsByClassName('line6')[0].style.border = '1px solid ' + grey;
+		if(documentGetElementsByClassName('line5')[0]){
+			documentGetElementsByClassName('line5')[0].style.border = '1px solid ' + grey;
+		}
+		if(documentGetElementsByClassName('line6')[0]){
+			documentGetElementsByClassName('line6')[0].style.border = '1px solid ' + grey;
+		}
+		if(sstsConfig.tousseStatusProgressBarConfig){
+			if(sstsConfig.tousseStatusProgressBarConfig.showPersonAndDateTime){
+				documentGetElementsByClassName('name5')[0].style.color = grey;
+				documentGetElementsByClassName('time5')[0].style.color = grey;
+				documentGetElementsByClassName('name6')[0].style.color = grey;
+				documentGetElementsByClassName('time6')[0].style.color = grey;
+			}
+		}
 	}
 	if(tousseType == '敷料包'){
 		documentGetElementsByClassName('s-step1')[0].className = 's-step s-step1 none';
@@ -725,14 +739,22 @@
 		documentGetElementsByClassName('green2')[0].style.display = 'none';
 		documentGetElementsByClassName('grey2')[0].style.display = 'block';
 		documentGetElementsByClassName('red2')[0].style.display = 'none';
-		documentGetElementsByClassName('name1')[0].style.color = grey;
-		documentGetElementsByClassName('time1')[0].style.color = grey;
 		documentGetElementsByClassName('title1')[0].style.color = grey;
-		documentGetElementsByClassName('line1')[0].style.border = '1px solid ' + grey;
-		documentGetElementsByClassName('name2')[0].style.color = grey;
-		documentGetElementsByClassName('time2')[0].style.color = grey;
 		documentGetElementsByClassName('title2')[0].style.color = grey;
-		documentGetElementsByClassName('line2')[0].style.border = '1px solid ' + grey;
+		if(documentGetElementsByClassName('line1')[0]){
+			documentGetElementsByClassName('line1')[0].style.border = '1px solid ' + grey;
+		}
+		if(documentGetElementsByClassName('line2')[0]){
+			documentGetElementsByClassName('line2')[0].style.border = '1px solid ' + grey;
+		}
+		if(sstsConfig.tousseStatusProgressBarConfig){
+			if(sstsConfig.tousseStatusProgressBarConfig.showPersonAndDateTime){
+				documentGetElementsByClassName('name1')[0].style.color = grey;
+				documentGetElementsByClassName('time1')[0].style.color = grey;
+				documentGetElementsByClassName('name2')[0].style.color = grey;
+				documentGetElementsByClassName('time2')[0].style.color = grey;
+			}
+		}
 	}
 	if(applicationTime == '' && applicationTime == ''){//自定义装配
 		documentGetElementsByClassName('s-step0')[0].className = 's-step s-step0 none';
@@ -748,22 +770,41 @@
 		documentGetElementsByClassName('green2')[0].style.display = 'none';
 		documentGetElementsByClassName('grey2')[0].style.display = 'block';
 		documentGetElementsByClassName('red2')[0].style.display = 'none';
-		documentGetElementsByClassName('name0')[0].style.color = grey;
-		documentGetElementsByClassName('time0')[0].style.color = grey;
 		documentGetElementsByClassName('title0')[0].style.color = grey;
-		documentGetElementsByClassName('line0')[0].style.border = '1px solid ' + grey;
-		documentGetElementsByClassName('name1')[0].style.color = grey;
-		documentGetElementsByClassName('time1')[0].style.color = grey;
 		documentGetElementsByClassName('title1')[0].style.color = grey;
-		documentGetElementsByClassName('line1')[0].style.border = '1px solid ' + grey;
-		documentGetElementsByClassName('name2')[0].style.color = grey;
-		documentGetElementsByClassName('time2')[0].style.color = grey;
 		documentGetElementsByClassName('title2')[0].style.color = grey;
-		documentGetElementsByClassName('line2')[0].style.border = '1px solid ' + grey;
+		if(documentGetElementsByClassName('line0')[0]){
+			documentGetElementsByClassName('line0')[0].style.border = '1px solid ' + grey;
+		}
+		if(documentGetElementsByClassName('line1')[0]){
+			documentGetElementsByClassName('line1')[0].style.border = '1px solid ' + grey;
+		}
+		if(documentGetElementsByClassName('line2')[0]){
+			documentGetElementsByClassName('line2')[0].style.border = '1px solid ' + grey;
+		}
+		if(sstsConfig.tousseStatusProgressBarConfig){
+			if(sstsConfig.tousseStatusProgressBarConfig.showPersonAndDateTime){
+				documentGetElementsByClassName('name0')[0].style.color = grey;
+				documentGetElementsByClassName('time0')[0].style.color = grey;
+				documentGetElementsByClassName('name1')[0].style.color = grey;
+				documentGetElementsByClassName('time1')[0].style.color = grey;
+				documentGetElementsByClassName('name2')[0].style.color = grey;
+				documentGetElementsByClassName('time2')[0].style.color = grey;
+			}
+		}
 	}
 	if(sstsConfig.tousseStatusProgressBarConfig && sstsConfig.tousseStatusProgressBarConfig.showPersonAndDateTime){
 		documentGetElementsByClassName('order_status')[0].style.height = '85px';
-		documentGetElementsByClassName('s-step')[0].style.height = '85px';
+		var gridHeight = $('#tousseInstanceGrid').find('.x-panel-body-noheader').height();
+		var tableHeight = $('#tousseInstanceGrid').find('.x-grid3').height();
+		var scrollerHeight = $('#tousseInstanceGrid').find('.x-grid3-scroller').height();
+		
+		if(isFirst){
+			$('#tousseInstanceGrid').find('.x-panel-body-noheader').css('height',(gridHeight-45)+'px');
+			$('#tousseInstanceGrid').find('.x-grid3').css('height',(tableHeight-45)+'px');
+			$('#tousseInstanceGrid').find('.x-grid3-scroller').css('height',(scrollerHeight-45)+'px');
+			isFirst = false;
+		}
 		$('.x-toolbar').css('background','url('+WWWROOT+'/ext/fontSize12/resources/images/default/toolbar/bg2.gif) left top repeat-x rgb(208, 222, 240)');
 	}
 
@@ -828,7 +869,7 @@
 				html += '<div class="time time'+i+'" style="color:'+colorOfUnpassedNode+'"></div>';
 			}
 		}else {
-			html += '<div class="title">'+arr[i]+'</div>';
+			html += '<div class="title  title'+i+'">'+arr[i]+'</div>';
 			if(showPersonAndDateTime){
 				html += '<div class="name name'+i+'"></div>';
 				html += '<div class="time time'+i+'"></div>';
@@ -1850,6 +1891,7 @@
 		},'-',{
 			text : ' ',
 			minWidth : 160,
+			hidden:sstsConfig.enableTousseStatusProgressBar,
 			disabled : true
 		},{
 			text : ' ',
@@ -1916,10 +1958,6 @@
 								}
 							}
 						}
-						var colorOfPassedNode = sstsConfig.tousseStatusProgressBarConfig.colorOfPassedNode;
-						if(colorOfPassedNode){
-							$('.order_status .s-step b b').css('border','3px solid #000;');
-						}
 
 					}
 					getprogressStatus(arr,titleArr);