Index: ssts-web/src/main/webapp/homepage/portalPage.js =================================================================== diff -u -r36358 -r36410 --- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 36358) +++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 36410) @@ -1212,33 +1212,50 @@ } //如果没有开启库位管理功能,则桌面图标不显示 - if(!sstsConfig.enableWarehousePositionModule && itemId == 'storageLocationManagerLook'){ + if(!sstsConfig.enableWarehousePositionModule && (itemId == 'storageLocationManager' || itemId == 'storageLocationLook' || itemId == 'tousseAccess')){ return returnContent; - }else if(sstsConfig.enableWarehousePositionModule && itemId == 'storageLocationManagerLook'){ + }else if(sstsConfig.enableWarehousePositionModule && (itemId == 'storageLocationManager' || itemId == 'storageLocationLook' || itemId == 'tousseAccess')){ if(quickJumpGroupStorageArr.length == 1){ var itemLinkUrl; var title; - if(quickJumpGroupStorageArr[0] == '物品存取'){ + if(quickJumpGroupStorageArr[0] == '物品存取' && itemId == 'tousseAccess'){ itemLinkUrl = '/disinfectsystem/storageLocationManage/goodsAccess.jsp' title = '物品存取'; - }else if(quickJumpGroupStorageArr[0] == '库位管理'){ + }else if(quickJumpGroupStorageArr[0] == '库位管理' && itemId == 'storageLocationManager'){ itemLinkUrl = '/disinfectsystem/storageLocationManage/storageLocationManageView.jsp' title = '库位管理'; - }else { + }else if(quickJumpGroupStorageArr[0] == '库存查看' && itemId == 'storageLocationLook'){ itemLinkUrl = '/disinfectsystem/storageLocationManage/storageLocationLookView.jsp' title = '库存查看'; } - returnContent += '
  • '; - returnContent += '

    '; - returnContent += ''+ title +'
  • '; - return returnContent; + if(title){ + returnContent += '
  • '; + returnContent += '

    '; + returnContent += ''+ title +'
  • '; + return returnContent; + }else { + return returnContent; + } }else if(quickJumpGroupStorageArr.length > 1){ + if(!SSTS_storageLocationManager){ + if(itemId == 'storageLocationLook' || itemId == 'tousseAccess'){ + return returnContent; + } + }else { + if(!SSTS_storageLocationLook_Manager){ + if(itemId == 'tousseAccess'){ + return returnContent; + } + } + } returnContent += '
  • '; returnContent += '

    '; returnContent += '库位管理
  • '; return returnContent; }else { - return returnContent; + if(itemId == 'storageLocationManager' || itemId == 'storageLocationLook' || itemId == 'tousseAccess'){ + return returnContent; + } } } Index: ssts-web/src/main/resources/systemset/portalPage.xml =================================================================== diff -u -r36343 -r36410 --- ssts-web/src/main/resources/systemset/portalPage.xml (.../portalPage.xml) (revision 36343) +++ ssts-web/src/main/resources/systemset/portalPage.xml (.../portalPage.xml) (revision 36410) @@ -52,7 +52,9 @@ - + + + Index: ssts-web/src/main/webapp/homepage/portalPage.jsp =================================================================== diff -u -r36358 -r36410 --- ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 36358) +++ ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 36410) @@ -112,24 +112,29 @@ var quickJumpOperationTousseOp = '${quickJumpOperationTousseOp}'; var quickJumpGroupStorage = '${quickJumpGroupStorage}'; var quickJumpGroupStorageArr = []; + //库位管理 + var SSTS_storageLocationManager = true; + + SSTS_storageLocationManager = false; + //库存查看 - var SSTS_storageLocationLook_Manager = false; + var SSTS_storageLocationLook_Manager = true; - SSTS_storageLocationLook_Manager = true; + SSTS_storageLocationLook_Manager = false; //物品存取 - var SSTS_goodsAccess_Manager = false; + var SSTS_goodsAccess_Manager = true; - SSTS_goodsAccess_Manager = true + SSTS_goodsAccess_Manager = false if(quickJumpGroupStorage !== ''){ var storageArr = quickJumpGroupStorage.split(';'); for(var i=0;i