Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js
===================================================================
diff -u -r32156 -r32861
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js	(.../foreignProxyDisinfectionForm.js)	(revision 32156)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js	(.../foreignProxyDisinfectionForm.js)	(revision 32861)
@@ -125,10 +125,14 @@
 		if(record.raw.showCameraPhoto && SSTS_ShowCameraPhotoAndVideo){
 			newV += '<span><img onclick="getCurrentTab().openPhotos('+tousseItemId+','+tousseId+');" style="width: 14px;margin-right:5px;cursor: pointer;vertical-align:middle;" src="' + WWWROOT + '/images/web/photo_16x16.gif" /></span>';
 		}
-		newV += "<span style=\"color:green;\" onclick=\"getCurrentTab().getAndShowTousseInfoDiv('" + v + "')\" class=\"linkstyle\">" + v + "</span>";
+		var id = record.raw.tousseDefinitionID;
+		var tousseType = record.raw.tousseType + '图片';
+		newV += "<span style=\"color:green;\" onclick=\"getCurrentTab().getAndShowTousseInfoDiv('" + v + "','" + id + "','" + tousseType + "',1)\" class=\"linkstyle\">" + v + "</span>";
 		return newV;
 	}else {
-		newV += "<span style=\"color:green;\" onclick=\"getCurrentTab().getAndShowTousseInfoDiv('" + v + "')\" class=\"linkstyle\">" + v + "</span>";
+		var id = record.data.tousseDefinitionID;
+		var tousseType = record.data.tousseType + '图片';
+		newV += "<span style=\"color:green;\" onclick=\"getCurrentTab().getAndShowTousseInfoDiv('" + v + "','" + id + "','" + tousseType + "',1)\" class=\"linkstyle\">" + v + "</span>";
 		return newV;
 	}
 }
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp
===================================================================
diff -u -r32829 -r32861
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp	(.../diposableGoodsView.jsp)	(revision 32829)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp	(.../diposableGoodsView.jsp)	(revision 32861)
@@ -63,6 +63,9 @@
     <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0></embed>
 </object>
 
+<input type="hidden" id="imageIds" value="" name="imageIds"/>
+<input type="hidden" id="videoIds" value="" name="videoIds"/>
+
 <table height="100%;" width="100%" border="0" align="center"
     cellpadding="0" cellspacing="0">
     <tr height="100%;">
Index: ssts-web/src/main/webapp/ext/fontSize12/styles/common.css
===================================================================
diff -u -r32705 -r32861
--- ssts-web/src/main/webapp/ext/fontSize12/styles/common.css	(.../common.css)	(revision 32705)
+++ ssts-web/src/main/webapp/ext/fontSize12/styles/common.css	(.../common.css)	(revision 32861)
@@ -489,4 +489,8 @@
 
 #configForm-body .x4-panel-body-default {
     background: none !important;
+}
+
+#packageImg_header_hd {
+    top: 0 !important;
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js
===================================================================
diff -u -r32829 -r32861
--- ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js	(.../videoAndImg.js)	(revision 32829)
+++ ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js	(.../videoAndImg.js)	(revision 32861)
@@ -379,7 +379,7 @@
 			var data = JSON.parse(result);
 			if(data.success){
 				var imageIds = data.imageIds;
-				var videoIds = data.videoIds;
+				var videoIds = data.videoIds || '';
 				//置空
 				blobs = [];
 				size = null;
@@ -421,9 +421,17 @@
 						}
 					}
 				}
-			
-				loadingVideoAndImg(imageIds,videoIds);
+				
+				if(videoType !== ''){
+					loadingVideoAndImg(imageIds,videoIds);
+				}
 
+				if(imageType == '一次性物品图片'){
+					$('.spotlight_parent').each(function(index,ele) {
+						$(this).find('.imgs_form').text('已上传');		
+					})
+				}
+
 				if(imageIds != ""){
 					var imageIdsAll = imageIds.split(",");
 					for(var i = 0;i < imageIdsAll.length;i++){