Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
===================================================================
diff -u -r32096 -r32277
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 32096)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 32277)
@@ -133,7 +133,7 @@
 
     .order_status .s-step {
         float: left;
-        width: 70px;
+        width: 80px;
         height: 40px;
         position: relative;
     }
@@ -170,12 +170,12 @@
     }
 
     .order_status .s-step p {
-        width: 60px;
+        width: 70px;
         border: 1px solid #367f21;
         top: 30px;
         position: absolute;
         z-index: 86;
-        left: -50px;
+        left: -60px;
     }
 
     .order_status .s-step.active p {
@@ -198,12 +198,22 @@
         text-align: center;
         font-size: 12px;
         color: #367f21;
-        left: -12px;
-        width: 60px;
+        left: -21px;
+        width: 75px;
         text-align: center;
         font-family: '微软雅黑';
     }
 
+    .order_status .s-step .name {
+        top: 40px;
+    }
+
+    .order_status .s-step .time {
+        top: 55px;
+        white-space: break-spaces;
+        word-break: break-all;
+    }
+
     .order_status .s-step.active div {
         color: #f00000
     }
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r32112 -r32277
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 32112)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 32277)
@@ -560,10 +560,12 @@
 	var titleArr = progressStatusTitle;
 	if(sstsConfig.tousseStatusProgressBarConfig){
 		var hidingNodes = sstsConfig.tousseStatusProgressBarConfig.hidingNodes;
-		for(var i=0;i<hidingNodes.length;i++){
-			if(fixedProgressStatus.indexOf(hidingNodes[i]) >= 0){
-				var index = fixedProgressStatus.indexOf(hidingNodes[i]);
-				arr.splice(index,1);
+		if(hidingNodes){
+			for(var i=0;i<hidingNodes.length;i++){
+				if(fixedProgressStatus.indexOf(hidingNodes[i]) >= 0){
+					var index = fixedProgressStatus.indexOf(hidingNodes[i]);
+					arr.splice(index,1);
+				}
 			}
 		}
 	}
@@ -596,7 +598,34 @@
 	for(var i=0;i<arr.length;i++){
 		var name = '';
 		var time = '';
-		documentGetElementsByClassName('s-step'+i)[0].title = '<p>'+titleArr[i].split(',')[0]+'：'+name+'</p><p>'+titleArr[i].split(',')[1]+'：'+time+'</p>';;
+		if(sstsConfig.tousseStatusProgressBarConfig){
+			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;
+				documentGetElementsByClassName('title'+i)[0].style.color = colorOfUnpassedNode;
+				documentGetElementsByClassName('green'+i)[0].style.border = '3px solid ' + colorOfUnpassedNode;
+				documentGetElementsByClassName('red'+i)[0].style.border = '3px solid ' + colorOfPassedNode;
+				documentGetElementsByClassName('grey'+i)[0].style.border = '3px solid grey';
+				documentGetElementsByClassName('green'+i)[0].style.display = 'block';
+				documentGetElementsByClassName('red'+i)[0].style.display = 'none';
+				documentGetElementsByClassName('grey'+i)[0].style.display = 'none';
+				if(documentGetElementsByClassName('line'+i)[0]){
+					documentGetElementsByClassName('line'+i)[0].style.border = '1px solid ' + colorOfUnpassedNode;
+				}
+				if(documentGetElementsByClassName('step'+i+'-line')[0]){
+					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 {
+			documentGetElementsByClassName('s-step'+i)[0].title = '<p>'+titleArr[i].split(',')[0]+'：'+name+'</p><p>'+titleArr[i].split(',')[1]+'：'+time+'</p>';
+		}
 	}
 	if(index > 0){
 		for(var i=0;i<=index;i++){
@@ -640,10 +669,33 @@
 				name = useRecordOperator;
 				time = useRecordEnteringDate;
 			}
-			documentGetElementsByClassName('s-step'+i)[0].title = '<p>'+titleArr[i].split(',')[0]+'：'+name+'</p><p>'+titleArr[i].split(',')[1]+'：'+time+'</p>';;
+			if(sstsConfig.tousseStatusProgressBarConfig){
+				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;
+						}
+					}
+				}else {
+					documentGetElementsByClassName('s-step'+i)[0].title = '<p>'+titleArr[i].split(',')[0]+'：'+name+'</p><p>'+titleArr[i].split(',')[1]+'：'+time+'</p>';
+				}
+			}else {
+				documentGetElementsByClassName('s-step'+i)[0].title = '<p>'+titleArr[i].split(',')[0]+'：'+name+'</p><p>'+titleArr[i].split(',')[1]+'：'+time+'</p>';
+			}
 		}
 	}
 
+	var grey = '#555';
+
 	if(tousseType == '消毒物品' && isSterile == '否'){
 		documentGetElementsByClassName('s-step5')[0].className = 's-step s-step5 none';
 		documentGetElementsByClassName('s-step6')[0].className = 's-step s-step6 none';
@@ -654,6 +706,14 @@
 		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(tousseType == '敷料包'){
 		documentGetElementsByClassName('s-step1')[0].className = 's-step s-step1 none';
@@ -665,6 +725,14 @@
 		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(applicationTime == '' && applicationTime == ''){//自定义装配
 		documentGetElementsByClassName('s-step0')[0].className = 's-step s-step0 none';
@@ -680,29 +748,92 @@
 		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(sstsConfig.tousseStatusProgressBarConfig && sstsConfig.tousseStatusProgressBarConfig.showPersonAndDateTime){
+		documentGetElementsByClassName('order_status')[0].style.height = '85px';
+		documentGetElementsByClassName('s-step')[0].style.height = '85px';
+		$('.x-toolbar').css('background','url('+WWWROOT+'/ext/fontSize12/resources/images/default/toolbar/bg2.gif) left top repeat-x rgb(208, 222, 240)');
+	}
+
 }
 
 //获取进度条
 function getprogressStatus(arr,titleArr){
+	var showPersonAndDateTime = false;
+	var colorOfPassedNode = false;
+	var colorOfUnpassedNode = false;
+	if(sstsConfig.tousseStatusProgressBarConfig){
+		//显示节点的处理人和处理时间
+		showPersonAndDateTime = sstsConfig.tousseStatusProgressBarConfig.showPersonAndDateTime;
+		//已经经过的节点的颜色
+		colorOfPassedNode = sstsConfig.tousseStatusProgressBarConfig.colorOfPassedNode;
+		//未经过的节点的颜色
+		colorOfUnpassedNode = sstsConfig.tousseStatusProgressBarConfig.colorOfUnpassedNode;
+	}
 	var html = '<div class="order_status">';
 	progressLength = arr.length;
 	for(var i=0;i<arr.length;i++){
 		var title = '<p>'+titleArr[i].split(',')[0]+'：</p><p>'+titleArr[i].split(',')[1]+'：</p>';
-		html += '<span class="s-step s-step'+i+'" title="'+title+'">';
+		if(showPersonAndDateTime){
+			html += '<span class="s-step s-step'+i+'">';
+		}else {
+			html += '<span class="s-step s-step'+i+'" title="'+title+'">';
+		}
 		html += '<b>';
-		html += '<b class="green green'+i+'"></b>';
-		html += '<b class="red red'+i+'"></b>';
-		html += '<b class="grey grey'+i+'"></b>';
+		if(colorOfUnpassedNode){
+			html += '<b class="green green'+i+'" style="border: 3px solid '+colorOfUnpassedNode+';display: block;"></b>';
+		}else {
+			html += '<b class="green green'+i+'" style="display: block;"></b>';
+		}
+		if(colorOfPassedNode){
+			html += '<b class="red red'+i+'" style="border: 3px solid '+colorOfPassedNode+';display: none;"></b>';
+		}else {
+			html += '<b class="red red'+i+'" style="display: none;"></b>';
+		}
+		html += '<b class="grey grey'+i+'" style="display: none;"></b>';
 		html += '</b>';
-		if(i == 0){
-			html += '<p class="none"></p>';
-		}else if(i == 3 || i == 7){
-			html += '<p class="step'+i+'-line"></p>';
+		if(colorOfUnpassedNode){
+			if(i == 0){
+				html += '<p class="line'+i+' none" style="border: 1px solid '+colorOfUnpassedNode+';"></p>';
+			}else if(i == 3 || i == 7){
+				html += '<p class="line'+i+' step'+i+'-line" style="border: 1px solid '+colorOfUnpassedNode+';"></p>';
+			}else {
+				html += '<p class="line'+i+'" style="border: 1px solid '+colorOfUnpassedNode+';"></p>';
+			}
 		}else {
-			html += '<p></p>';
+			if(i == 0){
+				html += '<p class="none"></p>';
+			}else if(i == 3 || i == 7){
+				html += '<p class="step'+i+'-line"></p>';
+			}else {
+				html += '<p></p>';
+			}
 		}
-		html += '<div>'+arr[i]+'</div>';
+		if(colorOfUnpassedNode){
+			html += '<div class="title title'+i+'" style="color:'+colorOfUnpassedNode+'">'+arr[i]+'</div>';
+			if(showPersonAndDateTime){
+				html += '<div class="name name'+i+'" style="color:'+colorOfUnpassedNode+'"></div>';
+				html += '<div class="time time'+i+'" style="color:'+colorOfUnpassedNode+'"></div>';
+			}
+		}else {
+			html += '<div class="title">'+arr[i]+'</div>';
+			if(showPersonAndDateTime){
+				html += '<div class="name name'+i+'"></div>';
+				html += '<div class="time time'+i+'"></div>';
+			}
+		}
 		html += '</span>';
 	}
 	html += '</div>';
@@ -1776,13 +1907,20 @@
 					var titleArr = progressStatusTitle;
 					if(sstsConfig.tousseStatusProgressBarConfig){
 						var hidingNodes = sstsConfig.tousseStatusProgressBarConfig.hidingNodes;
-						for(var i=0;i<hidingNodes.length;i++){
-							if(arr.indexOf(hidingNodes[i]) >= 0){
-								var index = arr.indexOf(hidingNodes[i]);
-								arr.splice(index,1);
-								titleArr.splice(index,1);
+						if(hidingNodes){
+							for(var i=0;i<hidingNodes.length;i++){
+								if(arr.indexOf(hidingNodes[i]) >= 0){
+									var index = arr.indexOf(hidingNodes[i]);
+									arr.splice(index,1);
+									titleArr.splice(index,1);
+								}
 							}
 						}
+						var colorOfPassedNode = sstsConfig.tousseStatusProgressBarConfig.colorOfPassedNode;
+						if(colorOfPassedNode){
+							$('.order_status .s-step b b').css('border','3px solid #000;');
+						}
+
 					}
 					getprogressStatus(arr,titleArr);
 				}
Index: ssts-web/src/main/webapp/disinfectsystem/config/sznsrmyy/config.js
===================================================================
diff -u -r31982 -r32277
--- ssts-web/src/main/webapp/disinfectsystem/config/sznsrmyy/config.js	(.../config.js)	(revision 31982)
+++ ssts-web/src/main/webapp/disinfectsystem/config/sznsrmyy/config.js	(.../config.js)	(revision 32277)
@@ -91,6 +91,10 @@
   showAuxiliaryInvoiceBtn:true,
   //桌面快捷图标配置
   desktopShortcutIconsConfig:["外部代理灭菌"],
+  //启用器械包状态进度条
+  enableTousseStatusProgressBar:true,
+  //器械包状态进度条配置 -- hidingNodes：隐藏节点，showPersonAndDateTime：显示节点的处理人和处理时间，colorOfPassedNode：已经经过的节点的颜色，colorOfUnpassedNode：未经过的节点的颜色
+  tousseStatusProgressBarConfig:{ "showPersonAndDateTime" : true, "colorOfPassedNode" : "#f00000", "colorOfUnpassedNode" : "#367f21"},
  //发货时针对有植入物的器械包，是否要提示生物监测的情况
   biologicalMonitoringEnable  : true,
  //禁用基数限制