Index: ssts-web/src/main/webapp/js/tBarForm.js
===================================================================
diff -u -r15441 -r15567
--- ssts-web/src/main/webapp/js/tBarForm.js	(.../tBarForm.js)	(revision 15441)
+++ ssts-web/src/main/webapp/js/tBarForm.js	(.../tBarForm.js)	(revision 15567)
@@ -81,6 +81,11 @@
     $Id('startDate').value = "";
     $Id('endDate').value = "";
     $Id('parm_s_keyWord').value = "";
+    var goodType = $Id('parm_s_goodType');
+    //因为不是所有地方都有parm_s_goodType,所以要判断非空
+    if (!isUndefinedOrNullOrEmpty(goodType)) {
+        $Id('parm_s_goodType').value = "";
+    }
 }
 
 /**
@@ -116,16 +121,13 @@
         reader: new Ext.data.JsonReader({
             totalProperty: 'totalCount',
             root: 'data'
-        }, [{
-            name: 'id',
-            mapping: 'id'
-        }, {
-            name: 'spelling',
-            mapping: 'spelling'
-        }, {
-            name: 'name',
-            mapping: 'name'
-        }])
+        }, [
+            {name: 'id', mapping: 'id'},
+            {name: 'spelling', mapping: 'spelling'},
+            {name: 'name', mapping: 'name'},
+            {name: 'tousseType', mapping: 'tousseType'},
+            {name: 'type', mapping: 'type'}
+        ])
     });
     me.searchKeyWord.store = keyWordStore;
 }
@@ -150,9 +152,15 @@
     anchor: '97%',
     listeners: {
         select: function (combo, records, eOpts) {
+            //关键字的id
             var keyWord = records.get('id');
+            //关键字的物品类型
+            var type = records.get('type');
+            //因为不是所有地方都有parm_s_goodType,所以要判断非空
             $Id('parm_s_keyWord').value = keyWord;
-            // $Id('keyWord').value = keyWord;
+            if (!isUndefinedOrNullOrEmpty(type)) {
+                $Id('parm_s_goodType').value = type;
+            }
         }
     }
 }