Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r37113 -r37469 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 37113) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 37469) @@ -4271,12 +4271,14 @@ isShowDeleteButton = false; } - if(action.result.data.reviewStatus == '待审核' && SSTS_ForeignTousseApplication_Review){ - top.Ext4.getCmp('reviewBtn').show(); - }else { - top.Ext4.getCmp('reviewBtn').hide(); - if(action.result.data.reviewStatus == '已否决'){ - top.Ext4.getCmp('reviewStatus').bodyEl.dom.childNodes[0].style.color = 'red'; + if(top.Ext4.getCmp('reviewBtn') && top.Ext4.getCmp('reviewStatus')){ + if(action.result.data.reviewStatus == '待审核' && SSTS_ForeignTousseApplication_Review){ + top.Ext4.getCmp('reviewBtn').show(); + }else { + top.Ext4.getCmp('reviewBtn').hide(); + if(action.result.data.reviewStatus == '已否决'){ + top.Ext4.getCmp('reviewStatus').bodyEl.dom.childNodes[0].style.color = 'red'; + } } } Index: ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp =================================================================== diff -u -r36618 -r37469 --- ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp (.../historyPackingView.jsp) (revision 36618) +++ ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp (.../historyPackingView.jsp) (revision 37469) @@ -3,6 +3,7 @@ <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition" %> <%@page import="com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication"%> <%@page import="com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinition"%> +<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%> <%@page import="com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition" %> <%@ page contentType="text/html; charset=UTF-8"%> <%@ include file="/common/taglibs.jsp"%> @@ -95,6 +96,9 @@ var ACTION_TYPE_CONFIRM_RETURN = '<%=ForeignTousseApplication.ACTION_TYPE_CONFIRM_RETURN%>'; //确认归还 var ACTION_TYPE_EARLY_RETURN = '<%=ForeignTousseApplication.ACTION_TYPE_EARLY_RETURN%>'; //提前归还 +var ACTION_TYPE_ADD = '<%=ForeignTousseApplication.ACTION_TYPE_ADD%>'; //新增 +var ACTION_TYPE_INTERFERE = '<%=ForeignTousseApplication.ACTION_TYPE_INTERFERE%>'; //干预 +var ACTION_TYPE_UPDATE = '<%=ForeignTousseApplication.ACTION_TYPE_UPDATE%>'; //修改 //显示加急级别和加急数量 var SSTS_ShowUrgentLevelAndUrgentAmount = false; @@ -115,7 +119,9 @@ var parm_s_type ="质量监测"; var qmFormType = '<%=FormDefinition.FOMRTYPE_QUALITYMONITORING%>'; 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 imageTypeCameraApplication = '<%=ImageFile.IMAGE_TYPE_CAMERA_APPLICATION%>'; + var IMAGE_TYPE_TOUSSE = '<%=ImageFile.IMAGE_TYPE_TOUSSE %>';//器械包图片,查看图片用的参数 SSTS_ProxyDisinfection_Update = false;