Index: ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp
===================================================================
diff -u -r32473 -r33102
--- ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp	(.../historyPackingView.jsp)	(revision 32473)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp	(.../historyPackingView.jsp)	(revision 33102)
@@ -135,6 +135,8 @@
     <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0></embed>
 </object>
 
+<iframe id="thisIframe" name="thisIframe" width="100%" height="100%" frameborder=0 src="${ctx}/jasperreports/jasperreportsAction!createJasperPrint.do?jasperreportName=borrowingReport.jasper&reportName=borrowingReport"></iframe>
+
 <form name="parametersFrm">
     <input type="hidden" id="parm_s_taskGroup" name="parm_s_taskGroup" value="">
     <input type="hidden" id="parm_s_startDateSearch" name="parm_s_startDateSearch" value="<%=firstDayOfMonth%>">
Index: ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js
===================================================================
diff -u -r33067 -r33102
--- ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js	(.../historyPackingView.js)	(revision 33067)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js	(.../historyPackingView.js)	(revision 33102)
@@ -60,6 +60,19 @@
 	}
 }
 
+//定时器，查询后导出
+function timeOut(){
+	var time = setTimeout(function(){
+		var html = document.getElementById('thisIframe').contentWindow.document.body.innerHTML;
+		if(html.indexOf('table') > -1){
+			clearTimeout(time);
+			location.href = WWWROOT + "/jasperRtp/exportReport.jsp";
+		}else {
+			timeOut();
+		}
+	}, 1000);
+}
+
 Ext.onReady(function() {
 	Ext.QuickTips.init();
 	Ext.apply(Ext.QuickTips.getQuickTip(), { 
@@ -79,7 +92,53 @@
 	});
 	
 	Ext.BLANK_IMAGE_URL = WWWROOT + '/ext/resources/images/default/s.gif';
+	function reloadReport(){
+		myMask = new Ext.LoadMask(Ext.getBody(), {
+			msg: '正在加载，请稍候！',
+			removeMask: true
+		});
+		myMask.show();
+		var jasperreportName = 'packingRecordReport.jasper';
+		var url = WWWROOT + '/jasperreports/jasperreportsAction!createReportFromJavaBeanSourceForOnlyPrint.do';
 
+		var startDate = $Id('startDateSearch').value;
+		var endDate = $Id('endDateSearch').value;
+		var packer = Ext.getCmp('packer').getValue();
+		var packerNumber = Ext.getCmp('packerNumber').getValue();
+		var tousseName = $Id('tousseName').value;
+		var barcode = Ext.getCmp('scanTousseBarcode').getValue();
+		var orgUnit = Ext.getCmp('orgUnit').getValue();
+		var tousseGroups = Ext.getCmp('tousseGroups').getValue();
+		var tousseTypes = Ext.getCmp('tousseTypes').getValue();
+		var taskGroups = Ext.getCmp('taskGroups').getValue();
+		if(startDate || endDate){
+			if(!startDate){
+				showResult("请录入开始时间");
+				return false;
+			}else if(!endDate){
+				showResult("请录入结束时间");
+				return false;
+			}else if(!compareDate(startDate,endDate)){
+				showResult("开始时间不能大于结束时间");
+				return false;
+			}
+		}
+		var params = {
+			tousseName: tousseName,
+			orgUnit: orgUnit,
+			tousseBarcode: barcode,
+			packer: packer,
+			packerNumber: packerNumber,
+			startTimeSearch: startDate,
+			endTimeSearch: endDate,
+			tousseGroups:tousseGroups,
+			tousseTypes:tousseTypes,
+			taskGroups:taskGroups,
+			jasperreportName:jasperreportName,
+			reportName:'packingRecordReport'
+		}
+		searchReport(url,params);
+	}
 	//器械包分组combo的store
 	var tousseGroupStore = new Ext.data.JsonStore({
 		fields : [ 'tousseGroupName','id' ],
@@ -211,19 +270,8 @@
 	    	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);
+				reloadReport();
+				timeOut();
 	    	}
 	    },{
 			xtype:'button',
@@ -688,18 +736,17 @@
 			}
 		}
 	    	
-			var params = {
-				tousseName: tousseName,
-				orgUnit: orgUnit,
-				tousseBarcode: barcode,
-				packer: packer,
-				packerNumber: packerNumber,
-				startTimeSearch: startDate,
-				endTimeSearch: endDate
-			}
-			return params;
-	    }
-	
+		var params = {
+			tousseName: tousseName,
+			orgUnit: orgUnit,
+			tousseBarcode: barcode,
+			packer: packer,
+			packerNumber: packerNumber,
+			startTimeSearch: startDate,
+			endTimeSearch: endDate
+		}
+		return params;
+	}
 	function setParamsToHiddenFieled(){
 		var startDate = $Id('startDateSearch').value;
 		var endDate = $Id('endDateSearch').value;
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r33080 -r33102
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 33080)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 33102)
@@ -475,7 +475,7 @@
             direction: 'desc'
         }]
     })
-    function getParamsJsonObj(){
+    function getParamsJsonObj(exports){
 	   if(Ext4.getCmp('startTimeSearch') == null){
 			return {
 				taskGroup : taskGroup
@@ -489,16 +489,44 @@
     	var endTimeSearch = Ext4.getCmp('endTimeSearch').getRawValue();
     	
 		var params = {
-			taskGroup : taskGroup,
 			tousseName: tousseName,
 			orgUnit: orgUnit,
 			tousseBarcode: barcode,
 			packer: q_packer,
 			startTimeSearch: startTimeSearch,
 			endTimeSearch: endTimeSearch
 		}
+		if(exports){
+			params.taskGroups = taskGroup;
+		}else {
+			params.taskGroup = taskGroup;
+		}
 		return params;
     }
+
+	function reloadReport(){
+		var jasperreportName = 'packingRecordReport.jasper';
+		var url = WWWROOT + '/jasperreports/jasperreportsAction!createReportFromJavaBeanSourceForOnlyPrint.do';
+	
+		var params = getParamsJsonObj(true);
+		params.jasperreportName = jasperreportName;
+		params.reportName = 'packingRecordReport';
+		params.queryToday = true;
+		searchReport(url,params);
+	}
+	
+	//定时器，查询后导出
+	function timeOut(){
+		var time = setTimeout(function(){
+			var html = document.getElementById('thisIframe').contentWindow.document.body.innerHTML;
+			if(html.indexOf('table') > -1){
+				clearTimeout(time);
+				location.href = WWWROOT + "/jasperRtp/exportReport.jsp";
+			}else {
+				timeOut();
+			}
+		}, 1000);
+	}
    
    function isQueryParamsValid(){
 		var startTimeSearchCmp = Ext4.getCmp('startTimeSearch');
@@ -5813,9 +5841,8 @@
     		    	text : '导出excel',
     		    	id:"exportPackingRecordsToexcel",
     		    	handler: function(){
-    		    		var params = getParamsJsonObj();
-    		    		var s = JSON.stringify(params);
-    		    		location.href = WWWROOT + "/disinfectsystem/packing/exportPackingRecord.jsp?params="+encodeURI(s);
+    		    		reloadReport();
+						timeOut();
     		    	}
     		    },{
     		    	xtype:'button',
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r32489 -r33102
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 32489)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 33102)
@@ -188,6 +188,8 @@
     <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0></embed>
 </object>
 
+<iframe style="display: none;" id="thisIframe" name="thisIframe" width="100%" height="100%" frameborder=0 src="${ctx}/jasperreports/jasperreportsAction!createJasperPrint.do?jasperreportName=borrowingReport.jasper&reportName=borrowingReport"></iframe>
+
 <div id="mainPackingView" style="height: 100%;width: 100%;"></div>
 <input type="hidden" id="userName" value="${userName}">
 <input type="hidden" id="userLoginName" value="${userLoginName}">