Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
===================================================================
diff -u -r24654 -r24777
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 24654)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 24777)
@@ -109,6 +109,7 @@
 <script type="text/javascript" src="${ctx}/dwr/engine.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/util.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/showTousseImage/ext4ShowTousseImage.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/common/camera.js"></script>
 
 <!-- 日期控件引入 -->
 <link rel="stylesheet" type="text/css" href="${ctx }/ext/ext_datefield/datetime.css"></link>
Index: ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js
===================================================================
diff -u -r22268 -r24777
--- ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js	(.../ext4ShowTousseImage.js)	(revision 22268)
+++ ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js	(.../ext4ShowTousseImage.js)	(revision 24777)
@@ -1,5 +1,5 @@
 //展示器械包信息
-function getAndShowTousseInfoDiv(tousseName,tousseDefinitionId) {
+function getAndShowTousseInfoDiv(tousseName,tousseDefinitionId , imageType) {
 	var objectId = tousseDefinitionId;
 	var objectName = tousseName;
 	var curPage = 0;
@@ -8,6 +8,9 @@
 	var IMAGE_TYPE_MATERIAL = "材料图片";
 	var IMAGE_TYPE_SPECIFICATION = "器械包说明书";
 	var curImageType = IMAGE_TYPE_TOUSSE;
+	if(imageType){
+		curImageType = imageType;
+	}
 	
 	var toolbarPage = new top.Ext4.Toolbar.TextItem({
 		text : '第0页'
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java
===================================================================
diff -u -r24077 -r24777
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java	(.../ShowImageAction.java)	(revision 24077)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java	(.../ShowImageAction.java)	(revision 24777)
@@ -330,6 +330,10 @@
 				|| StringTools.equals(ImageFile.IMAGE_TYPE_TOUSSEPACKING,imageType)){
 			TousseDefinition tousseDefinition = getTousseDefinition(parameters);
 			objectId = getObjectId(tousseDefinition);
+		}else if(StringTools.equals(ImageFile.IMAGE_TYPE_CAMERA,imageType)){
+			//如果为采集图片,则取当前包定义的图片
+			TousseDefinition tousseDefinition = getTousseDefinition(parameters);
+			objectId = tousseDefinition.getId();
 		}else if(StringTools.equals(ImageFile.IMAGE_TYPE_MATERIAL, imageType)
 					||StringTools.equals(ImageFile.IMAGE_TYPE_MATERIAL_DETACHABLE, imageType)
 					||StringTools.equals(ImageFile.IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD, imageType)
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r24774 -r24777
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 24774)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 24777)
@@ -786,6 +786,24 @@
 }
 
 /**
+ * 拍照
+ * @param tousseDefinitionId 包定义id
+ */
+function takePhone(tousseDefinitionId){
+	if(Ext4.chromeVersion < 62){
+		   showResult("请使用62以上版本的chrome浏览器!" , null , sstsConfig.messagePauseTimeOnPackingPage);
+			return ;
+	   }
+	    // 弹出窗口
+	   var pageUrl = WWWROOT + '/disinfectsystem/test/video.jsp?objectId='+tousseDefinitionId;
+	   var style="menubar=no,location=no,directories=no,toolbar=no,statusbar=no,resizable=no,"+getCenterWindowPos(1920,1080)+",scrollbars=no";
+	   var popwin=window.open(pageUrl,'图片采集',style);
+	   if(popwin != null ){
+	       popwin.focus(); 
+	   }
+}
+
+/**
  * 打开外来器械包申请单的窗口.
  * @param id		外来器械包申请单
  * @param formType	操作类型
@@ -1332,7 +1350,7 @@
         }
     },{
     	header: '数量',
-    	width : 50,
+    	width : 40,
     	align:'center',
         sortable: true,
         dataIndex : 'amount',
@@ -1349,7 +1367,7 @@
         }
     },{
     	header: '单价',
-    	width : 60,
+    	width : 40,
     	align:'center',
         sortable: true,
         dataIndex: 'price',
@@ -1463,7 +1481,7 @@
 		hidden : true
 	},{
     	header: '图片',
-    	width : 50,
+    	width : 80,
     	align:'center',
         sortable: true,
         dataIndex: 'type',
@@ -1472,11 +1490,16 @@
         	var tousseName = record.get('tousseName');
         	var tousseDefinitionId = record.get('tousseDefinitionId');
         	if(!isLeaf){
-        		return "<img src=\""+WWWROOT+"/images/web/image_.gif\" onclick=\"getCurrentTab().getAndShowTousseInfoDiv('"+tousseName+"','"+tousseDefinitionId+"')\" >";
+        		var btnHtml = "<img src=\""+WWWROOT+"/images/web/image_.gif\" onclick=\"getCurrentTab().getAndShowTousseInfoDiv('"+tousseName+"','"+tousseDefinitionId+"')\" >";
+        		if(sstsConfig.showCameraPhoto){
+        			btnHtml += "&nbsp;<img src=\""+WWWROOT+"/images/web/photo_16x16.gif\" onclick=\"getCurrentTab().getAndShowTousseInfoDiv('"+tousseName+"','"+tousseDefinitionId+"','采集图片')\" >";
+        			btnHtml += "&nbsp;<img src=\""+WWWROOT+"/images/web/photo.png\" onclick=\"getCurrentTab().takePhone('"+tousseDefinitionId+"')\" >";
+        		}
+        		return btnHtml;
         	}
         }
     }];
-	
+
 	//foreignTousseTreeGrid的store
 	foreignTousseStore = new Ext4.data.TreeStore({
 	    model: foreignTousseItemModel,