Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r40441 -r40442 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 40441) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 40442) @@ -1734,6 +1734,10 @@ var tousseType = record.json.tousseType; var tousseDefinitionId = record.json.tousseDefinitionId; var barcode = record.json.supplierName; + var isSplit = record.json.isSplit; + if(record.json.tousseType == '外来器械包' && isSplit == true){ + tousseType = '外来器械拆分小包'; + } var html = "" + barcode + ""; return html; }}, Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp =================================================================== diff -u -r39836 -r40442 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 39836) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 40442) @@ -542,8 +542,12 @@ var mouseHoverEventOfApply = '${mouseHoverEventOfApply}'; //图片类型(申请采集图片) +var imageTypeCameraPacking = '<%=ImageFile.IMAGE_TYPE_CAMERA_PACKING%>'; +var imageTypeTousseInstanceCameraPacking = '<%=ImageFile.IMAGE_TYPE_TOUSSEINSTANCE_CAMERA_PACKING%>'; var imageTypeCameraApplication = '<%=ImageFile.IMAGE_TYPE_CAMERA_APPLICATION%>'; -//视频类型(申请采集视频) +var IMAGE_TYPE_TOUSSE = '<%=ImageFile.IMAGE_TYPE_TOUSSE %>';//器械包图片,查看图片用的参数 +//视频类型(装配采集视频) +var videoTypePacking = '<%=VideoFile.VIDEO_TYPE_CAMERA_PACKING%>'; var videoType = '<%=VideoFile.VIDEO_TYPE_CAMERA_APPLICATION%>'; var isEnableTousseOpDestLocation = '<%=isEnableTousseOpDestLocation%>'; var isEnableTousseOpRecipient = '<%=isEnableTousseOpRecipient%>'; Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js =================================================================== diff -u -r40302 -r40442 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 40302) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 40442) @@ -48,13 +48,13 @@ } function showOrHideForBox(id, isShow) { - if (top.Ext.getCmp(id) && top.Ext.getCmp(id).setValue) { + if (top.Ext.getCmp(id)) { if (isShow) { top.Ext.getCmp(id).show(); } else { top.Ext.getCmp(id).hide(); } - } else if (top.Ext4.getCmp(id) && top.Ext4.getCmp(id).setValue) { + } else if (top.Ext4.getCmp(id)) { if (isShow) { top.Ext4.getCmp(id).show(); } else {