Index: ssts-web/src/main/webapp/homepage/portalPage.jsp =================================================================== diff -u -r26942 -r27159 --- ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 26942) +++ ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 27159) @@ -14,7 +14,8 @@ <% PortalPageAction portalPageAction = (PortalPageAction)SpringBeanManger.getBean("portalPageAction"); SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager"); - + + //该用户有权限的桌面图标 String allSortPortalListData = portalPageAction.getCurrentUserCustomizeSortPortalPageJsons(); request.setAttribute("allSortPortalListData",allSortPortalListData); LoginUserData userData = (LoginUserData)session.getAttribute("loginUserData"); @@ -226,7 +227,7 @@ var dirOrgCode = '<%=request.getAttribute("departCoding")%>'; var currentDepartCode = '<%=userData.getCurrentOrgUnitCode()%>'; //用户的当前科室编码 var currentOrgUnitIsFirstSupplyRoom = <%=userData.getFirstSupplyRoomUser()%>; //当前登录的科室是否为一级供应室 - +//该用户有权限的桌面图标 var jsonObj = eval('('+'${allSortPortalListData}'+')'); var hasOpenedTitleCodeArr = new Array();//已打开的tab标签 code(除个人桌面外) var previousOpenedTitleCode = '';//上一个打开的tab标签code @@ -241,7 +242,6 @@ */ var currentActiveTabTitle = ""; var showOrHide = false; -var recyclingWindow = null; var ENABLE_SPEECH_RECOGNITION = ${ENABLE_SPEECH_RECOGNITION}; var cp = new Ext.state.CookieProvider(); cp.clear('jobType_review_name'); @@ -391,6 +391,29 @@ PortalDWRManager.activateSession(); } +/** + * 《使用记录》菜单(启用科室使用记录配置项,该菜单名为病人使用记录) + */ +var SSTS_UseRecord_Menu = true; + + if (!sstsConfig.disableUseRecord && !notInWhiteList(sstsConfig, 'useRecord')) { + SSTS_UseRecord_Menu = false; + } + + +/** + * 《科室使用记录》菜单 + */ +var SSTS_DepartmentUseRecord_Menu = true; +if(!sstsConfig.disableUseRecord && !notInWhiteList(sstsConfig, 'useRecord') && sstsConfig.enableDepartmentUseRecord){ + + SSTS_DepartmentUseRecord_Menu = false; + +} + +//是否拥有两个使用记录权限 +var hasTwoUseRecordOperation = + !SSTS_UseRecord_Menu && !SSTS_DepartmentUseRecord_Menu;