Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r31062 -r31076
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 31062)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 31076)
@@ -699,8 +699,9 @@
 		var tousseName = idCardTaskNode.get('tousseName');
 		var vedioName = idCardTaskNode.get('uuid_vedioNames');
 		var td_id = idCardTaskNode.get('tousseID');
+		var taskId = idCardTaskNode.get('taskId');
 		var isTraceable = idCardTaskNode.get('isTraceable');
-		loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id,isTraceable);
+		loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id,isTraceable,taskId);
 		lastSelectTousseName = tousseName;
 		lastSelectimageTypeTousse = imageType_tousse;
 		lastSelectVedioName = vedioName;
@@ -1023,7 +1024,6 @@
 					}
 					if(record.get('tousseType') == '外来器械包' && treeId == 'basketTreeGrid'){
 			            var supplierName = record.get('supplierName');
-			           
 			            var basketBarcode = record.get('basketBarcode');
 			            var showName = tousseName;
 			            var invoicePlanId = record.get('invoicePlanId');
@@ -2371,7 +2371,7 @@
     panel.add(newImage);
 }
 
-function loadTousseInfo(tousseName,type,vedioName,td_id,isTraceable){
+function loadTousseInfo(tousseName,type,vedioName,td_id,isTraceable,taskId){
 	loadGoodsImage(tousseName,type,'',1,vedioName,td_id);
     materialStore.load({params: {tousseName:tousseName,tousseDefinitionId:td_id}});
 	Ext4.getCmp('isTraceable').setValue(isTraceable);
@@ -3329,7 +3329,7 @@
 	// 装配
     packed = packingTousse(false,basketBarcode,basketBarcode,taskId,tousseName,tousseType,1,packageType,sterilingType,supplierName,department,urgentAmount,JSON.stringify(taskIdToAmountMapInfo));
 	if(packed !== false){
-		requestPackingTousse(params);
+		requestPackingTousse(packed);
     	addTaskItemsToDelete(tousseItemsToDelete,tousseName,taskId,1);
     	Ext4.getCmp('remark').setValue();
     }
@@ -4116,8 +4116,10 @@
     				}
     				showResult(message , null , sstsConfig.messagePauseTimeOnPackingPage);
     			}
-    		}
-			isConfirmRequestPackingTousse(params,parseInt(index+1),isTrue);
+			}
+			if(index !== undefined){
+				isConfirmRequestPackingTousse(params,parseInt(index+1),isTrue);
+			}
 		},
 	    error : function(req, textStatus) {
 	    	showResult('装配失败!' , null , sstsConfig.messagePauseTimeOnPackingPage);
@@ -4707,6 +4709,10 @@
 			Ext4.getCmp('packingLableBtn').hide();
 		}
 	}
+	var taskId = '';
+	if(tousseType == '外来器械包'){
+		taskId = record.get('taskId');
+	}
 	if(record.get('checked') == false){
 		record.set('checked', true);
 		if(storeId == 'basketTreeGrid'){
@@ -4723,7 +4729,7 @@
 		root = waitPackingTreeGrid.getRootNode();
 	}
 	updateNoteWindow(record);
-	loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id,isTraceable);
+	loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id,isTraceable,taskId);
 	lastSelectTousseName = tousseName;
 	lastSelectimageTypeTousse = imageType_tousse;
 	lastSelectVedioName = vedioName;