Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r15761 -r15807
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 15761)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 15807)
@@ -3438,6 +3438,7 @@
 		}
         document.getElementById('parm_s_startTime').value = value1;
         document.getElementById('parm_s_endTime').value = value2;
+        document.getElementById('parm_s_timeSearchFmt').value = sstsConfig.timeSearchFmt;
         grid.dwrReload();
 	}
 
@@ -3701,35 +3702,35 @@
         quickScreenCombo,
 		// { text : '时间筛选:'},submitTimeCombo,
 		{
-			hidden : sstsConfig.recyclingApplicationVersion != 2,
+			hidden : !sstsConfig.showTimeSearch,
 			text : '开始日期:'
 		}, {
-			xtype : 'datefield',
+			xtype : sstsConfig.timeSearchFmt ? 'datefieldWithMin' : 'datefield',
 			fieldLabel : '开始日期',
-			hidden : sstsConfig.recyclingApplicationVersion != 2,
+			hidden : !sstsConfig.showTimeSearch,
 			name : 'startDate',
+			format : sstsConfig.timeSearchFmt || 'Y-m-d',
+			name : 'startDate',
 			id : 'startDate',
 			readOnly : false,
 			editable : false,
-			altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
-			format : 'Y-m-d',
-			width:100
+			width : sstsConfig.timeSearchFmt ? 130 : 100
 		}, {
-			hidden : sstsConfig.recyclingApplicationVersion != 2,
+			hidden : !sstsConfig.showTimeSearch,
 			text : '结束日期:'
 		}, {
-			xtype : 'datefield',
+			xtype : sstsConfig.timeSearchFmt ? 'datefieldWithMin' : 'datefield',
 			fieldLabel : '结束日期',
-			hidden : sstsConfig.recyclingApplicationVersion != 2,
+			hidden : !sstsConfig.showTimeSearch,
 			name : 'endDate',
 			id : 'endDate',
 			readOnly : false,
 			editable : false,
-			altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
-			format : 'Y-m-d',
-			width:100
+			// altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+			format : sstsConfig.timeSearchFmt || 'Y-m-d',
+			width : sstsConfig.timeSearchFmt ? 130 : 100
 		},{
-			hidden : sstsConfig.recyclingApplicationVersion != 2,
+			hidden : !sstsConfig.showTimeSearch,
 			xtype : 'button',
 			text : '查询',
 			// iconCls : 'btn_ext_application_search',