Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r16563 -r16585
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 16563)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 16585)
@@ -3401,7 +3401,6 @@
                 fieldLabel: '开始日期',
                 name: 'startDate',
                 format: sstsConfig.timeSearchFmt || 'Y-m-d',
-                name: 'startDate',
                 id: 'startDate',
                 readOnly: false,
                 editable: false,
@@ -3445,6 +3444,11 @@
         tbar2.push({text: '按科室分组过滤:'});
         tbar2.push(searchComboConfig.departmentGroupCombo);
 	}
+	if (sstsConfig.isShowTousseGroup){
+        tbar2.push({text: '按器械包分组:'});
+        tbar2.push(searchComboConfig.tousseGroupCombo);
+	}
+
     return tbar2;
 }
 
@@ -3610,41 +3614,92 @@
  * @returns
  */
 function createDeptGroupCombo() {
-    var deptGroupStore = new Ext.data.Store({
+    var deptGroupStoreConfig = {
+        url : WWWROOT + '/disinfectSystem/baseData/departmentGroupAction!loadDeptGroup.do',
+        model :  [
+            {name: 'departCodes', mapping: 'valueField'},
+            {name: 'name', mapping: 'displayField'}
+        ]
+	}
+    return createCombo({
+        fieldLabel: '按科室分组过滤',
+        displayField: 'name',
+        valueField: 'departCodes',
+        storeConfig : deptGroupStoreConfig,
+        width : 200,
+        listeners: {
+            select: function (combo, record, index) {
+                var deptGroupId = record.get('departCodes');
+                reloadConditionPara(deptGroupId, 'parm_s_departCodes');
+            }
+        }
+	});
+}
+
+/**
+ * 创建按器械包分组下拉选项
+ * @returns
+ */
+function createTousseGroupCombo() {
+    var touseGroupStoreConfig = {
+    	url : WWWROOT + '/disinfectSystem/baseData/tousseGroupAction!loadAllTousseGroupStore.do',
+        model : [
+            {name: 'id', mapping: 'valueField'},
+            {name: 'tousseGroupName', mapping: 'displayField'}
+        ]
+	}
+    return createCombo({
+        fieldLabel: '按器械包分组',
+        displayField: 'tousseGroupName',
+        valueField: 'id',
+        storeConfig : touseGroupStoreConfig,
+        listeners: {
+            select: function (combo, record, index) {
+                var tousseGroupId = record.get('id');
+                reloadConditionPara(tousseGroupId, 'parm_s_tousseGroupId');
+            }
+        }
+	});
+}
+
+/**
+ * 根据storeConfig的配置创建extJs2的store
+ * @param storeConfig 创建store的配置
+ * @returns {Ext.data.Store}
+ */
+function createStore(storeConfig) {
+    return new Ext.data.Store({
         proxy: new Ext.data.HttpProxy({
-            url: WWWROOT + '/disinfectSystem/baseData/departmentGroupAction!loadDeptGroup.do',
+            url: storeConfig.url,
             method: 'POST'
         }),
         reader: new Ext.data.JsonReader({
                 root: 'data',
                 totalProperty: 'totalCount'
-            }, [
-                {name: 'departCodes', mapping: 'departCodes'},
-                {name: 'name', mapping: 'name'}
-            ]
+            }, storeConfig.model
         )
     });
+}
 
-    var departmentGroupCombo = {
+/**
+ * 创建下拉选项统一方法
+ * @param comboConfig 下拉选项的配置
+ * @returns
+ */
+function createCombo(comboConfig) {
+    return {
         xtype: 'combo',
-        fieldLabel: '按科室分组过滤',
-        hidden: !sstsConfig.isShowDeptGroup,
-        store: deptGroupStore,
-        width: 200,
+        fieldLabel: comboConfig.fieldLabel,
+        store: createStore(comboConfig.storeConfig),
+        width: comboConfig.width || 100,
         triggerAction: 'all',
-        displayField: 'name',
-        valueField: 'departCodes',
+        displayField: comboConfig.displayField,
+        valueField: comboConfig.valueField,
         forceSelection: true,
         value: '全部',
         editable: false,
-        listeners: {
-            select: function (combo, record, index) {
-                var deptGroupId = record.get('departCodes');
-                reloadConditionPara(deptGroupId, 'parm_s_departCodes');
-            }
-        }
+        listeners: comboConfig.listeners
     };
-    return departmentGroupCombo;
 }
 
 Ext.onReady(function() {
@@ -3838,15 +3893,14 @@
 		}
 	};
 
-    var departmentGroupCombo = createDeptGroupCombo();
 
 	var isSupplyRoomUser = validateIsSupplyRoomUser();
 
 	//搜索的tbar
-
     var searchTbar = createSearchTbar({
         quickScreenCombo : quickScreenCombo,
-        departmentGroupCombo : departmentGroupCombo
+        departmentGroupCombo : createDeptGroupCombo(),
+        tousseGroupCombo : createTousseGroupCombo()
     });
 
     //操作的tbar