Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r24805 -r25038
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 24805)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 25038)
@@ -1,6 +1,7 @@
 var warningWindow; //系统告警win
 var unReturnWarningWindow; //未归还告警win
 var packingMenu ;
+var comboToussePackingMenu ;
 var reviewPackingMenu ;
 var sterilizationRecordMenu ;
 //用来判断Ext4.onReady执行完没有(selenium自动测试需要用到这个变量,请不要删除)
@@ -13,13 +14,19 @@
 	packingMenu = new Ext4.menu.Menu({
         floating: true
     });
+	comboToussePackingMenu = new Ext4.menu.Menu({
+        floating: true
+    });
     reviewPackingMenu = new Ext4.menu.Menu({
     	floating: true
     });
 	for(var i=0;i<taskGroup.length;i++){
 		packingMenu.add({
         	text :taskGroup[i]
         });
+		comboToussePackingMenu.add({
+        	text :taskGroup[i]
+        });
 		reviewPackingMenu.add({
 			text :taskGroup[i]
 		});
@@ -30,6 +37,12 @@
 		}
 		addTab('packing',item.text+'装配',encodeURI('/disinfectsystem/packing/packingView.jsp?taskGroup='+item.text));
 	});
+	comboToussePackingMenu.on('click',function(menu,item,e){
+		if(isUndefinedOrNull(item)){
+			return;
+		}
+		addTab('packing',item.text+'装配',encodeURI('/disinfectsystem/packing/comboToussePackingView.jsp?taskGroup='+item.text));
+	});
 	reviewPackingMenu.on('click',function(menu,item,e){
 		if(isUndefinedOrNull(item)){
 			return;
@@ -259,9 +272,10 @@
 	}
 	
 	var packingImg = getById('packingImg');
+	var comboToussePackingImg = getById('comboToussePackingImg');
 	var reviewPackingImg = getById('reviewPackingImg');
 	var sterilizationRecordImg = getById('sterilizationRecordImg');
-	if(packingImg || reviewPackingImg || sterilizationRecordImg){
+	if(packingImg || comboToussePackingImg || reviewPackingImg || sterilizationRecordImg){
         DWREngine.setAsync(false);
         PackingTableManager.getAllTaskGroup(setTaskGroup);
         DWREngine.setAsync(true);
@@ -271,6 +285,11 @@
 	        	packingMenu.showAt(e.getXY());
 	        });
         }
+        if (comboToussePackingImg){
+        	comboToussePackingImg.on('mouseenter', function(e) {
+        		comboToussePackingMenu.showAt(e.getXY());
+	        });
+        }
         if (reviewPackingImg){
 	        reviewPackingImg.on('mouseenter', function(e) {
 	        	reviewPackingMenu.showAt(e.getXY());
@@ -792,13 +811,15 @@
 			|| itemId == 'expensiveStockTake' || itemId == 'myUnFinishedTask' || itemId == 'myFinishedTask' || itemId == 'expensiveGoodsInstanceView'|| itemId == 'expensiveEnterpriseView'){
 			return returnContent;
 		}
-		
+		if(!sstsConfig.portal_showComboToussePackingIcon && itemId == 'comboToussePacking'){
+			return returnContent;
+		}
 		//如果没有启手术仪器管理功能,则桌面图标不显示
 		if(!sstsConfig.enableSurgicalInstrumentsManagement && itemId == 'instrumentGoods'){
 			return returnContent;
 		}
 		
-		if(itemId != 'packing' && itemId != 'reviewPacking' && itemId !='sterilizationRecord'){
+		if(itemId != 'packing' && itemId != 'comboToussePacking' && itemId != 'reviewPacking' && itemId !='sterilizationRecord'){
 			//region 只有临床用户且配了版本2或者3才能看到科室申领版本2或者3的图标还有申请单图标
 			//如果当前图标是科室申领的时候,如果该用户是临床科室且配了版本2或者3,隐藏该图标
 			if (itemId == 'recyclingApplication' && globalIsSupplyRoomUser == 'false' && (sstsConfig.recyclingApplicationVersion == 2 || sstsConfig.recyclingApplicationVersion == 3)){