Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r31928 -r32057
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 31928)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 32057)
@@ -4214,4 +4214,56 @@
             select_TypeGridStore.add(record);
         }
     };
+}
+
+// 获取谷歌浏览器版本
+function getChromeVersion() {
+    var arr = navigator.userAgent.split(' '); 
+    var chromeVersion = '';
+    for(var i=0;i < arr.length;i++){
+        if(/chrome/i.test(arr[i]))
+        chromeVersion = arr[i]
+    }
+    if(chromeVersion){
+        return Number(chromeVersion.split('/')[1].split('.')[0]);
+    } else {
+        return false;
+    }
+}
+
+//FSSDERMYY-13：打开拍摄功能
+function openCameraPhotoWindow(params, callback) {
+	var version = getChromeVersion();
+	if (version < 62) {
+		showResult("请使用62以上版本的chrome浏览器!", null, sstsConfig.messagePauseTimeOnPackingPage);
+		return;
+	}
+
+	var tousseDefinitionId = params.tousseDefinitionId || '';
+	var isLook = params.isLook;
+	var imageIds = params.imageIds || '';
+	var videoIds = params.videoIds || '';
+	var imageType = params.imageType || '';
+	var videoType = params.videoType || '';
+	var goodsName = params.goodsName || '';
+	var urls;
+	if (videoType == '申请采集视频') {
+		urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName=' + goodsName + '&imageType=' + imageType + '&videoType=' + videoType + '&objectId=' + tousseDefinitionId + '&videoIds=' + videoIds + '&imageIds=' + imageIds + '&isLook=' + isLook;
+	} else {
+		urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName=' + goodsName + '&imageType=' + imageType + '&videoType=' + videoType + '&packingTaskId=' + tousseDefinitionId + '&videoIds=' + videoIds + '&imageIds=' + imageIds + '&isLook=' + isLook;
+	}
+	var videoImgWin = openFullSizeWindowWithName(urls, true, '图片视频拍摄');
+	if (videoImgWin != null) {
+		videoImgWin.focus();
+		var loop = setInterval(function () {
+			if (videoImgWin.closed) {
+				clearInterval(loop);
+				videoImgWin.focus();
+				var returnValue = videoImgWin.returnValue;
+				if (callback) {
+					callback(returnValue)
+				}
+			}
+		}, 1000);
+	}
 }
\ No newline at end of file