Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r36250 -r36343
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 36250)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 36343)
@@ -6,6 +6,7 @@
 var comboToussePackingMenu ;
 var reviewPackingMenu ;
 var sterilizationRecordMenu ;
+var storageMenu;
 //使用记录鼠标移入的菜单
 var useRecordMenu ;
 //用来判断Ext4.onReady执行完没有(selenium自动测试需要用到这个变量,请不要删除)
@@ -103,6 +104,29 @@
 		});
 	}
 }
+function setQuickJumpGroupStorage(arr){
+	storageMenu = new Ext4.menu.Menu({
+		floating: true
+	});
+	for(var i=0;i<arr.length;i++){
+		storageMenu.add({
+			text :arr[i]
+		});
+	}
+	storageMenu.on('click',function(menu,item,e){
+		if(isUndefinedOrNull(item)){
+			return;
+		}
+		var name = item.text;
+		if(name == '库位管理'){
+			addTab('storageLocationManage',name,'/disinfectsystem/storageLocationManage/storageLocationManageView.jsp');
+		}else if(name == '物品存取'){
+			addTab('goodsAccess',name,'/disinfectsystem/storageLocationManage/goodsAccess.jsp');
+		}else {
+			addTab('storageLocationLook',name,'/disinfectsystem/storageLocationManage/storageLocationLookView.jsp');
+		}
+	});
+}
 //屏蔽回退键,防止点击backspace键时,浏览器后退
 function disableBackspace(){
 	new Ext4.KeyMap(document,{
@@ -439,8 +463,9 @@
 	var sterilizationRecordImg = getById('sterilizationRecordImg');
 	var useRecordImg = getById('useRecordImg');
 	var invoicePlanImg = getById('invoicePlanImg');
+	var quickJumpGroupStorageImg = getById('quickJumpGroupStorageImg');
 
-	if((packingImg || comboToussePackingImg || reviewPackingImg || sterilizationRecordImg)
+	if((packingImg || comboToussePackingImg || reviewPackingImg || sterilizationRecordImg || quickJumpGroupStorageImg)
 			|| (useRecordImg && hasTwoUseRecordOperation)){
         DWREngine.setAsync(false);
         PackingTableManager.getAllTaskGroup(setTaskGroup);
@@ -547,6 +572,13 @@
 					addTab('useRecord',item.text,item.url);
 				});
 			}
+
+			if (quickJumpGroupStorageImg){
+				setQuickJumpGroupStorage(quickJumpGroupStorage.split(';'))
+				quickJumpGroupStorageImg.on('mouseenter', function(e) {
+					storageMenu.showAt(e.getXY());
+				});
+			}
 		}
     }
 	//满意度调查数字提醒
@@ -1088,7 +1120,6 @@
 		if (notInWhiteList2(itemId)) {
 			return returnContent;
 		}
-		
 		//高值耗材的几个图标不显示
 		if(itemId == 'expensiveGoodsApplication' || itemId == 'expensiveGodownEntryPurchase' || itemId == 'expensiveGodownEntryPrepareIn'
 			|| itemId == 'expensiveInvoicePlan' || itemId == 'expensiveInvoice' || itemId == 'expensiveBill'
@@ -1101,8 +1132,14 @@
 		//如果没有启手术仪器管理功能,则桌面图标不显示
 		if(!sstsConfig.enableSurgicalInstrumentsManagement && itemId == 'instrumentGoods'){
 			return returnContent;
+		}else if(sstsConfig.enableSurgicalInstrumentsManagement && itemId == 'instrumentGoods'){
+			var itemLinkUrl = "/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.jsp?editMode=true&quickJumpOperationTousseOp="+encodeURIComponent(quickJumpOperationTousseOp);
+			returnContent += '<li id="'+itemId+'" class="'+portalPage['itemStyleClass']+'" title="'+ item['title'] +'" href="'+ itemLinkUrl +'">';
+			returnContent += '<div class="imgDvi"><p><a href="#" ><span><img width=86 height=86 src="' + itemUrl + '"></span></a></P></div>';
+			returnContent += '<a class="icon-text" href="javascript:void(0);"><span>'+ item['title'] +'</span></a></li>';
+			return returnContent;
 		}
-		//如果没有开启仪器图谱功能,则桌面图标不显示
+		
 		if(!sstsConfig.toussePicturesShow && itemId == 'toussePictures'){
 			return returnContent;
 		}
@@ -1177,6 +1214,30 @@
 		//如果没有开启库位管理功能,则桌面图标不显示
 		if(!sstsConfig.enableWarehousePositionModule && itemId == 'storageLocationManagerLook'){
 			return returnContent;
+		}else if(sstsConfig.enableWarehousePositionModule && itemId == 'storageLocationManagerLook'){
+			if(quickJumpGroupStorage.split(';').length == 1){
+				var itemLinkUrl;
+				var title;
+				if(quickJumpGroupStorage == '物品存取'){
+					itemLinkUrl = '/disinfectsystem/storageLocationManage/goodsAccess.jsp'
+					title = '物品存取';
+				}else if(quickJumpGroupStorage == '库位管理'){
+					itemLinkUrl = '/disinfectsystem/storageLocationManage/storageLocationManageView.jsp'
+					title = '库位管理';
+				}else {
+					itemLinkUrl = '/disinfectsystem/storageLocationManage/storageLocationLookView.jsp'
+					title = '库存查看';
+				}
+				returnContent += '<li id="'+itemId+'" class="'+portalPage['itemStyleClass']+'" title="'+ title +'" href="'+ itemLinkUrl +'">';
+				returnContent += '<div class="imgDvi"><p><a href="#" ><span><img width=86 height=86 src="' + itemUrl + '"></span></a></P></div>';
+				returnContent += '<a class="icon-text" href="javascript:void(0);"><span>'+ title +'</span></a></li>';
+				return returnContent;
+			}else {
+				returnContent += '<li id="'+itemId+'" class="'+portalPage['itemStyleClass']+'" title="库位管理">';
+				returnContent += '<div class="imgDvi"><p><a href="#" ><span><img width=86 height=86 src="' + itemUrl + '" id="quickJumpGroupStorageImg"></span></a></P></div>';
+				returnContent += '<a class="icon-text" href="javascript:void(0);"><span>库位管理</span></a></li>';
+				return returnContent;
+			}
 		}
 		
 		//如果当前图标是物品签收2，配置的是1或者未配置，隐藏图标