Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r32059 -r32113
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 32059)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 32113)
@@ -4247,12 +4247,20 @@
 	var imageType = params.imageType || '';
 	var videoType = params.videoType || '';
 	var goodsName = params.goodsName || '';
+    var barcode = params.barcode || '';
+    var tousseItemId = params.tousseItemId || '';
+    var tousseId = params.tousseId || '';
+    var invoicePlanId = params.invoicePlanId || '';
+    var imgType = params.imgType || '';
 	var urls;
-	if (videoType == '申请采集视频') {
-		urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName=' + goodsName + '&imageType=' + imageType + '&videoType=' + videoType + '&objectId=' + tousseDefinitionId + '&videoIds=' + videoIds + '&imageIds=' + imageIds + '&isLook=' + isLook;
+	if (imgType == 2) {
+        urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName=' + goodsName + '&imageType=' + imageType + '&videoType=' + videoType + '&packingTaskId=' + tousseDefinitionId + '&videoIds=' + videoIds + '&imageIds=' + imageIds + '&isLook=' + isLook + '&barcode=' + barcode;
 	} else {
-		urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName=' + goodsName + '&imageType=' + imageType + '&videoType=' + videoType + '&packingTaskId=' + tousseDefinitionId + '&videoIds=' + videoIds + '&imageIds=' + imageIds + '&isLook=' + isLook;
+		urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName=' + goodsName + '&imageType=' + imageType + '&videoType=' + videoType + '&objectId=' + tousseDefinitionId + '&videoIds=' + videoIds + '&imageIds=' + imageIds + '&isLook=' + isLook + '&barcode=' + barcode;
 	}
+    if(tousseItemId !== '' || tousseId !== ''){
+        urls += '&tousseItemId=' + tousseItemId + '&tousseId=' + tousseId + '&invoicePlanId=' + invoicePlanId;
+    }
 	var videoImgWin = openFullSizeWindowWithName(urls, true, '图片视频拍摄');
 	if (videoImgWin != null) {
 		videoImgWin.focus();
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r32057 -r32113
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32057)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32113)
@@ -4555,8 +4555,10 @@
 	if(tousseDefinitionId == "null"){
 		tousseDefinitionId = "";
 	}
+	var imgType = '';
 	if(videoType !== '申请采集视频'){
 		tousseDefinitionId = packingTaskId;
+		imgType = 2;
 	}
     var params = {
 		tousseDefinitionId: tousseDefinitionId,
@@ -4565,7 +4567,8 @@
 		imageType: imageType,
 		videoType: videoType,
 		imageIds:imageIds,
-		videoIds:videoIds
+		videoIds:videoIds,
+		imgType:imgType
 	}
 	openCameraPhotoWindow(params,function(returnValue){
         if(flag !== returnValue){