Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js
===================================================================
diff -u -r36563 -r36708
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js	(.../departmentMonthlyView.js)	(revision 36563)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js	(.../departmentMonthlyView.js)	(revision 36708)
@@ -738,6 +738,7 @@
 						tableHtml += getTableHtml(result.data, result.parametMap.titleInfoArr, result.parametMap.branchesOfHospitalInfo)
 						setTimeout(function () {
 							document.getElementById('thisIframe2').contentWindow.document.getElementById('table').innerHTML = tableHtml;
+							document.getElementById('thisIframe2').contentWindow.document.getElementById('ToolBar').style.display = 'block';
 							myMask.hide();
 						}, 1000);
 					} else {
@@ -787,20 +788,6 @@
 		name: 'total'
 	}];
 
-	var sign = true;
-	var dwrCallParams = null;
-
-	var tbar = [{
-		text: '导出Excel',
-		iconCls: 'btn_ext_refresh',
-		id: 'editTbar',
-		handler: function () {
-			var month = Ext.getCmp('monthSearch').getRawValue();
-			var depart = document.getElementById("departSearch").value;
-			location.href = WWWROOT + "/disinfectsystem/reportforms/departmentMonthlyExport.jsp?depart=" + depart + "&month=" + month + "&reportType=科室月报明细";
-		}
-	}];
-
 	Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function () {
 
 	};
@@ -1194,32 +1181,6 @@
 		autoScroll: true,//自动显示滚动条   
 		collapsible: true,//允许展开和收缩   
 		bodyPadding: 5,
-		tbar: [{
-			text: '导出',
-			id: 'exportButton',
-			hidden:hiddenExportButton,
-			handler: function () {
-				var html = document.getElementById('thisIframe2').contentWindow.document.getElementById('table').innerHTML;
-				if (html !== '') {
-					var startTime = $Id('startTime').value;
-					var endTime = $Id('endTime').value;
-					var title = '核算月报（' + startTime + '至' + endTime + '）';
-					var data = {
-						fileName: title
-					}
-					exportMask = new Ext.LoadMask(Ext.getBody(), {
-						msg: '正在导出文件，请稍候！',
-						removeMask: true
-					});
-					exportMask.show();
-					setTimeout(function () {
-						exportReportExcel(data, 'thisIframe2', is2Column, widthArr);
-					}, 1000);
-				} else {
-					showResult('暂无查询数据，无法导出!');
-				}
-			}
-		}],
 		html: '<iframe id="thisIframe" name="thisIframe" width="100%" height="99%" frameborder=0></iframe><iframe id="thisIframe2" name="thisIframe2" width="100%" height="99%" frameborder=0 src="' + WWWROOT + '/homepage/exportMonitorData.jsp" style="display:none"></iframe>'
 	});
 
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
===================================================================
diff -u -r36219 -r36708
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 36219)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 36708)
@@ -693,7 +693,6 @@
 			myMask.show();
 			document.getElementById('thisIframe').style.display = 'none';
 			document.getElementById('thisIframe2').style.display = 'block';
-			Ext.getCmp('exportButton').show();
 			var url = WWWROOT + "/jasperreports/jasperreportsAction!queryDataSourceList.do";
 			var startTime = params.startTime.replace(new RegExp('-', 'g'), "/");
 			var endTime = params.endTime.replace(new RegExp('-', 'g'), "/");
@@ -703,6 +702,7 @@
 				myMask.hide();
 				return;
 			}
+			Ext.Ajax.timeout = 2*60*1000;
 			Ext.Ajax.request({
 				url: url,
 				async: false,
@@ -715,6 +715,7 @@
 						tableHtml += getTableHtml(result.data, dataAll)
 						setTimeout(function () {
 							document.getElementById('thisIframe2').contentWindow.document.getElementById('table').innerHTML = tableHtml;
+							document.getElementById('thisIframe2').contentWindow.document.getElementById('ToolBar').style.display = 'block';
 							myMask.hide();
 						}, 1000);
 					} else {
@@ -735,8 +736,8 @@
 			myMask.show();
 			document.getElementById('thisIframe').style.display = 'none';
 			document.getElementById('thisIframe2').style.display = 'block';
-			Ext.getCmp('exportButton').show();
 			var url = WWWROOT + "/jasperreports/jasperreportsAction!queryDataSourceList.do";
+			Ext.Ajax.timeout = 2*60*1000;
 			Ext.Ajax.request({
 				url: url,
 				async: false,
@@ -749,6 +750,7 @@
 						tableHtml += getTableHtml2(result.data)
 						setTimeout(function () {
 							document.getElementById('thisIframe2').contentWindow.document.getElementById('table').innerHTML = tableHtml;
+							document.getElementById('thisIframe2').contentWindow.document.getElementById('ToolBar').style.display = 'block';
 							myMask.hide();
 						}, 1000);
 					} else {
@@ -765,7 +767,6 @@
 			var url = WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do";
 			document.getElementById('thisIframe').style.display = 'block';
 			document.getElementById('thisIframe2').style.display = 'none';
-			Ext.getCmp('exportButton').hide();
 			searchReport(url, params);
 		}
 	}
@@ -1632,34 +1633,6 @@
 		autoScroll: true,//自动显示滚动条   
 		collapsible: true,//允许展开和收缩   
 		bodyPadding: 5,
-		tbar: [{
-			text: '导出',
-			id: 'exportButton',
-			handler: function () {
-				var html = document.getElementById('thisIframe2').contentWindow.document.getElementById('table').innerHTML;
-				if (html !== '') {
-					var startTime = $Id('startTime').value;
-					var endTime = $Id('endTime').value;
-					var title = '明细核算月报（' + startTime + '至' + endTime + '）';
-					var data = {
-						fileName: title,
-						fileType: ".xls",
-						iframeName: 'thisIframe2',
-						html: html
-					}
-					exportMask = new Ext.LoadMask(Ext.getBody(), {
-						msg: '正在导出文件，请稍候！',
-						removeMask: true
-					});
-					exportMask.show();
-					setTimeout(function () {
-						exportReportExcel(data, 'thisIframe2', is2Column, widthArr);
-					}, 1000);
-				} else {
-					showResult('暂无查询数据，无法导出!');
-				}
-			}
-		}],
 		html: '<iframe id="thisIframe" name="thisIframe" width="100%" height="99%" frameborder=0></iframe><iframe id="thisIframe2" name="thisIframe2" width="100%" height="99%" frameborder=0 src="' + WWWROOT + '/homepage/exportMonitorData.jsp" style="display:none"></iframe>'
 	});
 
@@ -1684,8 +1657,6 @@
 		departSearch.setValue(orgUnitName);
 	}
 
-	Ext.getCmp('exportButton').hide();
-
 	//reloadReport();
 
 	if (dataForPatternOfReport.length < 1) {
Index: ssts-web/src/main/webapp/homepage/exportMonitorData.jsp
===================================================================
diff -u -r36289 -r36708
--- ssts-web/src/main/webapp/homepage/exportMonitorData.jsp	(.../exportMonitorData.jsp)	(revision 36289)
+++ ssts-web/src/main/webapp/homepage/exportMonitorData.jsp	(.../exportMonitorData.jsp)	(revision 36708)
@@ -82,21 +82,22 @@
 	<div id="echarts2"></div>
 	<a href="javascript:void(0)" id="submitForm" onclick="exportReport()"></a>
 	<script type="text/javascript">
+		var WWWROOT = '${ctx}';
 		function exportReport(){
 			// 提交表单
 			$("#none_form").submit();
 		}
 		function printAll(){
-			if(isIE()){
-				var newWindow = window.open();
-				newWindow.document.write(document.getElementById('table').innerHTML);
-				newWindow.document.close();
-				newWindow.focus();
-				newWindow.print();
-				newWindow.close();
-			}else {
-				window.print();
+			var LODOP; //声明为全局变量      
+			if (LODOP != null) {
+				LODOP.SET_LICENSES("广州孚峻信息技术有限公司", "864607680718189907689190562356", "", "");
+				return LODOP;
 			}
+			LODOP = getLodop(document.getElementById('LODOP'), document.getElementById('LODOP_EM'));
+			LODOP.SET_SHOW_MODE("HIDE_PAPER_BOARD",1);
+			var tableHtml = document.getElementById('table').innerHTML;
+			LODOP.ADD_PRINT_HTM(10,10,"100%","100%","<body leftmargin=0 topmargin=0>"+tableHtml+"</body>");
+			LODOP.PREVIEW();
 		}
 		function exportReportForExcel(){
 			var title = document.getElementById('table').getElementsByTagName('p')[0].innerHTML;
@@ -125,6 +126,8 @@
 			}
 		}
 	</script>
+	<!-- 打印函数 -->
+	<script language="javascript" src="${ctx}/disinfectsystem/print/LodopFuncs.js?version=${svnRevision}"></script>
 </body>
 </html>
 <%