Index: ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.jsp
===================================================================
diff -u -r40302 -r41116
--- ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.jsp	(.../comboToussePackingView.jsp)	(revision 40302)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.jsp	(.../comboToussePackingView.jsp)	(revision 41116)
@@ -4,7 +4,6 @@
 <%@page import="com.forgon.disinfectsystem.entity.packing.PackingTask"%>
 <%@page import="java.util.Map"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%>
-<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.container.Container"%>
 <%@page import="com.forgon.disinfectsystem.entity.departmentGroupOption.DepartmentGroupOption"%>
 <%@page import="com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError"%>
 <%@page import="com.forgon.disinfectsystem.common.Constants"%>
@@ -13,8 +12,6 @@
 <%@page import="java.util.List"%>
 <%@page import="com.forgon.disinfectsystem.common.*"%>
 <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
-<%@page import="com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition" %>
-<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition" %>
 <%@page import="com.forgon.disinfectsystem.entity.videomonitor.Workstation"%>
 <%@page import="com.forgon.log.model.Log"%>
 
@@ -224,7 +221,6 @@
 var hospitalName = '<%=request.getAttribute("hospitalName")%>';
 var foreignDefaultLabelpaper = '<%=request.getAttribute("foreignDefaultLabelpaper")%>';
 var projectName = '<%=request.getAttribute("projectName")%>';
-var parm_s_type ="质量监测";
 //回收记录
 var taskType_recyclingRecord = '<%=PackingTask.TASK_RECYCLINGRECORD%>';
 //申请单
@@ -233,13 +229,6 @@
 var taskType_returnGoods = '<%=PackingTask.TASK_RETURNGOODS%>';
 //质量监测重新装配
 var taskType_qualityMonitor = '<%=PackingTask.TASK_QUALITY_MONITOR%>';
-//扫描篮筐允许的篮筐状态集合
-var basketAllowProcedure = '<%=Container.CONTAINER_STATUS_FREE%>;<%=Container.CONTAINER_STATUS_WASHLOADING%>;<%=Container.CONTAINER_STATUS_WASHED%>;<%=Container.CONTAINER_STATUS_PACKED%>';
-// 质量监测责任环节数组
-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%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_INFECTIONPART%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_OTHERPART%>");
-// 外来器械包类型
-var PACKAGE_TYPE_FOREIGN = '<%=TousseDefinition.PACKAGE_TYPE_FOREIGN%>';
-var PACKAGE_TYPE_SPLIT = '<%=TousseDefinition.PACKAGE_TYPE_SPLIT%>';
 var ERROR_CODE_SUCCESS = <%=Constants.ERROR_CODE_SUCCESS%>;
 var ERROR_CODE_NOT_FOUND = <%=Constants.ERROR_CODE_NOT_FOUND%>;
 var ERROR_CODE_LOST = <%=Constants.ERROR_CODE_LOST%>;
@@ -291,7 +280,6 @@
 //装配报损
 var LINKTYPE_PACKINGRECORD = '<%=RecyclingDamageItem.LINKTYPE_PACKINGRECORD%>';
 var errorTypeAdd = '<%=RecyclingError.ERRORTYPE_ADD%>';
-var basketAllowProcedure = '<%=Container.CONTAINER_STATUS_WASHED%>;<%=Container.CONTAINER_STATUS_PACKED%>';
 var imageType_tousse = '<%=ImageFile.IMAGE_TYPE_TOUSSE%>';
 var imageType_material = '<%=ImageFile.IMAGE_TYPE_MATERIAL%>';
 var imageType_packingTeaching = '<%=ImageFile.IMAGE_TYPE_TOUSSEPACKING%>';
@@ -357,8 +345,6 @@
 	jobType_review_name = reviewer;
 }
 var jobType_wrapper_name = wrapper;
-
-var qmFormType = '<%=FormDefinition.FOMRTYPE_QUALITYMONITORING%>';
 //教学图片
 var teachingPicture = false;
 if (notInWhiteList(sstsConfig, 'teachingPicture')) {
@@ -415,9 +401,6 @@
  	.script("${ctx}/disinfectsystem/recyclingdamagerecord/damageMaterialAdditionalForm.js")
  	.script("${ctx}/dwr/interface/RecyclingApplicationTableManager.js")
 	
-	<!-- 质量监测 -->
- 	.script("${ctx }/dwr/interface/QualityMonitoringInstanceTableManager.js")
- 	.script("${ctx}/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js")
  	.script("${ctx}/dwr/interface/IDCardDefinitionTableManager.js")
 	<!-- 重新打印条码windows -->
 	.script("rePrintBarcodeWin.js")