Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r41022 -r41116
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 41022)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 41116)
@@ -19,7 +19,6 @@
 <%@page import="com.forgon.disinfectsystem.common.*"%>
 <%@page import="com.forgon.systemsetting.model.HttpOption"%>
 <%@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.foreigntousseapplication.ForeignTousseApplication"%>
 <%@page import="com.forgon.disinfectsystem.entity.materialerrordamage.MaterialErrorDamageDetail" %>
@@ -254,6 +253,7 @@
 <script type="text/javascript" src="${ctx}/js/configUtils.js?version=${svnRevision}"></script>
 
 <script type="text/javascript" src="${ctx}/js/common.js" ></script>
+<script type="text/javascript" src="${ctx}/js/commonUtils.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/dateFormatAndCheck.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/extUtils.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/mapObject.js?version=${svnRevision}"></script>
@@ -409,7 +409,6 @@
 var foreignDefaultLabelpaper = '<%=request.getAttribute("foreignDefaultLabelpaper")%>';
 var projectName = '<%=request.getAttribute("projectName")%>';
 var fontSize = '<%=request.getAttribute("fontSize")%>';
-var parm_s_type ="质量监测";
 //回收记录
 var taskType_recyclingRecord = '<%=PackingTask.TASK_RECYCLINGRECORD%>';
 //申请单
@@ -418,10 +417,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%>';
@@ -600,7 +595,6 @@
 if(packingPageSterileUserDefaultLastSterileUser != false){
 	jobType_sterile_name = sterileUserName;
 }
-var qmFormType = '<%=FormDefinition.FOMRTYPE_QUALITYMONITORING%>';
 //教学图片
 var teachingPicture = false;
 if (notInWhiteList(sstsConfig, 'teachingPicture')) {
@@ -671,10 +665,6 @@
 	<!-- 添加丢失器械 -->
 	.script("recyclingLostRecordForm.js")
 	
-	<!-- 质量监测 -->
-	.script("${ctx }/dwr/interface/QualityMonitoringInstanceTableManager.js")
-	.script("${ctx }/disinfectsystem/qualitymonitoring/loadScanBarcodeMsg.js")
- 	.script("${ctx}/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js")
 	 .script("${ctx}/dwr/interface/IDCardDefinitionTableManager.js")
 	<!-- 重新打印条码windows -->
 	.script("rePrintBarcodeWin.js")