Index: ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js
===================================================================
diff -u -r27172 -r27178
--- ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js	(.../videoAndImg.js)	(revision 27172)
+++ ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js	(.../videoAndImg.js)	(revision 27178)
@@ -155,7 +155,6 @@
 	}else{//跳转图片		
 		$(that).parent().children(".spotlight")[0].click();
 	}
-
 }
 
 /* 	播放视频
@@ -256,16 +255,16 @@
 function imgAndVideoBtn(){	
 	var winW = 1024;
 	var winH = 666;
-	var tops = (window.screen.availHeight -winH)/2;
-	var lefts = (window.screen.availWidth -winW)/2;
+	var winTop = (window.screen.availHeight -winH)/2;
+	var  winLeft = (window.screen.availWidth -winW)/2;
 	if(window.screen.height == 768){
 		lefts = 0;
 		tops = 0;
 	}
 	// 弹出窗口
 	var pageUrl = WWWROOT + '/disinfectsystem/test/takeVideoAndImg.jsp';
-	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";
-	popwin=window.open(pageUrl,'图片视频拍摄',style);
+	var style = "resizable=yes,top="+winTop+",left="+winLeft+",width="+winW+",height="+winH+",status=no,menubar=no,toolbar=no,Scrollbars=no,Location=no,Direction=no,resizable=no";
+	popwin=window.open(pageUrl,"_blank",'图片视频拍摄',style);
 	if(popwin != null ){
 	  popwin.focus(); 
 	}
@@ -358,28 +357,27 @@
 					}
 				}
 				
-				//科室申领
-				var imageIdsAndGoodsName = $("#iframe_recyclingApplication",window.parent.document).contents().find("#imageIdsAndGoodsName");
-					imageIdsAndGoodsName.val(JSON.stringify(goodsNameImageFile2));
-				var videoIdsAndGoodsName = $("#iframe_recyclingApplication",window.parent.document).contents().find("#videoIdsAndGoodsName");
-					videoIdsAndGoodsName.val(JSON.stringify(goodsNameVideoeFile2));
+				//传给上级页面用做提交的参数
+				if(window.opener.document.getElementById("imageIdsAndGoodsName")){
+					var imageIdsAndGoodsName = window.opener.document.getElementById("imageIdsAndGoodsName");
+					imageIdsAndGoodsName.value = JSON.stringify(goodsNameImageFile2);
+				}				
 				
-				var imageIdsDom = $("#iframe_recyclingApplication",window.parent.document).contents().find("#imageIds");
-					imageIdsDom.val(imageIds);
-				var videoIdsDom = $("#iframe_recyclingApplication",window.parent.document).contents().find("#videoIds");
-					videoIdsDom.val(videoIds);
+				if(window.opener.document.getElementById("videoIdsAndGoodsName")){
+					var videoIdsAndGoodsName = window.opener.document.getElementById("videoIdsAndGoodsName");
+					videoIdsAndGoodsName.value = JSON.stringify(goodsNameVideoeFile2);
+				}
+			
+				if(window.opener.document.getElementById("imageIds")){
+					var imageIdsDom = window.opener.document.getElementById("imageIds");
+					imageIdsDom.value = JSON.stringify(imageIds);
+				}
 				
+				if(window.opener.document.getElementById("videoIds")){
+					var videoIdsDom = window.opener.document.getElementById("videoIds");
+					videoIdsDom.value = JSON.stringify(videoIds);	
+				}
 				
-				//高级视图
-				var imageIdsAndGoodsName2 = $("#iframe_enterpriseView",window.parent.document).contents().find("#mainFrame").contents().find("#imageIdsAndGoodsName");
-					imageIdsAndGoodsName2.val(JSON.stringify(goodsNameImageFile2));
-				var videoIdsAndGoodsName2 = $("#iframe_enterpriseView",window.parent.document).contents().find("#mainFrame").contents().find("#videoIdsAndGoodsName");
-					videoIdsAndGoodsName2.val(JSON.stringify(goodsNameVideoeFile2));
-				
-				var imageIdsDom2 = $("#iframe_enterpriseView",window.parent.document).contents().find("#mainFrame").contents().find("#imageIds");
-					imageIdsDom2.val(imageIds);
-				var videoIdsDom2 = $("#iframe_enterpriseView",window.parent.document).contents().find("#mainFrame").contents().find("#videoIds");
-					videoIdsDom2.val(videoIds);
 				$("#loading").hide();
 				layer.msg(data.message, {icon: 1});
 			}else{
@@ -391,13 +389,19 @@
 }
 
 $(function(){
-	$(".uploading").show();
+	if(isLook == 'true'){//需要拍摄和上传，就显示拍摄按钮和上传按钮
+		$(".uploading").hide();
+		$("#imgVideoBtn").hide();
+	}else{
+		$(".uploading").show();
+	}
+	
 	//加载图片和视频
 	loadingVideoAndImg(imageIdsData,videoIdsData);
 })
 
 /* 页面卸载时，关掉摄像头页面 */
-window.onunload = function () {
+window.onunload = function () {	
 	if(popwin != null) {
 		popwin.close();
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.jsp
===================================================================
diff -u -r27172 -r27178
--- ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.jsp	(.../videoAndImg.jsp)	(revision 27172)
+++ ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.jsp	(.../videoAndImg.jsp)	(revision 27178)
@@ -21,6 +21,7 @@
 	var goodsName = '${param.goodsName}';
 	var imageIds = '${param.imageIds}';
 	var videoIds = '${param.videoIds}';
+	var isLook = '${param.isLook}';
 </script> 
 <script type="text/javascript" src="videoAndImg.js"></script> 
 <style type="text/css">
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r27176 -r27178
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 27176)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 27178)
@@ -908,12 +908,14 @@
  * 拍照
  * @param tousseName 包定义名称
  * @param tousseDefinitionId 包定义id
+ * @param isLook 是查看还是拍摄
  */
-function takeImgAndVideo(tousseName,tousseDefinitionId){
+function takeImgAndVideo(tousseName,tousseDefinitionId,isLook){
 	if(Ext4.chromeVersion < 62){
 	   showResult("请使用62以上版本的chrome浏览器!" , null , sstsConfig.messagePauseTimeOnPackingPage);
 		return ;
 	}
+	
 	var imageIds = document.getElementById("imageIds").value;
 	var videoIds = document.getElementById("videoIds").value;
 	if(imageIds == ""){
@@ -927,7 +929,43 @@
 		tousseDefinitionId = "";
 	}
 	
-	var urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName='+ tousseName +'&imageType='+imageTypeCameraApplication+'&videoType='+videoType+'&objectId='+tousseDefinitionId+'&videoIds='+videoIds+'&imageIds='+imageIds;
+	
+	var urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName='+ tousseName +'&imageType='+imageTypeCameraApplication+'&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(); 
+	}
+
+}
+/* function takeImgAndVideo(tousseName,tousseDefinitionId,isLook){
+	if(Ext4.chromeVersion < 62){
+	   showResult("请使用62以上版本的chrome浏览器!" , null , sstsConfig.messagePauseTimeOnPackingPage);
+		return ;
+	}
+	var imageIds = document.getElementById("imageIds").value;
+	var videoIds = document.getElementById("videoIds").value;
+	if(imageIds == ""){
+		imageIds = null;
+	}
+	
+	if(videoIds == ""){
+		videoIds = null;
+	}
+	if(tousseDefinitionId == "null"){
+		tousseDefinitionId = "";
+	}
+	
+	var urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName='+ tousseName +'&imageType='+imageTypeCameraApplication+'&videoType='+videoType+'&objectId='+tousseDefinitionId+'&videoIds='+videoIds+'&imageIds='+imageIds+'&isLook='+isLook;
 	takeImgAndVideoWin = new top.Ext4.window.Window({
 		id : 'playVideoWin',
 		layout : 'fit',
@@ -941,7 +979,7 @@
 	});
 	
 	takeImgAndVideoWin.show(); 
-}
+} */
 
 //记录每个包名对应的图片id
 //var goodsNameImageFile = {};
@@ -1330,16 +1368,20 @@
 			id : 'commitBtn',
 			hidden:(id != ""),
 			//hidden:(id != "" && ismodify),//点击姓名列的文字链接和点击工具栏的修改按钮，隐藏提交按钮
-			handler : function() {			
-				goodsNameImageFile = document.getElementById("imageIdsAndGoodsName").value;
-				if(goodsNameImageFile != ""){
-					goodsNameImageFile = JSON.parse(goodsNameImageFile);
+			handler : function() {	
+				if(document.getElementById("imageIdsAndGoodsName")){
+					goodsNameImageFile = document.getElementById("imageIdsAndGoodsName").value;
+					if(goodsNameImageFile != ""){
+						goodsNameImageFile = JSON.parse(goodsNameImageFile);
+					}
 				}
 				
-				goodsNameVideoFile = document.getElementById("videoIdsAndGoodsName").value;
-				if(goodsNameVideoFile != ""){
-					goodsNameVideoFile = JSON.parse(goodsNameVideoFile);
-				}
+				if(document.getElementById("videoIdsAndGoodsName").value){
+					goodsNameVideoFile = document.getElementById("videoIdsAndGoodsName").value;
+					if(goodsNameVideoFile != ""){
+						goodsNameVideoFile = JSON.parse(goodsNameVideoFile);
+					}
+				}				
 				checkAndsubmintForeignTousseForm(false);
 			}
 		},{
@@ -1675,7 +1717,7 @@
 					if(id == ""){
 						tousseDefinitionId = null;
 					}
-					btnHtml += "&nbsp;<img src=\""+WWWROOT+"/images/web/photo_16x16.gif\" onclick=\"getCurrentTab().takeImgAndVideo('"+tousseName+"','"+tousseDefinitionId+"')\" >";
+					btnHtml += "&nbsp;<img src=\""+WWWROOT+"/images/web/photo_16x16.gif\" onclick=\"getCurrentTab().takeImgAndVideo('"+tousseName+"','"+tousseDefinitionId+"',false)\" >";
         		}
         		return btnHtml;
         	}
@@ -2518,10 +2560,19 @@
 	}
 
 	foreignTousseApplyWindow.on('close',function(w){
-		document.getElementById("imageIdsAndGoodsName").value = "";
-		document.getElementById("videoIdsAndGoodsName").value = "";
-		document.getElementById("imageIds").value = "";
-		document.getElementById("videoIds").value = "";
+		if(document.getElementById("imageIdsAndGoodsName")){
+			document.getElementById("imageIdsAndGoodsName").value = "";
+		}
+		
+		if(document.getElementById("videoIdsAndGoodsName")){
+			document.getElementById("videoIdsAndGoodsName").value = "";
+		}
+		if(document.getElementById("imageIds")){
+			document.getElementById("imageIds").value = "";
+		}
+		if(document.getElementById("videoIds")){
+			document.getElementById("videoIds").value = "";
+		}
 	});