Index: ssts-web/src/main/webapp/homepage/portalPage.jsp =================================================================== diff -u -r32887 -r32888 --- ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 32887) +++ ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 32888) @@ -219,9 +219,11 @@ 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%>'; +if(sstsConfig.enableTousseMaterialStorageAlertWindow){ + materialMinStock = '<%=SystemWarningItemVO.WARNING_TYPE_MATERIAL_MIN_STOCK_ALIAS%>'; +} var disabledTousseGoods = '<%=SystemWarningItemVO.WARNING_TYPE_DISABLED_TOUSSE%>'; var satisfactionSurveyNotice = '<%=SystemWarningItemVO.NOTICE_TYPE_SATISFACTIONSURVEY_TABLE%>'; var warningCertification = '<%=SystemWarningItemVO.WARNING_TYPE_REGISTRATIONCERTIFICATION%>'; Index: ssts-web/src/main/webapp/homepage/portalPage.js =================================================================== diff -u -r32887 -r32888 --- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 32887) +++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 32888) @@ -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 || v == materialMinStock_ALIAS){ + }else if(v == materialMinStock || v == materialMaxStock){ 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/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp =================================================================== diff -u -r32887 -r32888 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp (.../materialDefinitionView.jsp) (revision 32887) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp (.../materialDefinitionView.jsp) (revision 32888) @@ -40,9 +40,11 @@ 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%>'; +if(sstsConfig.enableTousseMaterialStorageAlertWindow){ + materialMinStock = '<%=SystemWarningItemVO.WARNING_TYPE_MATERIAL_MIN_STOCK_ALIAS%>'; +}