Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
===================================================================
diff -u -r29221 -r29404
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 29221)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 29404)
@@ -161,6 +161,9 @@
 						layout : 'column',
 						autoHeight : true,
 						items : [{
+							xtype:'hidden',
+							id:'takeoverId'
+						},{
 							layout : 'form',
 							columnWidth : .5,
 							cls:'edit-part2-labelwidth',
@@ -200,6 +203,23 @@
 								allowBlank : true,
 								anchor : '100%'
 							}]
+						},{
+							layout : 'form',
+                            columnWidth : .5,
+							id : 'showPackingCameraPhotoLabel1',
+                            items : [{
+                                id : 'showPackingCameraPhoto1',
+                                name : 'showPackingCameraPhoto1',
+                                xtype : 'button',
+                                text : '查看拍摄图片/视频',
+                                handler : function (){
+                                	var imageType = imageTypeCameraApplication;
+                                	var objectId = top.Ext.getCmp('takeoverId').getValue();
+									takeImgAndVideo(tousseName,objectId,true,imageType,videoTypeApplication);									
+									
+                                	//showTousseImages(tousseName,objectId,imageType);
+                                }
+                            }]
 						}]
 					}],
 					buttons : [this.cancelButton]
@@ -2128,14 +2148,15 @@
 						});
 					} else {
 						// 预回收记录
-						var tousseTransitionRecordInfo = result.tousseTransitionRecord;
+						var tousseTransitionRecordInfo = result.invoicePlanJSON;
 						if(tousseTransitionRecordInfo){
-							if(tousseTransitionRecordInfo.transitionTime != null){
-								var transitionTime = Ext.util.Format.date(new Date(tousseTransitionRecordInfo.transitionTime.time),'Y-m-d H:i:s');
-								top.Ext.getCmp('transitionTime').setValue(transitionTime);  //预回收记录_预回收时间
+							if(tousseTransitionRecordInfo.prepareRecycleDateTime != null){
+								//var transitionTime = Ext.util.Format.date(new Date(tousseTransitionRecordInfo.transitionTime.time),'Y-m-d H:i:s');
+								top.Ext.getCmp('transitionTime').setValue(tousseTransitionRecordInfo.prepareRecycleDateTime);  //预回收记录_预回收时间
 							}
-							top.Ext.getCmp('takeover').setValue(tousseTransitionRecordInfo.takeover);  //预回收记录_预回收人
-							top.Ext.getCmp('handover').setValue(tousseTransitionRecordInfo.handover);  //预回收记录_临床科室确认人
+							top.Ext.getCmp('takeoverId').setValue(tousseTransitionRecordInfo.tousseItemId);  //预回收记录_预回收人ID
+							top.Ext.getCmp('takeover').setValue(tousseTransitionRecordInfo.prepareRecycleOperator);  //预回收记录_预回收人
+							top.Ext.getCmp('handover').setValue(tousseTransitionRecordInfo.prepareRecycleComfirmor);  //预回收记录_临床科室确认人
 						}
 						
 						//申请记录
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
===================================================================
diff -u -r27183 -r29404
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 27183)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 29404)
@@ -64,9 +64,11 @@
 	
 	var imageTypeCameraPacking = '<%=ImageFile.IMAGE_TYPE_CAMERA_PACKING%>';
 	var imageTypeCameraApplication = '<%=ImageFile.IMAGE_TYPE_CAMERA_APPLICATION%>';
-	var imageTypeTousseInstanceCameraPacking = '<%=ImageFile.IMAGE_TYPE_TOUSSEINSTANCE_CAMERA_PACKING%>';
+    var imageTypeTousseInstanceCameraPacking = '<%=ImageFile.IMAGE_TYPE_TOUSSEINSTANCE_CAMERA_PACKING%>';
 	//视频类型(装配采集视频)
-	var videoTypePacking = '<%=VideoFile.VIDEO_TYPE_CAMERA_PACKING%>';
+    var videoTypePacking = '<%=VideoFile.VIDEO_TYPE_CAMERA_PACKING%>';
+    //视频类型(申请采集视频)
+    var videoTypeApplication = '<%=VideoFile.VIDEO_TYPE_CAMERA_APPLICATION%>';
 	
 	var changLong = '<%= DeviceInterface.CHANGLONG %>';
 	var marge = '<%= DeviceInterface.MARGE %>';