Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
===================================================================
diff -u -r27182 -r27183
--- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 27182)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 27183)
@@ -1180,12 +1180,10 @@
 			
 			if(videoIdsArry == undefined){
 			  	videoIdsArry = "";
-				
 			}else{
 				videoIdsArry = videoIdsArry.join(",");
 			}		
 			uploadTousseCameraPhoto(tousses[i].id,imageIdsArry,videoIdsArry);
- 
         }
         hideMessageBox4(true);
     }
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
===================================================================
diff -u -r27047 -r27183
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 27047)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 27183)
@@ -1,4 +1,5 @@
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.videomanager.VideoFile" %>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
 <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
@@ -64,6 +65,8 @@
 	var imageTypeCameraPacking = '<%=ImageFile.IMAGE_TYPE_CAMERA_PACKING%>';
 	var imageTypeCameraApplication = '<%=ImageFile.IMAGE_TYPE_CAMERA_APPLICATION%>';
 	var imageTypeTousseInstanceCameraPacking = '<%=ImageFile.IMAGE_TYPE_TOUSSEINSTANCE_CAMERA_PACKING%>';
+	//视频类型(装配采集视频)
+	var videoTypePacking = '<%=VideoFile.VIDEO_TYPE_CAMERA_PACKING%>';
 	
 	var changLong = '<%= DeviceInterface.CHANGLONG %>';
 	var marge = '<%= DeviceInterface.MARGE %>';
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r27182 -r27183
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 27182)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 27183)
@@ -256,7 +256,7 @@
 
 /**
  * 拍照
- * @param tousseName 包定义名称 imageType
+ * @param tousseName 包定义名称 
  * @param tousseDefinitionId 包定义id
  * @param isLook 是查看还是拍摄 true查看 false需要拍摄和上传
  * @param imageType  图片类型
@@ -1100,7 +1100,7 @@
                xtype : 'button',
                id:'btn_cameraPhoto_application',
                name:'btn_cameraPhoto_application',
-               text : '申请采集图片',
+               text : '申请采集图片/视频',
                hidden : !sstsConfig.showCameraPhoto,
                handler : function(){
             	   var imageName = Ext4.getCmp('imageName').getText();
@@ -1112,7 +1112,7 @@
             	   }
                }
            },
-	       {
+	  /*     {
                xtype : 'button',
                id:'btn_cameraPhoto_packing',
                name:'btn_cameraPhoto_packing',
@@ -1126,7 +1126,7 @@
             		   showTousseImages(imageName,td_id,imageTypeCameraPacking);
             	   }
                }
-           },
+           }, */
 	       {
                xtype : 'button',
                id:'btn_packingNote',
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
===================================================================
diff -u -r27064 -r27183
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 27064)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 27183)
@@ -6,7 +6,45 @@
 if(sstsConfig.aliasNameOfInspectorField){
 	inspectorName = sstsConfig.aliasNameOfInspectorField;
 }
+
 /**
+ * 拍照
+ * @param tousseName 包定义名称 imageType
+ * @param tousseDefinitionId 包定义id
+ * @param isLook 是查看还是拍摄 true查看 false需要拍摄和上传
+ * @param imageType  图片类型
+ * @param videoType  视频类型
+ */
+function takeImgAndVideo(tousseName,tousseDefinitionId,isLook,imageType,videoType){
+	if(Ext4.chromeVersion < 62){
+	   showResult("请使用62以上版本的chrome浏览器!" , null , sstsConfig.messagePauseTimeOnPackingPage);
+		return ;
+	}
+	var imageIds = null;
+	var videoIds = null;
+	
+	if(tousseDefinitionId == "null"){
+		tousseDefinitionId = "";
+	}
+	
+	var urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName='+ tousseName +'&imageType='+imageType+'&videoType='+videoType+'&objectId='+tousseDefinitionId+'&videoIds='+videoIds+'&imageIds='+imageIds+'&isLook='+isLook;
+	var winW = 1020;
+	var winH = 600;
+	var tops = (window.screen.availHeight -winH)/2;
+	var lefts = (window.screen.availWidth -winW)/2;
+	if(window.screen.height == 768){
+		lefts = 0;
+		tops = 0;
+	}
+	
+	var style = "resizable=yes,top="+tops+",left="+lefts+",width="+winW+",height="+winH+",status=no,menubar=no,toolbar=no,Scrollbars=no,Location=no,Direction=no,resizable=no";
+	var videoImgWin = window.open(urls,'图片视频拍摄',style);
+	if(videoImgWin != null ){
+	    videoImgWin.focus(); 
+	}
+}
+
+/**
  * 显示器械包实例的追溯信息
  * 
  * @param id			器械包实例id
@@ -844,7 +882,7 @@
                                 id : 'showPackingCameraPhoto',
                                 name : 'showPackingCameraPhoto',
                                 xtype : 'button',
-                                text : '查看拍照图片',
+                                text : '查看拍摄图片/视频',
                                 handler : function (){
                                 	var imageType = imageTypeCameraPacking;
                                 	var objectId = tousseDefinitionId;
@@ -853,7 +891,9 @@
                                 		objectId = id;
                                 		imageType = imageTypeTousseInstanceCameraPacking;
                                 	}
-                                	showTousseImages(tousseName,objectId,imageType);
+									takeImgAndVideo(tousseName,objectId,true,imageType,videoTypePacking);									
+									
+                                	//showTousseImages(tousseName,objectId,imageType);
                                 }
                             }]
                         }]