Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp =================================================================== diff -u -r40302 -r40646 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 40302) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 40646) @@ -15,6 +15,7 @@ <%@page import="java.util.Date"%> <%@page import="java.text.SimpleDateFormat"%> <%@page import="java.util.List"%> +<%@page import="net.sf.json.JSONArray"%> <%@page import="com.forgon.disinfectsystem.common.*"%> <%@page import="com.forgon.systemsetting.model.HttpOption"%> <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%> @@ -23,6 +24,7 @@ <%@page import="com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication"%> <%@page import="com.forgon.disinfectsystem.entity.materialerrordamage.MaterialErrorDamageDetail" %> <%@page import="com.forgon.log.model.Log"%> +<%@page import="com.forgon.disinfectsystem.entity.urgent.UrgentLevel"%> <%@ page contentType="text/html; charset=UTF-8"%> <%@ include file="/common/taglibs.jsp"%> @@ -52,6 +54,10 @@ request.setAttribute("projectName", projectName); request.setAttribute("fontSize",(loginUser == null || loginUser.getFontSize() == null) ? "12" : loginUser.getFontSize()); request.setAttribute("getPrintUserFullName",supplyRoomConfigManager.getSystemParamsObj().isPrintUserFullName()); + + UrgentLevel getUrgentLevelObj = supplyRoomConfigManager.getSystemParamsObj().getUrgentLevel(); + String urgentItems = JSONArray.fromObject(getUrgentLevelObj).toString(); + request.setAttribute("urgentItems", urgentItems); String supplyRoomCoding = supplyRoomConfigManager.getFirstSupplyRoomConfig().getOrgUnitCoding(); String supplyRoomName = supplyRoomConfigManager.getFirstSupplyRoomConfig().getOrgUnitName(); request.setAttribute("supplyRoomCoding", supplyRoomCoding); @@ -288,6 +294,8 @@ //httpOption的optionListId:丢失报损备注 var errorDamageRemark = '<%=HttpOption.SYSTEMSETTING_ERROR_DAMAGE_REMARK %>'; + var urgentItems = $.parseJSON('<%=urgentItems%>'); + var urgentItemsObj = urgentItems[0];