Index: ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js
===================================================================
diff -u -r21332 -r21549
--- ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js	(.../historyPackingView.js)	(revision 21332)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js	(.../historyPackingView.js)	(revision 21549)
@@ -149,6 +149,26 @@
 		columns : recordColumns,
 		plugins: recordFilters,
 		autoExpandColumn : 'operationRemark',
+		tbar:[{
+	    	xtype:'button',
+	    	text : '导出excel',
+	    	id:"exportPackingRecordsToexcel",
+	    	handler: function(){
+	    		setParamsToHiddenFieled();
+	    		var params = {
+	    				pageType: 'history',
+	    				tousseName: $Id('parm_s_tousseName').value,
+	    				orgUnitName: $Id('parm_s_orgUnit').value,
+	    				startDate: $Id('parm_s_startDateSearch').value,
+	    				endDate: $Id('parm_s_endDateSearch').value,
+	    				tousseBarcode: $Id('parm_s_tousseBarcode').value,
+	    				packerNumber: $Id('parm_s_packerNumber').value,
+	    				packer: $Id('parm_s_packer').value
+	    			}
+	    		var s = JSON.stringify(params);
+	    		location.href = WWWROOT + "/disinfectsystem/packing/exportPackingRecord.jsp?params="+encodeURI(s);
+	    	}
+	    }],
 		frame : false,
 		border : false
 	}, 
@@ -425,7 +445,7 @@
 		}]
 	});
 	
-	function initQueryValueAndReload() {
+	function setParamsToHiddenFieled(){
 		var startDate = $Id('startDateSearch').value;
 		var endDate = $Id('endDateSearch').value;
 		var packer = Ext.getCmp('packer').getValue();
@@ -435,13 +455,13 @@
 		if(startDate || endDate){
 			if(!startDate){
 				showResult("请录入开始时间");
-				return;
+				return false;
 			}else if(!endDate){
 				showResult("请录入结束时间");
-				return;
+				return false;
 			}else if(!compareDate(startDate,endDate)){
 				showResult("开始时间不能大于结束时间");
-				return;
+				return false;
 			}
 		}
 		
@@ -452,6 +472,12 @@
 		$Id('parm_s_tousseName').value = tousseName;
 		$Id('parm_s_orgUnit').value = $Id('orgUnit').value;
 		$Id('parm_s_tousseBarcode').value = barcode;
+		return true;
+	}
+	function initQueryValueAndReload() {
+		if(!setParamsToHiddenFieled()){
+			return;
+		}
 		recordGrid.dwrReload();
 	}
 });
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r21522 -r21549
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 21522)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 21549)
@@ -223,17 +223,24 @@
             direction: 'desc'
         }]
     })
-    
-    function initQueryValueAndReload() {
-		var tousseName = Ext4.getCmp('tousseName').getValue();
+    function getParamsJsonObj(){
+    	var tousseName = Ext4.getCmp('tousseName').getValue();
 		var orgUnit = Ext4.getCmp('orgUnit').getValue();
 		var barcode = Ext4.getCmp('scanTousseBarcode').getValue();
+		var q_packer = Ext4.getCmp('q_packer').getValue();
+		var params = {
+			taskGroup : taskGroup,
+			tousseName: tousseName,
+			orgUnit: orgUnit,
+			tousseBarcode: barcode,
+			packer: q_packer
+		}
+		return params;
+    }
+    function initQueryValueAndReload() {
+		
 		packingRecordStore .load({
-			params: {
-				tousseName: tousseName,
-				orgUnit: orgUnit,
-				tousseBarcode: barcode
-			}});
+			params: getParamsJsonObj()});
 	}
 
 // 从树种查找标识牌的装配任务
@@ -3557,6 +3564,16 @@
     			title: '今天本组装配记录',
     			layout : 'border',
     			height : document.body.clientHeight-25,
+    			tbar:[{
+    		    	xtype:'button',
+    		    	text : '导出excel',
+    		    	id:"exportPackingRecordsToexcel",
+    		    	handler: function(){
+    		    		var params = getParamsJsonObj();
+    		    		var s = JSON.stringify(params);
+    		    		location.href = WWWROOT + "/disinfectsystem/packing/exportPackingRecord.jsp?params="+encodeURI(s);
+    		    	}
+    		    }],
     			items : [{
 
 					layout : 'column',
@@ -3631,16 +3648,15 @@
 							anchor : '95%'
 						}]
 					},{
-						width : 250,
+						width : 200,
 						layout : 'form',
-						labelWidth : 100,
 						items : [{
 							xtype : 'textfield',
 							fieldLabel : '器械包条码',
 							allowBlank : true,
 							name : "scanTousseBarcode",
 							id : "scanTousseBarcode",
-							width : 150,
+							labelWidth : 75,
 //							anchor : '100%',
 							listeners : {
 								render : function(p) {
@@ -3658,6 +3674,33 @@
 								}
 							}
 						}]
+					},{
+						width : 200,
+						layout : 'form',
+						items : [{
+							xtype : 'textfield',
+							fieldLabel : '配包者',
+							allowBlank : true,
+							name : "q_packer",
+							id : "q_packer",
+							labelWidth : 50,
+//							anchor : '100%',
+							listeners : {
+								render : function(p) {
+									p.getEl().on('keypress',function(e) {
+										if (e.getKey() == 13) {//回车键
+											var barcode = Ext4.getCmp('q_packer').getValue();
+											if(!isUndefinedOrNullOrEmpty(barcode)){
+												initQueryValueAndReload();
+											}
+										}
+									});
+									p.getEl().on('focus',function(e) {
+										Ext4.getCmp('q_packer').setValue("");
+									});
+								}
+							}
+						}]
 					}, {
 						width : 80,
 						layout : 'form',
@@ -3682,6 +3725,7 @@
 								Ext4.getCmp('tousseName').setValue("");
 								Ext4.getCmp('orgUnit').setValue("");
 								Ext4.getCmp('scanTousseBarcode').setValue("");
+								Ext4.getCmp('q_packer').setValue("");
 //								$Id('tousseName').value = "";
 							}
 						}]
Index: ssts-web/src/main/webapp/disinfectsystem/packing/exportPackingRecord.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/packing/exportPackingRecord.jsp	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/exportPackingRecord.jsp	(revision 21549)
@@ -0,0 +1,16 @@
+
+<%@page import="com.forgon.disinfectsystem.packing.service.PackingManager,com.forgon.tools.SpringBeanManger"%>
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%
+String fileName="装配记录.xls";
+out.clear();
+out = pageContext.pushBody();
+ServletOutputStream servletOutputStream = response.getOutputStream();
+response.setContentType("application/octet-stream");
+response.addHeader("Content-Disposition","attachment;filename=" + new String(fileName.getBytes("GBK"), "ISO-8859-1"));
+String params = request.getParameter("params");
+PackingManager packingManager = (PackingManager)SpringBeanManger.getBean("packingManager");
+packingManager.exportPackingRecord(params,servletOutputStream);
+out.clear();
+out = pageContext.pushBody();
+%>
\ No newline at end of file