Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r29130 -r29147
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 29130)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 29147)
@@ -2193,6 +2193,163 @@
     grid.dwrReload();
 }
 
+//打印一次性物品汇总
+function printDisposableGoodsInvoicePlanSummary(printType){
+	var beginTime = Ext.getCmp('beginTime').getValue();
+	var endTime = Ext.getCmp('endTime').getValue();
+	var inventorySerialNumber = printConfig.inventorySerialNumber || [];
+	if(inventorySerialNumber.length == 0){
+		showResult('请先在printConfig.js里面配置物资编码');
+		return;
+	}
+	beginTime = date2string(new Date(beginTime));
+	endTime = date2string(new Date(endTime));
+	top.Ext.MessageBox.progress('加载中', '请稍候...');
+	Ext.Ajax.request({
+		url :  WWWROOT + '/disinfectSystem/recyclingApplicationAction!printDisposableGoodsInvoicePlanSummary.do',
+		params : {
+			inventorySerialNumber:inventorySerialNumber.join(';'),
+			startDate:beginTime,
+			endDate:endTime
+		},
+		success : function(response, options) {
+			var obj = Ext.decode(response.responseText);
+			top.Ext.MessageBox.hide();
+			if(obj.success){
+				if(printConfig.printDisposableGoodsInvoicePlanSummary){
+					if(obj.data.length == 0){
+						showResult('没有可打印的一次性物品');
+						return;
+					}
+					if(printConfig.printDisposableGoodsInvoicePlanSummary.customPrint){
+						printConfig.printDisposableGoodsInvoicePlanSummary.customPrint(obj,printType);
+						grid.dwrReload();
+					}else {
+						showResult('未找到【一次性物品汇总单】的打印配置');
+						return
+					}
+				}else {
+					showResult('未找到【一次性物品汇总单】的打印配置');
+					return
+				}
+			}else{
+				showResult(obj.message);
+			}
+		},
+		failure : function(response, options) {
+			var result = Ext.decode(response.responseText);
+			if(result && result.message){
+				showResult(result.message);
+			}else{
+				showResult('打印失败');
+			}
+		}
+	});
+}
+
+//打印一次性物品汇总单的过滤条件
+function printDisposableGoodsInvoicePlanSummaryWindow(){
+	//获取开始时间、结束时间
+	var beginTime = "";
+	var endTime = "";
+
+	var formPanel = new Ext.FormPanel({
+		id : 'form',
+		frame : true,
+		labelSeparator : '：',
+		labelAlign:'right',
+		bodyStyle : 'padding:5px 5px 0px 5px',
+		autoHeight:true,
+		autoScroll : true,
+		items : [ {
+			layout : 'column',
+			items : [ {
+				columnWidth : 0.5,
+				layout : 'form',
+				labelWidth:65,
+				items : [ {
+					xtype : 'datefieldWithMin',
+					fieldLabel : '开始时间',
+					id : 'beginTime',
+					name : 'beginTime',
+					editable : false,
+					format : 'Y-m-d H:i:s',
+					allowBlank : false,
+					anchor : '95%',
+					value: beginTime
+				}]
+			},{
+				columnWidth : 0.5,
+				layout : 'form',
+				labelWidth:65,
+				items : [{
+					xtype : 'datefieldWithMin',
+					fieldLabel : '结束时间',
+					id : 'endTime',
+					name : 'endTime',
+					editable : false,
+					format : 'Y-m-d H:i:s',
+					allowBlank : false,
+					anchor : '95%',
+					value: endTime
+				}]
+			}]
+		} ],
+		buttons : [{
+			id : 'printView',
+			text : '打印预览',
+			handler : function(){
+				printDisposableGoodsInvoicePlanSummary(1);
+			}
+		},{
+			id : 'print',
+			text : '打印',
+			handler : function(){
+				printDisposableGoodsInvoicePlanSummary(0);
+			}
+		},{
+			id : 'cancel',
+			text : '取消',
+			handler : function(){
+				chooseRecyclingDetailWin.close();
+			}
+		}]
+	});
+	
+	var chooseRecyclingDetailWin = new Ext.Window( {
+		id : 'chooseRecyclingDetailWin',
+		layout : 'fit',
+		title : '打印一次性物品汇总单 ',
+		width : 530,
+		border : false,
+		modal : true,
+		autoHeight : true,
+		plain : true,
+		items : [ formPanel ]
+	});
+
+	Ext.Ajax.request({
+		url:  WWWROOT + '/system/serverTimeAction!getCurrentTime.do?beforeTime=20',
+		params: {dateformat: 'yyyy-MM-dd HH:mm:ss'},
+		success: function(response, options) {
+			var result = Ext.decode(response.responseText);
+			if (result.success) {
+				var startDateTime = result.data.startDateTime;
+				var endDateTime = result.data.endDateTime;
+				Ext.getCmp('beginTime').setValue(startDateTime);
+				Ext.getCmp('endTime').setValue(endDateTime)
+				chooseRecyclingDetailWin.show();
+			} else {
+				showResult(result.message);
+			}
+		},
+		failure : function(response, options) {
+			showResult('获取服务器时间失败!');
+		}
+	});
+	
+}
+
 //simon-add
 function refresh(){
     grid.dwrReload();
@@ -2793,54 +2950,7 @@
 						}	
 					},{
                         text: '打印一次性物品汇总单',hidden: !sstsConfig.printDisposableGoodsInvoicePlanSummary, handler: function () {
-							top.Ext.MessageBox.confirm("请确认", "要打印一次性物品汇总单吗？",
-							function (btn) {
-								if (btn == 'yes') {
-									var inventorySerialNumber = printConfig.inventorySerialNumber || [];
-									if(inventorySerialNumber.length == 0){
-										showResult('请先在printConfig.js里面配置物资编码');
-										return;
-									}
-
-									Ext.Ajax.request({
-										url :  WWWROOT + '/disinfectSystem/recyclingApplicationAction!printDisposableGoodsInvoicePlanSummary.do',
-										params : {
-											inventorySerialNumber:inventorySerialNumber.join(';')
-										},
-										success : function(response, options) {
-											var obj = Ext.decode(response.responseText);
-											if(obj.success){
-												if(printConfig.printDisposableGoodsInvoicePlanSummary){
-													if(obj.data.length == 0){
-														showResult('没有可打印的一次性物品');
-														return;
-													}
-													if(printConfig.printDisposableGoodsInvoicePlanSummary.customPrint){
-														printConfig.printDisposableGoodsInvoicePlanSummary.customPrint(obj);
-														grid.dwrReload();
-													}else {
-														showResult('未找到【一次性物品汇总单】的打印配置');
-														return
-													}
-												}else {
-													showResult('未找到【一次性物品汇总单】的打印配置');
-													return
-												}
-											}else{
-												showResult(obj.message);
-											}
-										},
-										failure : function(response, options) {
-											var result = Ext.decode(response.responseText);
-											if(result && result.message){
-												showResult(result.message);
-											}else{
-												showResult('打印失败');
-											}
-										}
-									});
-								}
-							});
+							printDisposableGoodsInvoicePlanSummaryWindow()
 						}
                     }]
             })