Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp =================================================================== diff -u -r25556 -r26256 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 25556) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 26256) @@ -29,6 +29,8 @@ String currentOrgUnitCode = userData.getCurrentOrgUnitCode(); double toussePriceFluctuation = 1; SupplyRoomConfig sysParamsObj = supplyRoomConfigManager.getSystemParamsObj(); + String orderField = supplyRoomConfigManager.getOrderRuleOfDepartApplicationView(); + request.setAttribute("orderField",orderField); if (sysParamsObj != null){ toussePriceFluctuation = sysParamsObj.getToussePriceFluctuation(); } @@ -248,6 +250,10 @@ if(isCssdUser == 'true'){ sortFieldStr = 'committedStatus ASC, printed ASC, po.orderByFiled ASC, po.applicationTime'; } +var orderField = '<%=request.getAttribute("orderField")%>'; +if(orderField != ""){ + sortFieldStr = orderField; +} var TYPE_SUPPLIER = encodeURIComponent('<%=Supplier.SUPPLIER_TYPE_RENTTOUSSE%>'); var tousseType_tousse = '<%=TousseDefinition.PACKAGE_TYPE_INSIDE%>'; //器械包