Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp =================================================================== diff -u -r32885 -r32887 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp (.../materialDefinitionView.jsp) (revision 32885) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp (.../materialDefinitionView.jsp) (revision 32887) @@ -40,6 +40,7 @@ var goodsType_materialGoods = '<%=MaterialDefinition.TYPE_MATERIALGOODS%>'; var goodsType_expensiveGoods = '<%=MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS%>'; +var materialMinStock_ALIAS = '<%=SystemWarningItemVO.WARNING_TYPE_MATERIAL_MIN_STOCK_ALIAS%>'; var materialMinStock = '<%=SystemWarningItemVO.WARNING_TYPE_MATERIAL_MIN_STOCK%>'; var materialMaxStock = '<%=SystemWarningItemVO.WARNING_TYPE_MATERIAL_MAX_STOCK%>'; Index: ssts-web/src/main/webapp/homepage/portalPage.js =================================================================== diff -u -r32878 -r32887 --- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 32878) +++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 32887) @@ -1813,7 +1813,7 @@ addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.jsp?queryType='+params); }else if(v == warningTousseGoods || v == disabledTousseGoods){ addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp?warningType='+params); - }else if(v == materialMinStock || v == materialMaxStock){ + }else if(v == materialMinStock || v == materialMaxStock || v == materialMinStock_ALIAS){ addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp?warning=warning&warningType='+v); }else if(v == warningCertification || v == disabledCertification){ addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/basedatamanager/supplier/supplierCertificationWarningView.jsp?queryType='+params); Index: ssts-web/src/main/webapp/homepage/portalPage.jsp =================================================================== diff -u -r32878 -r32887 --- ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 32878) +++ ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 32887) @@ -219,6 +219,7 @@ var overStorageDisabledGoods = '<%=SystemWarningItemVO.WARNING_TYPE_OVERSTORAGE_DIPOSABLEGOODS%>'; var belowStorageDiposableGoods = '<%=SystemWarningItemVO.WARNING_TYPE_BELOWSTORAGE_DIPOSABLEGOODS%>'; var warningTousseGoods = '<%=SystemWarningItemVO.WARNING_TYPE_TOUSSE%>'; +var materialMinStock_ALIAS = '<%=SystemWarningItemVO.WARNING_TYPE_MATERIAL_MIN_STOCK_ALIAS%>'; var materialMinStock = '<%=SystemWarningItemVO.WARNING_TYPE_MATERIAL_MIN_STOCK%>'; var materialMaxStock = '<%=SystemWarningItemVO.WARNING_TYPE_MATERIAL_MAX_STOCK%>'; var disabledTousseGoods = '<%=SystemWarningItemVO.WARNING_TYPE_DISABLED_TOUSSE%>';