Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
===================================================================
diff -u -r35181 -r35185
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 35181)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 35185)
@@ -451,7 +451,7 @@
 				patternOfReport = 'standard';
 			} else if (reportName == '单个科室的明细核算月报') {
 				patternOfReport = 'singleDepart';
-			}else if (reportName == '详细日期明细核算月报') {
+			} else if (reportName == '详细日期明细核算月报') {
 				patternOfReport = 'detailedDate';
 			}
 		} else {//配置了多个报表格式
@@ -601,15 +601,16 @@
 				success: function (response) {
 					var result = Ext.decode(response.responseText);
 					var title = result.parametMap.title;
-					if(result.data && result.data.length > 0){
+					if (result.data && result.data.length > 0) {
 						var tableHtml = "<p style='font-family: SansSerif;color: #000000;font-size: 14px;font-weight: bold;text-align: center;'>" + title + "</p>";
 						tableHtml += getTableHtml(result.data, dataAll)
 						setTimeout(function () {
 							document.getElementById('thisIframe2').contentWindow.document.getElementById('table').innerHTML = tableHtml;
 							myMask.hide();
 						}, 1000);
-					}else {
+					} else {
 						document.getElementById('thisIframe2').contentWindow.document.getElementById('table').innerHTML = '';
+						myMask.hide();
 					}
 				},
 				failure: function (response, options) {
@@ -1127,7 +1128,7 @@
 				columnWidth: .25,
 				layout: 'form',
 				labelWidth: 150,
-				id:'showBatchBox',
+				id: 'showBatchBox',
 				items: [{
 					xtype: 'combo',
 					fieldLabel: '显示一次性物品批次',
@@ -1150,7 +1151,7 @@
 				columnWidth: .25,
 				layout: 'form',
 				labelWidth: 120,
-				id:'showSendTimeBox',
+				id: 'showSendTimeBox',
 				items: [{
 					xtype: 'combo',
 					fieldLabel: '显示发货日期',
@@ -1238,17 +1239,17 @@
 					id: "patternOfReport",
 					anchor: '95%',
 					listeners: {
-						change: function (field, newVal, oldVal) {
-							if (newVal == "singleDepart") {
+						select: function (field, item, oldVal) {
+							if (item.data.id == "singleDepart") {
 								var departSearch = Ext.getCmp('invoicePlanDepartSearch');
 								departSearch.setValue("");
 								Ext.getCmp('invoicePlanDepartCoding').setValue("");
 								Ext.getCmp('showBatchBox').show();
 								Ext.getCmp('showSendTimeBox').show();
-							}else if(newVal == "detailedDate"){
+							} else if (item.data.id == "detailedDate") {
 								Ext.getCmp('showBatchBox').hide();
 								Ext.getCmp('showSendTimeBox').hide();
-							}else {
+							} else {
 								Ext.getCmp('showBatchBox').show();
 								Ext.getCmp('showSendTimeBox').show();
 							}
@@ -1378,6 +1379,8 @@
 					setTimeout(function () {
 						exportReportExcel(data, document.getElementById('thisIframe2').contentWindow.document.getElementById('table'), false, widthArr);
 					}, 1000);
+				} else {
+					showResult('暂无查询数据，无法导出!');
 				}
 			}
 		}],
@@ -1408,10 +1411,14 @@
 	Ext.getCmp('exportButton').hide();
 
 	//reloadReport();
-
 	if (dataForPatternOfReport.length < 1) {
 		Ext.getCmp("patternOfReportLable").setVisible(false);
 	} else if (dataForPatternOfReport.length > 1) {
 		Ext.getCmp('patternOfReport').setValue(getHiddenValueByReportName(reportTypeJson[0].reportName));
+	} else if (dataForPatternOfReport.length == 1) {
+		if (dataForPatternOfReport[0][0] == 'detailedDate') {
+			Ext.getCmp('showBatchBox').hide();
+			Ext.getCmp('showSendTimeBox').hide();
+		}
 	}
 });
\ No newline at end of file