Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r28391 -r28417
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 28391)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 28417)
@@ -665,7 +665,8 @@
 		var tousseName = idCardTaskNode.get('tousseName');
 		var vedioName = idCardTaskNode.get('uuid_vedioNames');
 		var td_id = idCardTaskNode.get('tousseID');
-		loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id);
+		var isTraceable = idCardTaskNode.get('isTraceable');
+		loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id,isTraceable);
 		lastSelectTousseName = tousseName;
 		lastSelectimageTypeTousse = imageType_tousse;
 		lastSelectVedioName = vedioName;
@@ -1173,19 +1174,23 @@
 	       {xtype:'hidden',id:'currentPage'},
 	       {xtype:'hidden',id:'materialId'},
 	       {xtype:'hidden',id:'vedioName'},
-	       {xtype:'hidden',id:'td_id'},
+		   {xtype:'hidden',id:'td_id'},
+		   {xtype:'hidden',id:'isTraceable'},
+		   {xtype:'hidden',id:'hideTousseName'},
 	       '->',
 	       {
                xtype : 'button',
                id:'btn_cameraCapture',
                name:'btn_cameraCapture',
                text : '拍摄',
-               hidden : !sstsConfig.showCameraPhoto,
+               hidden : sstsConfig.showCameraPhoto,
                handler : function(){
-            	   /* if(Ext4.chromeVersion < 62){
-            		   showResult("请使用62以上版本的chrome浏览器!" , null , sstsConfig.messagePauseTimeOnPackingPage);
-          				return ;
-            	   } */
+					var isTraceable = Ext4.getCmp('isTraceable').getValue();
+					var hideTousseName = Ext4.getCmp('hideTousseName').getValue();
+					if(isTraceable == '否'){
+						showResult('【'+hideTousseName+'】是不追溯的物品，不支持采集图像/视频');
+						return;
+					}
 				    var imageName = Ext4.getCmp('imageName').getText();
             	    var td_id = Ext4.getCmp('td_id').getValue();
 					if(isUndefinedOrNullOrEmpty(td_id)){
@@ -1194,13 +1199,6 @@
 	        		}
 					
 					takeImgAndVideo(imageName,td_id,false,imageTypeCameraPacking,videoTypePacking);
-            	    // 弹出窗口
-            	/*   var pageUrl = WWWROOT + '/disinfectsystem/test/video.jsp?objectId='+td_id+'&imageType=' + imageTypeCameraPacking;
-            	   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(); 
-            	   } */
                }
            },
 	       {
@@ -2258,10 +2256,11 @@
     panel.add(newImage);
 }
 
-function loadTousseInfo(tousseName,type,vedioName,td_id){
+function loadTousseInfo(tousseName,type,vedioName,td_id,isTraceable){
 	loadGoodsImage(tousseName,type,'',1,vedioName,td_id);
     materialStore.load({params: {tousseName:tousseName,tousseDefinitionId:td_id}});
-    
+	Ext4.getCmp('isTraceable').setValue(isTraceable);
+	Ext4.getCmp('hideTousseName').setValue(tousseName);
     showTousseImgBtns();
 }
 
@@ -4056,7 +4055,7 @@
        		var vedioName = record.get('uuid_vedioNames');
        		var td_id = record.get('tousseID');
        		updateNoteWindow(record);
-       		loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id);
+       		loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id,isTraceable);
        		lastSelectTousseName = tousseName;
     		lastSelectimageTypeTousse = imageType_tousse;
     		lastSelectVedioName = vedioName;
@@ -4408,6 +4407,7 @@
 	listeners:{
 		// cellclick事件改为select事件，便于selenium进行测试
 		itemClick : function( thiz, record, index, eOpts ){
+			var isTraceable = record.get('isTraceable');
        		var tousseName = record.get('tousseName');
        		var sterilingMethod = record.get('sterilingMethod');
        		var packageType = record.get('packageType');
@@ -4417,8 +4417,7 @@
        	    var vedioName = record.get('uuid_vedioNames');
             var td_id = record.get('tousseID');
             updateNoteWindow(record);
-			
-       		loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id);
+       		loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id,isTraceable);
        		lastSelectTousseName = tousseName;
     		lastSelectimageTypeTousse = imageType_tousse;
     		lastSelectVedioName = vedioName;
Index: ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.js
===================================================================
diff -u -r28147 -r28417
--- ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.js	(.../takeVideoAndImg.js)	(revision 28147)
+++ ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.js	(.../takeVideoAndImg.js)	(revision 28417)
@@ -257,12 +257,12 @@
 
 				setTime('start');
 
-				//超过5分钟就停止录制
+				//超过30分钟就停止录制
 				var startDate = new Date();
-				//2. 获取当前分钟
+				//2. 获取当前分钟30
 				var min = startDate.getMinutes();
-				//3. 设置当前时间+5分钟：把当前分钟数+5后的值重新设置为date对象的分钟数
-				startDate.setMinutes(min + 5);
+				//3. 设置当前时间+30分钟：把当前分钟数+30后的值重新设置为date对象的分钟数
+				startDate.setMinutes(min + 30);
 				var addFiveMinutes = startDate.getTime();
 
 				times = setInterval(function () {
@@ -279,7 +279,7 @@
 
 						$("#cameraBtn").removeClass("stop");
 						$("#cameraBtn").addClass("on");
-						layer.msg("录制成功,视频录制不能超过5分钟!", { icon: 7 });
+						layer.msg("录制成功,视频录制不能超过30分钟!", { icon: 7 });
 						$("#canvas").removeClass("animate-bounce-up");
 						$("#canvas").hide(0).slideDown("normal");
 						$("#canvas").addClass("animate-bounce-up");
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
===================================================================
diff -u -r28348 -r28417
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 28348)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 28417)
@@ -14,6 +14,8 @@
 	reviewViewText = "审核";
 }
 
+var isTraceable = false;
+
 /**
  * 拍照
  * @param tousseName 包定义名称 imageType
@@ -77,6 +79,7 @@
 			success:	function(result){
 							var resultStr = Ext.decode(result.responseText);
 							var data = resultStr.data
+							
 	        				if(data.deviceBrand == changLong){
 	        					openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataGridChart.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600');
 							}else if (data.deviceBrand == marge){
@@ -875,7 +878,8 @@
 						}, {
                             layout : 'form',
                             columnWidth : .5,
-                            hidden: (!sstsConfig.showCameraPhoto || !tousseDefinitionId || (tousseType != '外来器械包' && tousseType != '外来器械拆分小包')),//如果为外来器械包或外来器械拆分小包才显示
+							hidden: !isTraceable,
+							id : 'showPackingCameraPhotoLabel',
                             items : [{
                                 id : 'showPackingCameraPhoto',
                                 name : 'showPackingCameraPhoto',
@@ -2017,6 +2021,12 @@
 			success : function(response, options) {
 				var result = Ext.decode(response.responseText);
 				if (result && result.success) {
+					isTraceable = (result.tousseInstance.tousseDefinition.isTraceable == '是')?true:false;
+					if(isTraceable){
+						Ext.getCmp('showPackingCameraPhotoLabel').show();
+					}else {
+						Ext.getCmp('showPackingCameraPhotoLabel').hide();
+					}
 					var instance = result.tousseInstance;
 					if (isComboTousse) {  //聚合包
 						Ext.Ajax.request({