Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r15619 -r16052
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 15619)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 16052)
@@ -1,3 +1,4 @@
+<%@page import="com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinition"%>
 <%@page import="com.forgon.disinfectsystem.entity.recyclingdamagerecord.RecyclingDamageItem"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier,com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%>
 <%@page import="com.forgon.disinfectsystem.entity.packing.PackingTask"%>
@@ -9,7 +10,7 @@
 <%@page import="java.util.Date"%>
 <%@page import="java.text.SimpleDateFormat"%>
 <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
-<%@page import="com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoring"%>
+<%@page import="com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition" %>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition" %>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
@@ -55,7 +56,6 @@
 <script type="text/javascript" src="${ctx}/ext/grid/ForgonGrid.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/TousseInstanceTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/SterilizationRecordTableManager.js"></script>
-<script type="text/javascript" src="${ctx}/dwr/interface/QualityMonitoringTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/RecyclingDamageTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/UserTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/ExpirationDateInfoTableManager.js"></script>
@@ -90,7 +90,7 @@
 //扫描篮筐允许的篮筐状态集合
 var basketAllowProcedure = '<%=Container.CONTAINER_STATUS_FREE%>;<%=Container.CONTAINER_STATUS_WASHLOADING%>;<%=Container.CONTAINER_STATUS_WASHED%>;<%=Container.CONTAINER_STATUS_PACKED%>';
 // 质量监测责任环节数组
-var moduleNameArr = new Array("<%=QualityMonitoring.QUALITYMONITORING_MODULE_NAME_RECYCLING%>","<%=QualityMonitoring.QUALITYMONITORING_MODULE_NAME_WASH%>","<%=QualityMonitoring.QUALITYMONITORING_MODULE_NAME_PACKING%>","<%=QualityMonitoring.QUALITYMONITORING_MODULE_NAME_REVIEW%>","<%=QualityMonitoring.QUALITYMONITORING_MODULE_NAME_STERILIZATION%>","<%=QualityMonitoring.QUALITYMONITORING_MODULE_NAME_INVOICE%>","<%=QualityMonitoring.QUALITYMONITORING_MODULE_NAME_USERECORD%>","<%=QualityMonitoring.QUALITYMONITORING_MODULE_NAME_ROXYDISINFECTION%>");
+var moduleNameArr = new Array("<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_RECYCLING%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_WASH%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_PACKING%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_REVIEW%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_STERILIZATION%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_INVOICE%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_USERECORD%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_ROXYDISINFECTION%>");
 // 外来器械包类型
 var PACKAGE_TYPE_FOREIGN = '<%=TousseDefinition.PACKAGE_TYPE_FOREIGN%>';
 var PACKAGE_TYPE_SPLIT = '<%=TousseDefinition.PACKAGE_TYPE_SPLIT%>';
@@ -195,6 +195,7 @@
 }
 var jobType_wrapper_name = wrapper;
 
+var qmFormType = '<%=FormDefinition.FOMRTYPE_QUALITYMONITORING%>';
 </script>
 <style type="text/css">
 .formItemMgn{
@@ -237,9 +238,8 @@
 <script type="text/javascript" src="${ctx}/dwr/interface/RecyclingApplicationTableManager.js"></script>
 
 <!-- 质量监测 -->
-
-<script type="text/javascript" src="${ctx }/dwr/interface/QualityMonitoringTableManager.js"></script>
-<script type="text/javascript" src="${ctx}/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js"></script>
+<script type="text/javascript" src="${ctx }/dwr/interface/QualityMonitoringInstanceTableManager.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/IDCardDefinitionTableManager.js"></script>
 <!-- 重新打印条码windows -->
 <script type="text/javascript" src="rePrintBarcodeWin.js"></script>