Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
===================================================================
diff -u -r27802 -r27993
--- ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 27802)
+++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 27993)
@@ -159,7 +159,7 @@
 
 Ext.onReady(function() {
 	Ext.QuickTips.init();
-	
+	var loadMaskExport;
 	var tousseAndDiposableGoodsStore = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
 			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchInsideTousseAndDiposableGoods.do?showUnAppDiposableGoods=true',
@@ -557,6 +557,7 @@
 				handler : function() {
 					var goodNmae = $Id('goodsSearch').value;
 					var tousseType = $Id('tousseType').value;
+					var comboTousseType = Ext.getCmp('comboTousseType').getValue();
 					var department = Ext.getCmp('department').getValue();
 					var orgUnitCoding = Ext.getCmp('querySupplyRoom').getValue();
 					var startDate= $Id('startDate' + IDS).value;
@@ -567,7 +568,32 @@
 						showResult('查询时间有误,请正确选择查询时间。');
 						return false;
 					}
-					exportData(goodNmae,tousseType,department,startDate,endDate,orgUnitCoding);
+					loadMaskExport = new Ext.LoadMask(Ext.getBody(), { 
+						msg: '正在处理，请稍候......'
+					});
+					
+					loadMaskExport.show();
+					exportData(goodNmae,tousseType,department,startDate,endDate,orgUnitCoding,comboTousseType);
+			        var loop = setInterval(function(){
+						Ext.Ajax.request({
+					        url :  WWWROOT + '/disinfectSystem/supplyRoomControlAction!getCreateOperateDataStatus.do',
+					        success : function(response, options) {
+					    		var result = Ext.decode(response.responseText);
+					    		if(result.success || result.operationMonitoringExportMessage != ""){
+					    			loadMaskExport.hide();
+						    		clearInterval(loop);
+						    		if(result.operationMonitoringExportMessage != ""){
+						    			showResult(result.operationMonitoringExportMessage);
+						    		}
+					    		}
+					        },
+					        failure : function(response, options) {
+								loadMaskExport.hide();
+								clearInterval(loop);
+								showResult("连接异常!");
+							}
+					    });
+					},2000);
 				}
 			
 			},{
@@ -1026,10 +1052,11 @@
 		});
 	});
 
-function exportData(goodNmae,tousseType,department,startDate,endDate,orgUnitCoding){
+function exportData(goodNmae,tousseType,department,startDate,endDate,orgUnitCoding,comboTousseType){
 	location.href = WWWROOT + "/homepage/exportOperateData.jsp?" 
 							 +"goodNmae="+goodNmae+"&tousseType="+tousseType  
 							 +"&department="+department+"&startDate="+startDate
 							 +"&endDate="+endDate
-							 +"&orgUnitCoding="+orgUnitCoding;
+							 +"&orgUnitCoding="+orgUnitCoding
+							 +"&comboTousseType="+comboTousseType;
 }
\ No newline at end of file