Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp =================================================================== diff -u -r18328 -r18333 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp (.../addQualityMonitoring.jsp) (revision 18328) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp (.../addQualityMonitoring.jsp) (revision 18333) @@ -3,6 +3,7 @@ <%@page import="com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinition"%> <%@page import="com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition"%> <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition" %> +<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.container.Container"%> <%@ page import="com.forgon.directory.acegi.tools.AcegiHelper" %> <%@ page import="com.forgon.disinfectsystem.common.CssdUtils" %> <%@ include file="/common/includeExtJsAndCssSize17.jsp"%> @@ -40,6 +41,8 @@ var qmFormType = '<%=FormDefinition.FOMRTYPE_QUALITYMONITORING%>'; var PACKAGE_TYPE_FOREIGN = '<%=TousseDefinition.PACKAGE_TYPE_FOREIGN%>'; var PACKAGE_TYPE_SPLIT = '<%=TousseDefinition.PACKAGE_TYPE_SPLIT%>'; +//扫描篮筐允许的篮筐状态集合 +var basketAllowProcedure = '<%=Container.CONTAINER_STATUS_FREE%>;<%=Container.CONTAINER_STATUS_WASHLOADING%>;<%=Container.CONTAINER_STATUS_WASHED%>;<%=Container.CONTAINER_STATUS_PACKED%>'; //动态加载JS和CSS document.write('');