Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r32045 -r32057
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32045)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32057)
@@ -4548,41 +4548,31 @@
  * @param videoType  视频类型
  */
 function takeImgAndVideo(tousseName,tousseDefinitionId,packingTaskId,isLook,imageType,videoType){
-	if(Ext4.chromeVersion < 62){
-	   showResult("请使用62以上版本的chrome浏览器!" , null , sstsConfig.messagePauseTimeOnPackingPage);
-		return ;
-	}
-	var imageIds = null;
-	var videoIds = null;
-	
+	var imageIds = '';
+    var videoIds = '';
+	var packedPhotographed = Ext4.getCmp('hidePackedPhotographed').getValue();
+	var flag = packedPhotographed === "false" ? false : true;
 	if(tousseDefinitionId == "null"){
 		tousseDefinitionId = "";
 	}
-
-	var packedPhotographed = Ext4.getCmp('hidePackedPhotographed').getValue();
-	var flag = packedPhotographed === "false" ? false : true;
-
-	var urls;
-
-	if(videoType == '申请采集视频'){
-		urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName='+ tousseName +'&imageType='+imageType+'&videoType='+videoType+'&objectId='+tousseDefinitionId+'&videoIds='+videoIds+'&imageIds='+imageIds+'&isLook='+isLook;
-	}else {
-		urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName='+ tousseName +'&imageType='+imageType+'&videoType='+videoType+'&packingTaskId='+packingTaskId+'&videoIds='+videoIds+'&imageIds='+imageIds+'&isLook='+isLook;
+	if(videoType !== '申请采集视频'){
+		tousseDefinitionId = packingTaskId;
 	}
-	
-	var videoImgWin = openFullSizeWindowWithName(urls,true,'图片视频拍摄');
-	if(videoImgWin != null ){
-        videoImgWin.focus(); 
-        var loop = setInterval(function() {
-            if(videoImgWin.closed) {
-				clearInterval(loop);
-				if(flag !== videoImgWin.returnValue){
-					//刷新篮筐内物品
-					reloadBasketTreeGrid();
-				}
-            }
-        }, 1000);
+    var params = {
+		tousseDefinitionId: tousseDefinitionId,
+		goodsName:tousseName,
+		isLook: isLook,
+		imageType: imageType,
+		videoType: videoType,
+		imageIds:imageIds,
+		videoIds:videoIds
 	}
+	openCameraPhotoWindow(params,function(returnValue){
+        if(flag !== returnValue){
+			//刷新篮筐内物品
+			reloadBasketTreeGrid();
+		}
+    });
 }
 
 //扫描篮筐条码,装配完成之后重新扫描条码不提示