Index: ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/print/printConfig.js
===================================================================
diff -u -r13313 -r18786
--- ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/print/printConfig.js	(.../printConfig.js)	(revision 13313)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/print/printConfig.js	(.../printConfig.js)	(revision 18786)
@@ -203,11 +203,17 @@
         	]
         },
     	barcodes : [
-				{codeType : "128Auto", dataIndex : 'departBarcode', position : ["3mm","74%","40mm","8mm"],
+				{codeType : "128Auto", dataIndex : 'departBarcode', position : ["3mm","81%","40mm","8mm"],
 					styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true},
 					          {itemNameID: 0, styleName: 'FontSize', styleValue: 6},
 					          {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true}
 					]
+				},
+				{codeType : "128Auto", dataIndex : 'serialNum', position : ["3mm","60%","40mm","8mm"],
+					styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true},
+					          {itemNameID: 0, styleName: 'FontSize', styleValue: 6},
+					          {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true}
+					]
 				}
     	]
 }
@@ -379,12 +385,18 @@
         	]
         },
     	barcodes : [
-    		{codeType : "128Auto", dataIndex : 'departBarcode', position : ["5mm","74%","40mm","8mm"],
-    			styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true},
-    					  {itemNameID: 0, styleName: 'FontSize', styleValue: 6},
-    					  {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true}
-    			]
-    		}
+    				{codeType : "128Auto", dataIndex : 'departBarcode', position : ["5mm","81%","40mm","8mm"],
+    					styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true},
+    					          {itemNameID: 0, styleName: 'FontSize', styleValue: 6},
+    					          {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true}
+    					]
+    				},
+    				{codeType : "128Auto", dataIndex : 'serialNum', position : ["5mm","60%","40mm","8mm"],
+    					styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true},
+    					          {itemNameID: 0, styleName: 'FontSize', styleValue: 6},
+    					          {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true}
+    					]
+    				}
        ]
         
 }
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
===================================================================
diff -u -r18629 -r18786
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 18629)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 18786)
@@ -84,6 +84,15 @@
 #divselect ul li a{display:block;font-size:30px; height:60px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;}
 #divselect ul li a:hover{background-color:#CCC;}
 
+#divStatusSelect{width:300px; margin:0px 230px auto; position:relative; z-index:10000;}
+#divStatusSelect cite{width:250px; height:50px;line-height:50px;font-size:30px; display:block; color:#FFFFFF; cursor:pointer;font-style:normal;
+padding-left:4px; padding-right:30px; border:1px solid #333333; 
+background:url(xjt.png) no-repeat right center;}
+#divStatusSelect ul{width:284px;border:1px solid #333333; background-color:#ffffff; position:absolute; z-index:20000; margin-top:-1px; display:none;}
+#divStatusSelect ul li{height:60px; line-height:60px;}
+#divStatusSelect ul li a{display:block;font-size:30px; height:60px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;}
+#divStatusSelect ul li a:hover{background-color:#CCC;}
+
 #rememberRecycleUser{width:300px; margin:-50px 490px auto; position:relative; z-index:10000;}
 #rememberCheckBox{
  width: 60px;
@@ -410,6 +419,7 @@
 	}
 	
 	$.divselect("#divselect","#inputselect");
+	$.divselect("#divStatusSelect","#inputStatusSelect");
 	var groupid = CookieManager.getCookie("groupId");
 	var groupText = CookieManager.getCookie("groupText");
 	if(groupText != null && groupText != ''){
@@ -974,7 +984,14 @@
 		updateHeaderStatus();
 		//resetHeader();
 	}
+	resetStatusFilter();
 }
+/**
+ * 更新状态过滤框
+ */
+function resetStatusFilter(){
+	$("#divStatusSelect cite").html("按状态过滤")
+}
 
 function clearApplicationFilter(){
 	CookieManager.setCookie("applyDepartCode","");
@@ -995,9 +1012,11 @@
     	resetHeaderFilterStyle("operator");
     }
 	if(recycleRecordFilterManager.statusEnabled()){
-    	setHeaderFilterStyle("state");
+		$("#divStatusSelect cite").html(CookieManager.getCookie('status'));
+    	//setHeaderFilterStyle("state");
     }else{
-    	resetHeaderFilterStyle("state");
+    	//$("#divStatusSelect cite").html("按状态过滤");
+    	//resetHeaderFilterStyle("state");
     }
 	if(recycleRecordFilterManager.applicationTypeEnabled()){
     	setHeaderFilterStyle("applicationType");
@@ -1041,11 +1060,15 @@
 	openSelect('选择状态','selectStatus.jsp?p=p');
 }
 function selectStatus(status){
-	if(recycleRecordFilterManager.selectStatus(status)){
-		firstPage();     //过滤后就进入到首页
-		updateHeaderStatus();
-	}
+	recycleRecordFilterManager.selectStatus(status);
+	firstPage();     //过滤后就进入到首页
+	updateHeaderStatus();
 }
+function resetStatus(status){
+	recycleRecordFilterManager.resetStatus();
+	firstPage();     //过滤后就进入到首页
+	updateHeaderStatus();
+}
 function selectIdCardBarcode(barcode){
 	if(recycleRecordFilterManager.selectIDCardBarcode(barcode)){
 		firstPage();
@@ -1162,6 +1185,17 @@
     <!--待回收列表 end-->
     <!--历史回收记录 start-->
     <div class="his_item">
+    	<input name="" type="hidden" value="" id="inputStatusSelect"/>
+    	<div id="divStatusSelect">
+		      <cite>按状态过滤</cite>
+		      <ul>
+		      	  <li><a href="javascript:resetStatus();" id="" selectid="">全部</a></li>
+			      <li><a href="javascript:selectStatus('未确认');" id="" selectId="" >未确认</a></li>
+			      <li><a href="javascript:selectStatus('已确认');" id="" selectId="">已确认</a></li>
+			      <li><a href="javascript:selectStatus('未保存');" id="" selectId="">未保存</a></li>
+			      <li><a href="javascript:selectStatus('已保存');" id="" selectId="">已保存</a></li>
+		      </ul>
+ 		</div>
     	<div class="add"><a href="#" class="pic_bg_03" onclick="clearFilter();">清除过滤</a></div>
         <div class="th">
             <table width="934" border="0" cellspacing="0" cellpadding="0">
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/recycleRecordFilterManager.js
===================================================================
diff -u -r13934 -r18786
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/recycleRecordFilterManager.js	(.../recycleRecordFilterManager.js)	(revision 13934)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/recycleRecordFilterManager.js	(.../recycleRecordFilterManager.js)	(revision 18786)
@@ -191,15 +191,19 @@
 		filter += '}';
 		return filter;
 	}
-	this.reset = function(){
-		var ret = false;
-		ret |= resetDepart();
-		ret |= resetUser();
+	this.resetStatus = function(){
 		status = CookieManager.getCookie('status');
 		if(status.length > 0){
 			CookieManager.deleteCookie('status');
-			ret = true;
+			return true;
 		}
+		return false;
+	}
+	this.reset = function(){
+		var ret = false;
+		ret |= resetDepart();
+		ret |= resetUser();
+		ret |= this.resetStatus();
 		applicationType = CookieManager.getCookie('applicationType');
 		if(applicationType.length > 0){
 			CookieManager.deleteCookie('applicationType');