Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js =================================================================== diff -u -r32878 -r32885 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js (.../materialDefinitionView.js) (revision 32878) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js (.../materialDefinitionView.js) (revision 32885) @@ -389,7 +389,7 @@ if(warning != null && warning != "" && warning != "null"){ var warningTypeStore = new Ext.data.SimpleStore( { fields : ['value'], - data : [['全部'],['小于最小库存材料'],['大于最大库存材料']] + data : [['全部'],[materialMinStock],[materialMaxStock]] }); var tbar = [{ text : '告警类型：' Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp =================================================================== diff -u -r32878 -r32885 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp (.../materialDefinitionView.jsp) (revision 32878) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp (.../materialDefinitionView.jsp) (revision 32885) @@ -1,6 +1,7 @@ <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition"%> <%@page import="com.forgon.systemsetting.model.HttpOption"%> <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%> +<%@page import="com.forgon.disinfectsystem.entity.systemwarning.SystemWarningItemVO,net.sf.json.JSONObject"%> <%@ page contentType="text/html; charset=UTF-8"%> <%@ include file="/common/taglibs.jsp"%> @@ -38,6 +39,9 @@ var goodsType_materialGoods = '<%=MaterialDefinition.TYPE_MATERIALGOODS%>'; var goodsType_expensiveGoods = '<%=MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS%>'; + +var materialMinStock = '<%=SystemWarningItemVO.WARNING_TYPE_MATERIAL_MIN_STOCK%>'; +var materialMaxStock = '<%=SystemWarningItemVO.WARNING_TYPE_MATERIAL_MAX_STOCK%>';