Index: ssts-web/src/main/webapp/log/loggrid.js
===================================================================
diff -u -r21004 -r23113
--- ssts-web/src/main/webapp/log/loggrid.js	(.../loggrid.js)	(revision 21004)
+++ ssts-web/src/main/webapp/log/loggrid.js	(.../loggrid.js)	(revision 23113)
@@ -30,7 +30,7 @@
 function loadResult() {
     var model = Ext.getCmp('model').getValue();
     if(model == "全部"){
-    	model = " " ;   //等于全部时条件设为空查询所有
+    	model = "" ;   //等于全部时条件设为空查询所有
     }
     var userName = Ext.getCmp('userName').getValue();
     var operationType = Ext.getCmp('operationType').getValue();
@@ -163,31 +163,7 @@
 
     var modelStore = new Ext.data.SimpleStore({
             fields: ['value'],
-            data: [
-                ['全部'] 
-                ,['发货']
-                ,['申请模块']
-                ,['申请单']
-                ,['回收模块']
-                ,['清洗模块']
-                ,['装配模块']
-                ,['审核模块']
-                ,['灭菌装载模块']
-                ,['审核模块或者灭菌装载或者灭菌模块']
-                ,['审核模块或者灭菌装载模块']
-                ,['一次性物品']
-                ,['灭菌模块']
-                ,['发货模块']
-                ,['使用记录模块']
-                ,['基础数据']
-                ,['干预模块']
-                ,['物资同步']
-                ,['一次性物品回写']
-                ,['器械包定义']
-                ,['丢失报损模块']
-                ,['借物管理模块']
-                ,['签收模块']
-            ]
+            data: modelData
         }
     );
 
Index: ssts-web/src/main/webapp/log/loggrid.jsp
===================================================================
diff -u -r17561 -r23113
--- ssts-web/src/main/webapp/log/loggrid.jsp	(.../loggrid.jsp)	(revision 17561)
+++ ssts-web/src/main/webapp/log/loggrid.jsp	(.../loggrid.jsp)	(revision 23113)
@@ -1,3 +1,4 @@
+<%@page import="com.forgon.log.model.Log"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
 <%--<%@ include file="/common/includeExtJsAndCss.jsp"%>--%>
@@ -20,6 +21,40 @@
 <script type="text/javascript" src="${ctx }/ext/js/json2.js"></script>
 <script type="text/javascript" src="${ctx }/js/forgonDateSetting.js"></script>
 <script type="text/javascript" src="loggrid.js"></script>
+<script type="text/javascript">
+var modelData = [
+ ['<%=Log.MODEL_INVOICE %>']
+,['<%=Log.MODEL_APPLICATION %>']
+,['<%=Log.MODEL_RECYCLINGRECORD %>']
+,['<%=Log.MODEL_WASH %>']
+,['<%=Log.MODEL_PACKING %>']
+,['<%=Log.MODEL_REVIEW %>']
+,['<%=Log.MODEL_STERILELOADING %>']
+,['<%=Log.MODEL_DISPOSABLEGOODS %>']
+,['<%=Log.MODEL_STERILIZATION %>']
+,['<%=Log.MODEL_STERILIZATION_UNLOAD %>']
+,['<%=Log.MODEL_STERILIZATION_TRANSITION %>']
+,['<%=Log.MODEL_USERECORD %>']
+,['<%=Log.MODEL_BASEDATA %>']
+,['<%=Log.MODEL_INTERFERE %>']
+,['<%=Log.MODEL_INVENTORYSYCN %>']
+,['<%=Log.MODEL_DISPOSABLEGOODS_WRITEBACK %>']
+,['<%=Log.MODEL_TOUSSEDEFINITION %>']
+,['<%=Log.MODEL_TOUSSEGOODSSTOCK %>']
+,['<%=Log.MODEL_RECYCLINGERRORANDDAMAGE %>']
+,['<%=Log.MODEL_BORROW %>']
+,['<%=Log.MODEL_SIGN %>']
+,['<%=Log.MODEL_MATERIALDEFINITION %>']
+,['<%=Log.MODEL_PRINT %>']
+,['<%=Log.MODEL_OPERATION_RESERVATION %>']
+,['<%=Log.MODEL_SYNC %>']
+,['<%=Log.MODEL_DEVICE_INTERFACE %>']
+,['<%=Log.MODEL_EXPENSIVEGOODS %>']
+,['<%=Log.MODEL_LOGIN %>']
+,['<%=Log.MODEL_USER %>']
+,['<%=Log.MODEL_GoodsBinding %>']
+];
+</script>
 <form name="parametersFrm">
     <input type="hidden" id="parm_s_model" name="parm_s_model">
     <input type="hidden" id="parm_s_userName" name="parm_s_userName">