Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r31362 -r31363
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 31362)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 31363)
@@ -212,6 +212,7 @@
 	
 	Ext4.getCmp('basketTreeGrid').getView().refresh();
 }
+
 function checkAllWaitPackingTaskNode(checked){
 	var rootNode = Ext4.getCmp('waitPackingTreeGrid').getRootNode();
 	if(rootNode != null){
@@ -226,41 +227,22 @@
 	}
 	Ext4.getCmp('waitPackingTreeGrid').getView().refresh();
 }
-//视频观看
-function watchVideo(uuid_vedioNames){
-	var url = Ext4.urlEncode({
-		videoName : uuid_vedioNames
-	});
-	var tousseName = Ext4.getCmp('imageName').getText();
-	if(tousseName != ""){
-		url = Ext4.urlEncode({
-			videoName : uuid_vedioNames,
-			tousseName:tousseName
-		});
+
+//配包教学视频
+function watchVideoModel(objectId){
+	if (objectId !== '') {
+		var params = {
+			objectId: objectId
+		}
+		if(isIE()){
+			openModalWindow(WWWROOT + "/disinfectsystem/basedatamanager/tousse/watchVideoModel.jsp?objectId="+objectId, '', "800", "390");
+		}else {
+			openModalWindowForExt(WWWROOT + "/disinfectsystem/basedatamanager/tousse/watchVideoModel.jsp", params, "配包教学视频", "800", "390");
+		}
+	}else {
+		showResult("请选择装配任务" , null , sstsConfig.messagePauseTimeOnPackingPage);
 	}
-	openModalWindowForExt(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
-		});
-	}
-	openModalWindowForExt(WWWROOT+"/disinfectsystem/basedatamanager/tousse/watchVideoModel.jsp?"+url,'', "打包视频", "800", "390");
-}
-function onSupplementIDCard(idCardInfo){
-	return;
-	var text = idCardInfo.recyclingError.materialName+':'+'丢失'+idCardInfo.recyclingError.amount+',已补充'+idCardInfo.recyclingError.additionalAmount
-	var idCardErrorsInfoCmp =  top.Ext4.getCmp('idCardErrorsInfo');
-//	alert(idCardErrorsInfoCmp)
-	idCardErrorsInfoCmp.setText(text);
-//	idCardInfo.recyclingError
-}
 
 function additionalMaterialCallback(success,type,packingTaskId){
 	if(packingTaskId != ""){
@@ -1359,14 +1341,8 @@
                id:'btn_watchVideoBar',
                name:'btn_watchVideoBar',
                handler : function(){
-            	   //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);
-                   	//}
+                   watchVideoModel(td_id);
                }
            },
            {