Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp =================================================================== diff -u -r27182 -r27527 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 27182) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 27527) @@ -277,6 +277,11 @@ var foreignDefaultLabelpaper = '<%=request.getAttribute("foreignDefaultLabelpaper")%>'; var projectName = '<%=request.getAttribute("projectName")%>'; var parm_s_type ="质量监测"; +var routineMonitoring_type ="定期监测"; +var formType_routineMonitoring = '<%=FormDefinition.FOMRTYPE_PERIODICMONITORING%>'; +var formType_qualityMonitoring = '<%=FormDefinition.FOMRTYPE_QUALITYMONITORING%>'; +var moduleNameArr2 = 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 taskType_recyclingRecord = '<%=PackingTask.TASK_RECYCLINGRECORD%>'; //申请单 @@ -336,6 +341,11 @@ SSTS_SystemWarning_TousseGoods_delete = false; +var SSTS_RoutineMonitoring_Create = true; + +SSTS_RoutineMonitoring_Create = false; + + //回收报损 var LINKTYPE_RECYCLINGRECORD = '<%=RecyclingDamageItem.LINKTYPE_RECYCLINGRECORD%>'; //清洗报损 @@ -429,6 +439,7 @@ var jobType_wrapper_name = wrapper; var qmFormType = '<%=FormDefinition.FOMRTYPE_QUALITYMONITORING%>'; +var formType_routineMonitoring = '<%=FormDefinition.FOMRTYPE_PERIODICMONITORING%>'; //教学图片 var teachingPicture = false; if (notInWhiteList(sstsConfig, 'teachingPicture')) { @@ -493,6 +504,10 @@ .script("${ctx }/dwr/interface/QualityMonitoringInstanceTableManager.js") .script("${ctx}/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js") .script("${ctx}/dwr/interface/IDCardDefinitionTableManager.js") + + + .script("${ctx}/disinfectsystem/routineMonitoring/routineMonitoringForm.js") + .script("rePrintBarcodeWin.js")