Index: ssts-web/src/main/webapp/homepage/portalPage.js =================================================================== diff -u -r14668 -r14686 --- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 14668) +++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 14686) @@ -539,10 +539,21 @@ } itemUrl = WWWROOT + url; if(item['itemId'] != 'packing' && item['itemId'] != 'reviewPacking' && item['itemId'] !='sterilizationRecord'){ - //如果是用version2版本的就不显示原来的图标,如果没用version2版本的则不显示version2的图标 - if (sstsConfig.recyclingApplicationVersion == 2 && item['itemId'] == 'recyclingApplication' || sstsConfig.recyclingApplicationVersion != 2 && item['itemId'] == 'recyclingApplicationVersion2'){ - return returnContent; + //region 只有临床用户且配了版本2才能看到科室申领版本2的图标还有申请单图标 + //如果当前图标是科室申领的时候,如果该用户是临床科室且配了版本2,隐藏该图标 + if (item['itemId'] == 'recyclingApplication' && globalIsSupplyRoomUser == 'false' && sstsConfig.recyclingApplicationVersion == 2){ + return returnContent; } + + //如果图标是科室申领版本2或者查看申请单的时候,该用户不是临床科室或者没有配版本2,隐藏该图标 + if ((item['itemId'] == 'recyclingApplicationVersion2' || item['itemId'] == 'recyclingApplicationQuery') + && (globalIsSupplyRoomUser == 'true' || sstsConfig.recyclingApplicationVersion != 2)){ + return returnContent; + } + //endregion + + + var supplyRoomRecall = false; if(item['itemId'] == "recallRecord"){ if(SSTS_RecallRecord_Menu == false){