Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrintModule.js
===================================================================
diff -u -r19547 -r24986
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrintModule.js	(.../invoicePrintModule.js)	(revision 19547)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrintModule.js	(.../invoicePrintModule.js)	(revision 24986)
@@ -35,9 +35,9 @@
 //			});
 //			mask.show();
 		var thiz = this;
-		Ext.Ajax.timeout=300*000;
+		Ext.Ajax.timeout=300*1000;
 		  Ext.Ajax.request({
-			  timeout: 300*000,
+			  timeout: 300*1000,
 		      url : WWWROOT + '/disinfectSystem/invoiceAction!mergeLoadPrintData.do',
 		      params : {ids : ids,type:type},
 		      success : function(response){
@@ -68,6 +68,40 @@
 		      }
 		  });
 	}
+	this.batchPrintInvoiceWithType_dwr = function(ids,type){
+		getMask();
+		mask.msg = '正在处理打印请求，请稍候...';
+		mask.show();
+		
+//			var mask = new Ext4.LoadMask({
+//			    msg    : '正在处理打印请求，请稍候...',
+//			    renderTo : document.body
+//			});
+//			mask.show();
+		var thiz = this;
+		DWREngine.setAsync(false);
+		InvoiceTableManager.mergeLoadPrintData(
+				ids,type,function(str) {
+			    	  var result = Ext.decode(str);
+			    	  if(!result.success){
+			    		  if(result.message){
+			    			  showResult(result.message);
+			    		  }
+			    	  }else{
+			    		  if(result.batches.length <= 0){
+			    			  showResult("没有打印数据");
+			    		  }else{
+			    			  for(var i = 0; i < result.batches.length;++i){
+			    				  thiz.batchPrintInvoices_result(result.batches[i], 0);
+				    		  }
+			    		  }
+			    		  
+			    		//updatePrintStatus(ids);
+			    	  }
+			    	  mask.hide();
+				});
+		DWREngine.setAsync(true);
+	}
 	this.batchPrint = function(){
 		var selectResult = showSelectUser();
 		if(selectResult == null && selectResult == undefined){