Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r23600 -r23685
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 23600)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 23685)
@@ -2000,6 +2000,59 @@
     grid.dwrReload();
 }
 
+//simon-add
+function refresh(){
+    grid.dwrReload();
+}
+
+//simon-add
+function reset(){
+	//先将所有的过滤条件恢复默认，然后再刷新
+	//按物品
+	document.getElementById('parm_s_goodsType').value ='';
+	document.getElementById('goods').value ='';
+	//按科室分组
+	
+	document.getElementById('deptGroup').value = '';
+	document.getElementById('parm_s_departCodes').value = '';
+	//按器械包分组
+	document.getElementById('touseGroup').value = '';
+	document.getElementById('parm_s_tousseGroupId').value = '';
+	
+	//按器械包类型分组
+	document.getElementById('touseType').value = '';
+	document.getElementById('parm_s_tousseTypes').value = '';
+	//按申请单类型
+	document.getElementById('applyType').value = '';
+	document.getElementById('parm_s_applyType').value = '';
+	
+	//按申请科室
+	document.getElementById('applyDepartment').value = '';
+	document.getElementById('parm_s_applyDepartmentCode').value = '';
+	//按结算科室
+	document.getElementById('settleAccountsDepartment').value = '';
+	document.getElementById('parm_s_settleAccountsDepartmentCode').value = '';
+	//是否已打印
+	document.getElementById('print').value = '';
+	document.getElementById('parm_s_print').value = '';
+	//开始时间
+	document.getElementById('parm_s_startTime').value = '';
+//	//结束时间
+	document.getElementById('parm_s_endTime').value = '';
+	grid.dwrReload();
+	
+	//开始日期、结束日期
+	//如果开始日期为当天则设置开始时间为当天,否则设置开始时间为服务器当天当月第一天
+    sstsConfig.startDateIsToday ? getServerTime('yyyy-MM-dd', Ext, 'startDate') : getServerTime('yyyy-MM-dd', Ext, 'startDate', null, WWWROOT + '/system/serverTimeAction!getFirstDay.do');
+    //设置结束时间为服务器当天时间
+    var format = sstsConfig.timeSearchFmt ? 'yyyy-MM-dd HH:mm' : 'yyyy-MM-dd';
+    getServerTime(format,Ext,'endDate');
+	
+
+}
+
+
+
 function reloadTimeField(){
     var startDate = Ext.getCmp("startDate").getValue();
     var endDate = Ext.getCmp("endDate").getValue();
@@ -2175,6 +2228,27 @@
 		printSearchTbarArr.push(createPrintCombo());
 		addSearchTbar(printSearchTbarArr, 150);
 	}
+	//simon-update
+	//刷新按钮
+	var refreshBtn={
+		xtype: 'button',
+		text: '刷新',
+		iconCls: 'btn_ext_refresh1',
+        handler: refresh
+	};
+	addSearchTbar(refreshBtn, 200);
+	
+	
+	
+	//重置按钮
+	var resetBtn={
+			xtype: 'button',
+			text: '重置',
+			iconCls: 'icon_set',
+	        handler: reset
+	};
+	addSearchTbar(resetBtn, 200);
+	
 }
 
 /**
@@ -2538,8 +2612,8 @@
 		displayField : 'tousseType',
 		storeConfig : touseTypeStoreConfig,
 		triggerAction : 'all',
-		id : 'tousseType',
-		name : 'tousseType',
+//		id : 'tousseType',
+//		name : 'tousseType',
 		allowBlank : false,
 		//这个要设置成false,不然多选鼠标离开之后,combo上面的值不会显示
         forceSelection : false,
@@ -2628,6 +2702,8 @@
     });
 
     var printCombo = {
+    	id: 'print',
+        name: 'print',	
         xtype: 'combo',
         fieldLabel: '打印筛选',
         store: printStatus,