Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r16557 -r16561
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 16557)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 16561)
@@ -3387,61 +3387,72 @@
  * @returns {[*,*,*,*,*,*,*,string,*]}
  */
 function createSearchTbar(searchComboConfig) {
-    var tbar2 = [
-        {hidden: sstsConfig.recyclingApplicationVersion != 2, text: '状态筛选:'},
-        searchComboConfig.quickScreenCombo,
-        {hidden: !sstsConfig.showTimeSearch, text: '开始日期:'},
-        {
-            xtype: sstsConfig.timeSearchFmt ? 'datefieldWithMin' : 'datefield',
-            fieldLabel: '开始日期',
-            hidden: !sstsConfig.showTimeSearch,
-            name: 'startDate',
-            format: sstsConfig.timeSearchFmt || 'Y-m-d',
-            name: 'startDate',
-            id: 'startDate',
-            readOnly: false,
-            editable: false,
-            width: sstsConfig.timeSearchFmt ? 130 : 100
-        },
-        {hidden: !sstsConfig.showTimeSearch, text: '结束日期:'},
-        {
-            xtype: sstsConfig.timeSearchFmt ? 'datefieldWithMin' : 'datefield',
-            fieldLabel: '结束日期',
-            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: sstsConfig.timeSearchFmt || 'Y-m-d',
-            width: sstsConfig.timeSearchFmt ? 130 : 100
-        },
-        {hidden: !sstsConfig.isShowDeptGroup, text: '按科室分组过滤:'},
-        searchComboConfig.departmentGroupCombo,
-        {
-            hidden: !sstsConfig.showTimeSearch,
-            xtype: 'button',
-            text: '查询',
-            // iconCls : 'btn_ext_application_search',
-            iconCls: 'icon_search',
-            handler: reloadTimeField
-        },
-		'->',
-        {
-            //加->表示往右居中
-            text: '全部申请单',
-            hidden: true,
-            iconCls: 'btn_ext_add_tousse',
-            handler: function () {
-                //调用父级窗口的添加tab方法
-                top.addTabJquery('showAllApplicationForm', '全部申请单', top.DisinfectsystemTreeData[0].children[0].href);
-                // window.parent.addTabJquery(id,title,href);
-            }
-        }
-    ];
+	var tbar2 = [];
+    if (sstsConfig.recyclingApplicationVersion == 2){
+        tbar2.push({text: '状态筛选:'});
+        tbar2.push(searchComboConfig.quickScreenCombo);
+    }
+    if (sstsConfig.showTimeSearch){
+        var time = [
+            // {hidden: !sstsConfig.showTimeSearch, text: '开始日期:'},
+            {text: '开始日期:'},
+            {
+                xtype: sstsConfig.timeSearchFmt ? 'datefieldWithMin' : 'datefield',
+                fieldLabel: '开始日期',
+                name: 'startDate',
+                format: sstsConfig.timeSearchFmt || 'Y-m-d',
+                name: 'startDate',
+                id: 'startDate',
+                readOnly: false,
+                editable: false,
+                width: sstsConfig.timeSearchFmt ? 130 : 100
+            },
+            { text: '结束日期:'},
+            {
+                xtype: sstsConfig.timeSearchFmt ? 'datefieldWithMin' : 'datefield',
+                fieldLabel: '结束日期',
+                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: sstsConfig.timeSearchFmt || 'Y-m-d',
+                width: sstsConfig.timeSearchFmt ? 130 : 100
+            },
+            {
+                xtype: 'button',
+                text: '查询',
+                // iconCls : 'btn_ext_application_search',
+                iconCls: 'icon_search',
+                handler: reloadTimeField
+            },
+            // , {
+            //     //加->表示往右居中
+            //     text: '全部申请单',
+            //     hidden: true,
+            //     iconCls: 'btn_ext_add_tousse',
+            //     handler: function () {
+            //         //调用父级窗口的添加tab方法
+            //         top.addTabJquery('showAllApplicationForm', '全部申请单', top.DisinfectsystemTreeData[0].children[0].href);
+            //         // window.parent.addTabJquery(id,title,href);
+            //     }
+            // }
+        ];
+        tbar2 = tbar2.concat(time);
+    }
+
+    if (sstsConfig.isShowDeptGroup){
+        tbar2.push({text: '按科室分组过滤:'});
+        tbar2.push(searchComboConfig.departmentGroupCombo);
+	}
     return tbar2;
 }
 
+/**
+ * 创建操作的工具栏
+ * @param isSupplyRoomUser 是否供应室用户
+ * @returns {[*,*,*,*,*]}
+ */
 function createOperationTbar(isSupplyRoomUser) {
     return [
         {
@@ -3832,11 +3843,10 @@
 	var isSupplyRoomUser = validateIsSupplyRoomUser();
 
 	//搜索的tbar
-    var searchTbar = new Ext.Toolbar({
-        items : createSearchTbar({
-            quickScreenCombo : quickScreenCombo,
-            departmentGroupCombo : departmentGroupCombo
-        })
+
+    var searchTbar = createSearchTbar({
+        quickScreenCombo : quickScreenCombo,
+        departmentGroupCombo : departmentGroupCombo
     });
 
     //操作的tbar
@@ -3942,7 +3952,7 @@
                             new Ext.Toolbar({items: operationTbar}).render(this.tbar);
                         }
                         //搜索的工具栏另开一行
-                        searchTbar.render(this.tbar);
+                        new Ext.Toolbar({items: searchTbar}).render(this.tbar);
                     }
                 }
 			},
@@ -3952,10 +3962,12 @@
 		);
 
 
-		//设置开始时间为服务器当天当月第一天
-		getServerTime('yyyy-MM-dd',Ext,'startDate',null, WWWROOT + '/system/serverTimeAction!getFirstDay.do');
-		//设置结束时间为服务器当天时间
-		getServerTime('yyyy-MM-dd',Ext,'endDate');
+		if (sstsConfig.showTimeSearch){
+            //设置开始时间为服务器当天当月第一天
+            getServerTime('yyyy-MM-dd',Ext,'startDate',null, WWWROOT + '/system/serverTimeAction!getFirstDay.do');
+            //设置结束时间为服务器当天时间
+            getServerTime('yyyy-MM-dd',Ext,'endDate');
+		}
 
 		var tableContent;
 		grid.on('mouseover', function(e) {// 添加mouseover事件