Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp =================================================================== diff -u -r14608 -r14668 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 14608) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 14668) @@ -61,7 +61,8 @@ request.setAttribute("showAllApplicationPermission", has); String listType = request.getParameter("listType"); - + request.setAttribute("listType", listType); + boolean isCssdUser = false; if(firstSupplyRoomConfig != null && currentOrgUnitCode != null){ String supplyRoomCoding = firstSupplyRoomConfig.getOrgUnitCoding(); @@ -133,6 +134,8 @@ var unPrint = '<%=InvoicePlan.PRINT_STATUS_UNPRINT%>'; var isCssdUser = '<%=request.getAttribute("isCssdUser")%>'; +//因为申请单有version2版本,全部申请单和科室申领引用同一个js,因此要加入这个listType来区分面前页面是科室申领还是全部申请单 +var listType = '<%=request.getAttribute("listType")%>'; var sortFieldStr = 'committedStatus ASC, po.orderByFiled ASC, po.applicationTime'; //var sortFieldStr = 'po.applicationTime'; if(isCssdUser == 'true'){