Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r19526 -r19627
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 19526)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 19627)
@@ -41,6 +41,7 @@
     }
     request.setAttribute("toussePriceFluctuation",toussePriceFluctuation);
     request.setAttribute("userName",userData.getUserFullName());
+    request.setAttribute("isFirstSupplyRoomUser",supplyRoomConfigManager.isFirstSupplyRoomOrgUnit(currentOrgUnitCode));
     request.setAttribute("isSupplyRoomUser",supplyRoomConfigManager.isSupplyRoomUser2(userData));
     boolean isBeApplication = userData.isBeApplication();
     request.setAttribute("isBeApplication",isBeApplication);
@@ -207,8 +208,11 @@
 
 var unPrint = '<%=InvoicePlan.PRINT_STATUS_UNPRINT%>';
 
+var supplyRoomCoding = '<%=request.getAttribute("supplyRoomCoding")%>';  //一级供应室的科室编码
 var isCssdUser = '<%=request.getAttribute("isCssdUser")%>';
-var isSupplyRoomUser = ${isSupplyRoomUser};
+var isFirstSupplyRoomUser = ${isFirstSupplyRoomUser};  //判断登录用户的当前科室科室编码，是否为一级供应室
+var isSupplyRoomUser = ${isSupplyRoomUser};  //判断登录用户的当前科室科室编码，是否为供应室的科室编码（包括一级供应室和二级供应室）
+
 //因为申请单有version2版本,全部申请单和科室申领引用同一个js,因此要加入这个listType来区分面前页面是科室申领还是全部申请单
 var listType = '<%=request.getAttribute("listType")%>';
 var sortFieldStr = 'committedStatus ASC, po.orderByFiled ASC, po.applicationTime';
@@ -364,7 +368,6 @@
 
 var today = '<%=request.getAttribute("today")%>';
 var toussePriceFluctuation = '<%=request.getAttribute("toussePriceFluctuation")%>';
-var supplyRoomCoding = '<%=request.getAttribute("supplyRoomCoding")%>';
 
 var actionType_confirmReturn  = '<%=ForeignTousseApplication.ACTION_TYPE_CONFIRM_RETURN%>';
 </script>