Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r24079 -r24769
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 24079)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 24769)
@@ -140,6 +140,7 @@
 <script type="text/javascript" src="${ctx}/js/extUtils.js" /></script>
 <script type="text/javascript" src="${ctx}/js/mapObject.js" /></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/common/cssdUtils.js" /></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/common/camera.js" /></script>
 <script type="text/javascript" src="${ctx}/dwr/engine.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/util.js"></script>
 
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r24317 -r24769
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 24317)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 24769)
@@ -959,6 +959,44 @@
 	       '->',
 	       {
                xtype : 'button',
+               id:'btn_cameraCapture',
+               name:'btn_cameraCapture',
+               text : '拍摄',
+               hidden : !sstsConfig.showCameraPhoto,
+               handler : function(){
+            	   var td_id = Ext4.getCmp('td_id').getValue();
+            	   if(isUndefinedOrNullOrEmpty(td_id)){
+           				showResult("请选择装配任务" , null , sstsConfig.messagePauseTimeOnPackingPage);
+           				return ;
+	        		}else{
+//	        			showToussePackingNote(td_id);
+	        		}
+            	    // 弹出窗口
+            	   var pageUrl = WWWROOT + '/disinfectsystem/test/video.jsp?objectId='+td_id;
+            	   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(); 
+            	   }
+               }
+           },
+	       {
+               xtype : 'button',
+               id:'btn_cameraPhoto',
+               name:'btn_cameraPhoto',
+               text : '采集图片',
+               hidden : !sstsConfig.showCameraPhoto,
+               handler : function(){
+            	   var imageName = Ext4.getCmp('imageName').getText();
+            	   var materialId = Ext4.getCmp('materialId').getValue();
+            	   if(imageName != "" && materialId == ""){
+            		   var td_id = Ext4.getCmp('td_id').getValue();
+            		   showTousseImages(imageName,td_id,'采集图片');
+            	   }
+               }
+           },
+	       {
+               xtype : 'button',
                id:'btn_packingNote',
                name:'btn_packingNote',
                text : '配包注意事项',
@@ -1855,6 +1893,16 @@
 		},
 		{
 			xtype:'button',
+			id :"packingLableBtn",
+			margin:'0 0 0 10',
+//			hidden: !sstsConfig.showPackingGoodsBtn,
+			text:'拍摄',
+			handler : function() {
+				
+			}
+		},
+		{
+			xtype:'button',
 			id :"lostBtn",
 			margin:'0 0 0 10',
 			hidden: true,