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){
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r14674 -r14686
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 14674)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 14686)
@@ -3241,7 +3241,7 @@
 			text : '申请器械包',
 			iconCls : 'btn_ext_add_tousse',
 			tooltip : '申请器械包',
-			hidden : SSTS_RecycApplication_Create || sstsConfig.applicationFormType != 2,
+			hidden : SSTS_RecycApplication_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
 			handler : function() {
 				invoicePlanForTousseType = invoicePlanForTousseType_Tousse;//器械包
 				//新打开申请对话框时,相关参数调整及清除
@@ -3255,7 +3255,7 @@
 			text : '申请一次性物品',
 			iconCls : 'btn_ext_add_tousse',
 			tooltip : '申请一次性物品',
-			hidden : SSTS_RecycApplication_Create || sstsConfig.applicationFormType != 2,
+			hidden : SSTS_RecycApplication_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
 			handler : function() {
 				invoicePlanForTousseType = invoicePlanForTousseType_Diposable;//一次性物品
 				//新打开申请对话框时,相关参数调整及清除
@@ -3269,7 +3269,7 @@
 			text : '申请消毒物品',
 			tooltip : '申请内容物不固定的消毒物品',
 			iconCls : 'btn_ext_add_foreignTousse',
-			hidden : SSTS_RecycApplication_Create || sstsConfig.applicationFormType != 2,
+			hidden : SSTS_RecycApplication_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
 			handler : function() {
 				invoicePlanForTousseType = invoicePlanForTousseType_Tousse;//消毒物品也属器械包的类型
 				//新打开申请对话框时,相关参数调整及清除
@@ -3305,7 +3305,7 @@
 		},{
 			text : '借物',
 			iconCls : 'btn_ext_add_tousse',
-			hidden : SSTS_borrow_Create,
+			hidden : SSTS_borrow_Create || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
 			handler : function() {
 				addAndEditTousseLease('');
 			}
@@ -3425,8 +3425,8 @@
 			}
 	}];
 
-	//如果不是用版本2或者是在高级视图的全部申请单打开,则按原来的显示
-	if (recyclingApplicationVersion != 2 || listType == 'all'){
+	//如果不是用版本2或者是在高级视图的全部申请单打开或者不是临床科室则按原来的显示
+	if (recyclingApplicationVersion != 2 || listType == 'all' || isSupplyRoomUser == true){
 		grid = new Ext.ux.ForgonPageGrid({
 				title : entityName + '单列表',
 				tbar : tbar,
Index: ssts-web/src/main/resources/systemset/portalPage.xml
===================================================================
diff -u -r14668 -r14686
--- ssts-web/src/main/resources/systemset/portalPage.xml	(.../portalPage.xml)	(revision 14668)
+++ ssts-web/src/main/resources/systemset/portalPage.xml	(.../portalPage.xml)	(revision 14686)
@@ -4,6 +4,7 @@
 	<portalPage pageIndex="1" pageId="normal" itemStyleClass="ui-state-default">
 		<portalItem title="科室申领" itemId="recyclingApplication" operationIds="SSTS_RecycApplication_Create,SSTS_RecycApplication_Update,SSTS_RecycApplication_Select,SSTS_RecycApplication_Delete,SSTS_ForeignTousseApplication_Create,SSTS_ForeignTousseApplication_Update,SSTS_ForeignTousseApplication_Select,SSTS_ForeignTousseApplication_Delete" imgUrl="/themes/portalPage/img/tabs_recyclingApplication.png" itemLinkUrl="/disinfectsystem/recyclingApplication/goodsApplicationView.jsp?listType=todoList" />
 		<portalItem title="科室申领" itemId="recyclingApplicationVersion2" operationIds="SSTS_RecycApplication_Create,SSTS_RecycApplication_Update,SSTS_RecycApplication_Select,SSTS_RecycApplication_Delete,SSTS_ForeignTousseApplication_Create,SSTS_ForeignTousseApplication_Update,SSTS_ForeignTousseApplication_Select,SSTS_ForeignTousseApplication_Delete" imgUrl="/themes/portalPage/img/tabs_recyclingApplication.png" itemLinkUrl="/disinfectsystem/recyclingApplication/goodsApplicationViewVersion2.jsp" />
+		<portalItem title="申请单查询" itemId="recyclingApplicationQuery" operationIds="SSTS_RecycApplication_Create,SSTS_RecycApplication_Update,SSTS_RecycApplication_Select,SSTS_RecycApplication_Delete,SSTS_ForeignTousseApplication_Create,SSTS_ForeignTousseApplication_Update,SSTS_ForeignTousseApplication_Select,SSTS_ForeignTousseApplication_Delete" imgUrl="/themes/portalPage/img/tabs_invoceDetail.png" itemLinkUrl="/disinfectsystem/recyclingApplication/goodsApplicationView.jsp?listType=all" />
 		<portalItem title="科室互借" itemId="borrowRecord" operationIds="SSTS_borrowRecord_Create,SSTS_borrowRecord_Update,SSTS_borrowRecord_Select,SSTS_borrowRecord_Delete" imgUrl="/themes/portalPage/img/tabs_borrowRecord.png" itemLinkUrl="/disinfectsystem/borrowRecord/borrowRecordView.jsp" />
 		<portalItem title="借物管理" itemId="borrowManager" operationIds="SSTS_borrow_Create,SSTS_borrow_Update,SSTS_borrow_Select,SSTS_borrow_Delete" imgUrl="/themes/portalPage/img/3517.png" itemLinkUrl="/disinfectsystem/borrow/borrowingTousseView.jsp" />
 		<portalItem title="回收清点" itemId="recyclingRecordTouchScreen" operationIds="SSTS_RecycRecord_Create,SSTS_RecycRecord_Update,SSTS_RecycRecord_Select,SSTS_RecycRecord_Delete" imgUrl="/themes/portalPage/img/tabs_recyclingRecord.png" itemLinkUrl="/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp" />
Index: ssts-web/src/main/webapp/homepage/portalPage.jsp
===================================================================
diff -u -r14643 -r14686
--- ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 14643)
+++ ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 14686)
@@ -141,6 +141,7 @@
 </style>
 
 <script>
+	var globalIsSupplyRoomUser = '<%=supplyRoomConfigManager.isSupplyRoomUser(userData)%>';
 var openFlag = '<%=openSelectOrgUnitWindow%>';  //决定要不要显示切换科室的窗口
 var WWWROOT = '${ctx}';
 var loginUserDataJsonStr = '${loginUserDataJsonStr}';