Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r23685 -r23701
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 23685)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 23701)
@@ -2008,37 +2008,63 @@
 //simon-add
 function reset(){
 	//先将所有的过滤条件恢复默认，然后再刷新
-	//按物品
-	document.getElementById('parm_s_goodsType').value ='';
-	document.getElementById('goods').value ='';
-	//按科室分组
+	if(!sstsConfig.notShowGoodsSearchTbar){
+		//按物品
+		document.getElementById('parm_s_goodsType').value ='';
+		document.getElementById('goods').value ='';
+	}
+		
+	if (sstsConfig.isShowDeptGroup) {
+		//按科室分组
+		document.getElementById('deptGroup').value = '';
+		document.getElementById('parm_s_departCodes').value = '';
+	}
 	
-	document.getElementById('deptGroup').value = '';
-	document.getElementById('parm_s_departCodes').value = '';
-	//按器械包分组
-	document.getElementById('touseGroup').value = '';
-	document.getElementById('parm_s_tousseGroupId').value = '';
+	if (sstsConfig.isShowTousseGroup) {
+		//按器械包分组
+		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 = '';
+	if(!sstsConfig.notShowTousseTypeSearchTbar){
+		//按器械包类型分组
+		document.getElementById('touseType').value = '';
+		document.getElementById('parm_s_tousseTypes').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 = '';
+	if(!sstsConfig.notShowApplyTypeSearchTbar){
+		//按申请单类型
+		document.getElementById('applyType').value = '';
+		document.getElementById('parm_s_applyType').value = '';
+	}
+	
+	if(!sstsConfig.notShowApplyDepartmentSearchTbar){
+		//按申请科室
+		document.getElementById('applyDepartment').value = '';
+		document.getElementById('parm_s_applyDepartmentCode').value = '';
+	}
+	
+	if(!sstsConfig.notShowSettleAccountsDepartmentSearchTbar){
+		//按结算科室
+		document.getElementById('settleAccountsDepartment').value = '';
+		document.getElementById('parm_s_settleAccountsDepartmentCode').value = '';
+	}
+	
+	if(!sstsConfig.notShowPrintSearchTbar){
+		//是否已打印
+		document.getElementById('print').value = '';
+		document.getElementById('parm_s_print').value = '';
+	}
+	
 	//开始时间
 	document.getElementById('parm_s_startTime').value = '';
 //	//结束时间
 	document.getElementById('parm_s_endTime').value = '';
+	
+	if(grid.searchField){
+		grid.searchField.onTriggerClear();
+	}
+	
 	grid.dwrReload();
 	
 	//开始日期、结束日期
@@ -2047,7 +2073,6 @@
     //设置结束时间为服务器当天时间
     var format = sstsConfig.timeSearchFmt ? 'yyyy-MM-dd HH:mm' : 'yyyy-MM-dd';
     getServerTime(format,Ext,'endDate');
-	
 
 }