Index: ssts-web/src/main/webapp/log/loggrid.js
===================================================================
diff -u -r20221 -r21004
--- ssts-web/src/main/webapp/log/loggrid.js	(.../loggrid.js)	(revision 20221)
+++ ssts-web/src/main/webapp/log/loggrid.js	(.../loggrid.js)	(revision 21004)
@@ -29,6 +29,9 @@
  */
 function loadResult() {
     var model = Ext.getCmp('model').getValue();
+    if(model == "全部"){
+    	model = " " ;   //等于全部时条件设为空查询所有
+    }
     var userName = Ext.getCmp('userName').getValue();
     var operationType = Ext.getCmp('operationType').getValue();
     var operationDescription = Ext.getCmp('operationDescription').getValue();
@@ -161,7 +164,8 @@
     var modelStore = new Ext.data.SimpleStore({
             fields: ['value'],
             data: [
-                ['发货']
+                ['全部'] 
+                ,['发货']
                 ,['申请模块']
                 ,['申请单']
                 ,['回收模块']
@@ -215,7 +219,7 @@
         displayField: 'value',
         allowBlank: false,
         editable: false,
-        value: '发货',
+        value: '全部',
         store: modelStore,
         forceSelection: true,
         mode: 'local',