Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r25533 -r25544
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 25533)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 25544)
@@ -151,8 +151,21 @@
 			tousseName:tousseName
 		});
 	}
-	openModalWindow(WWWROOT+"/disinfectsystem/basedatamanager/tousse/watchVideo.jsp?"+url, "观看配包教学视频", "600", "400");
+	openModalWindow(WWWROOT+"/disinfectsystem/basedatamanager/tousse/watchVideo.jsp?"+url, "观看配包教学视频", "700", "400");
 }
+function watchVideoModel(uuid_vedioNames,td_id,tousseName){
+	var url = Ext4.urlEncode({
+		videoName : uuid_vedioNames
+	});
+	if(tousseName != ""){
+		url = Ext4.urlEncode({
+			videoName :uuid_vedioNames,
+			tousseName:tousseName,
+			objectId:td_id
+		});
+	}
+	openModalWindow(WWWROOT+"/disinfectsystem/basedatamanager/tousse/watchVideoModel.jsp?"+url, "打包视频", "740", "400");
+}
 function onSupplementIDCard(idCardInfo){
 	return;
 	var text = idCardInfo.recyclingError.materialName+':'+'丢失'+idCardInfo.recyclingError.amount+',已补充'+idCardInfo.recyclingError.additionalAmount
@@ -708,7 +721,6 @@
 		    			showName = '<span class="smallTousseColor">' + showName + '</span>';
 		    		}
 		    	}
-		    	
 		    	return showName;
 		    }
 		},{
@@ -1080,10 +1092,14 @@
                id:'btn_watchVideoBar',
                name:'btn_watchVideoBar',
                handler : function(){
-					var vedioName = "";
-					var tousseName = Ext4.getCmp('imageName').getText();
-					var td_id = Ext4.getCmp('td_id').getValue();
-					watchVideoModel(vedioName,td_id,tousseName);
+            	   //var vedioName = Ext4.getCmp('vedioName').getValue();
+            	   var videoName = "";
+            	   var tousseName = Ext4.getCmp('imageName').getText();
+            	   var td_id = Ext4.getCmp('td_id').getValue();
+                   //	if(vedioName != ""){
+                    	watchVideoModel(videoName,td_id,tousseName);
+                    	//watchVideo(vedioName);
+                   	//}
                }
            },
            {