Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r30748 -r30818
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 30748)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 30818)
@@ -878,9 +878,50 @@
 			return returnContent;
 		}
 		
-		//如果没有开启基数管理功能,则桌面图标不显示
-		if(!sstsConfig.isShowCardinalNumManageDesktopIcon && itemId == 'cardinalNumManage'){
-			return returnContent;
+		if(sstsConfig.desktopShortcutIconsConfig){
+			var arr = sstsConfig.desktopShortcutIconsConfig || [];
+
+			//基数管理图标
+			if(arr.indexOf('基数管理') == -1 && itemId == 'cardinalNumManage'){
+				return returnContent;
+			}
+			//灭菌员发货图标
+			if (arr.indexOf('灭菌员发货') == -1 && itemId == 'sterilizerDelivery'){
+				return returnContent;
+			}
+			//设备维护信息图标
+			if (arr.indexOf('设备维护信息') >= 0){
+				//设备维护(之前的非自定义配置的版本)
+				if (itemId == 'deviceMaintenance' && sstsConfig.isDeviceMaintenanceCus){
+					return returnContent;
+				}
+				
+				//设备维护(自定义配置版本)
+				if (itemId == 'deviceMaintenanceCustom' && !sstsConfig.isDeviceMaintenanceCus){
+					return returnContent;
+				}
+			}else if(arr.indexOf('设备维护信息') == -1 && (itemId == 'deviceMaintenance' || itemId == 'deviceMaintenanceCustom')){
+				return returnContent;
+			}
+
+			//外部代理灭菌图标
+			if (arr.indexOf('外部代理灭菌') == -1 && itemId == 'foreignProxySterilizationManage'){
+				return returnContent;
+			}
+
+			//如果不是使用版本2或者3并且不启用外来器械桌面图标显示,则隐藏申请外来器械图标
+			if (arr.indexOf('外来器械申请') == -1 && itemId == 'foreignTousseApplication'){
+				return returnContent;
+			}
+
+			//自定义表单图标
+			if (arr.indexOf('自定义表单') == -1 && itemId == 'customform'){
+				return returnContent;
+			}
+		}else {
+			if(itemId == 'cardinalNumManage' || itemId == 'sterilizerDelivery' || itemId == 'deviceMaintenance' || itemId == 'deviceMaintenanceCustom' || itemId == 'foreignProxySterilizationManage' || itemId == 'foreignTousseApplication' || itemId == 'customform'){
+				return returnContent;
+			}
 		}
 		
 		//如果没有开启库位管理功能,则桌面图标不显示
@@ -944,44 +985,11 @@
 				return returnContent;
 			}
 
-			//如果不是使用版本2或者3并且不启用外来器械桌面图标显示,则隐藏申请外来器械图标
-			if (itemId == 'foreignTousseApplication' && !sstsConfig.enableForeignTousseApplicationDesktopIcon){
-				return returnContent;
-			}
-			//endregion
-
 			//如果hideTrainingManage不是false,则隐藏培训管理图标
 			if (itemId == 'training' && false !== sstsConfig.hideTrainingManage){
 				return returnContent;
 			}
 
-			//灭菌员发货图标
-			if (itemId == 'sterilizerDelivery' && true !== sstsConfig.showSterilizerDelivery){
-				return returnContent;
-			}
-			
-			//外部代理灭菌图标
-			if (itemId == 'foreignProxySterilizationManage' && !sstsConfig.showForeignProxySterilizationDesktopIcon){
-				return returnContent;
-			}
-
-			//如果启用设备维护个人桌面图标显示
-			if(sstsConfig.showDeviceMaintenanceDesktopIcon){
-				//设备维护(之前的非自定义配置的版本)
-				if (itemId == 'deviceMaintenance' && sstsConfig.isDeviceMaintenanceCus){
-					return returnContent;
-				}
-				
-				//设备维护(自定义配置版本)
-				if (itemId == 'deviceMaintenanceCustom' && !sstsConfig.isDeviceMaintenanceCus){
-					return returnContent;
-				}
-			}else{
-				if(itemId == 'deviceMaintenance' || itemId == 'deviceMaintenanceCustom'){
-					return returnContent;
-				}
-			}
-
 			//如果当前桌面图标元素为召回时
 			if(itemId == "recallRecord"){
 				if(SSTS_RecallRecord_Menu == false){