Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r34233 -r34249
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 34233)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 34249)
@@ -270,33 +270,33 @@
 		{name : 'note',mapping : 'note'},
 		{name : 'status',mapping : 'status'}
 	]);
-	var index = -1;
 	var sum = 0;
 	for(var i = 0;i<noteGrid.getStore().getCount();i++){
 		var rows = noteGrid.getStore().getAt(i);
 		if(rows.data.tousseID == tousseID){
-			index = i;
+			var rows = noteGrid.getStore().getAt(i);
+			record = new recordFields({
+				tousseID:tousseID,
+				tousseName:rows.data.tousseName,
+				note:rows.data.note,
+				status:status
+			});
+			noteGrid.getStore().remove(rows)
+			noteGrid.getStore().insert(i, record);
+			if(status == 1){
+				sessionStorage.setItem('hiddenNote',rows.data.note);
+				previewWangEditor('【'+rows.data.tousseName+'】');
+			}
+			break;
 		}
+	}
+	for(var i = 0;i<noteGrid.getStore().getCount();i++){
+		var rows = noteGrid.getStore().getAt(i);
 		if(rows.data.status == 0){
-			sum++
+			sum ++ ;
 		}
 	}
-	if(index >= 0){
-		var rows = noteGrid.getStore().getAt(index);
-		record = new recordFields({
-			tousseID:tousseID,
-			tousseName:rows.data.tousseName,
-			note:rows.data.note,
-			status:status
-		});
-		noteGrid.getStore().remove(rows)
-		noteGrid.getStore().insert(index, record);
-		if(status == 1){
-			$('#hiddenNote').val(rows.data.note);
-			previewWangEditor('【'+rows.data.tousseName+'】');
-		}
-	}
-	if(sum <= 1){
+	if(sum == 0){
 		top.Ext.getCmp('noteWindow').close();
 	}
 }
@@ -1595,7 +1595,7 @@
 								var ret = Ext4.decode(result.responseText);
 								if(ret.success){
 									if(ret.note && ret.note !== ''){
-										$('#hiddenNote').val(ret.note);
+										sessionStorage.setItem('hiddenNote',ret.note);
 										setTimeout(function(){
 											previewWangEditor('【'+ret.packageName+'】');
 											myMask.hide();
@@ -3354,31 +3354,20 @@
 			hideScanIDCardBarcode(); // 只要左边有选中的项，那么隐藏标识牌输入框
 		}
 	}
-	function showNoteWindow(node,hasChecked) {
+	function showNoteWindow(node) {
 		if (!sstsConfig.showTousseNoteOnClickTousse) {
 			return;
 		}
 		var tousseName = node.get('tousseName');
 		var note = node.get('note');
-		if(hasChecked){
-			var checked = node.get('checked');
-			if (!Ext.isEmpty(note) && checked) {
-				$('#hiddenNote').val(note);
-				Ext4.MessageBox.confirm("配包注意事项", tousseName + " 含有配包注意事项，是否查看?",function (btn) {
-					if (btn == 'yes') {
-						previewWangEditor('【'+tousseName+'】');
-					}
-				});
-			}
-		}else {
-			if (!Ext.isEmpty(note)) {
-				$('#hiddenNote').val(note);
-				Ext4.MessageBox.confirm("配包注意事项", tousseName + " 含有配包注意事项，是否查看?",function (btn) {
-					if (btn == 'yes') {
-						previewWangEditor('【'+tousseName+'】');
-					}
-				});
-			}
+		var checked = node.get('checked');
+		if (!Ext.isEmpty(note) && checked) {
+			sessionStorage.setItem('hiddenNote',note);
+			Ext4.MessageBox.confirm("配包注意事项", tousseName + " 含有配包注意事项，是否查看?",function (btn) {
+				if (btn == 'yes') {
+					previewWangEditor('【'+tousseName+'】');
+				}
+			});
 		}
 	}
 	function getSelAmount() {
@@ -5409,7 +5398,6 @@
 			var waitPackingTreeGrid = Ext4.getCmp("waitPackingTreeGrid");
 			root = waitPackingTreeGrid.getRootNode();
 		}
-		showNoteWindow(record);
 		loadTousseInfo(tousseName, imageType_tousse, vedioName, td_id, isTraceable, taskId, packedPhotographed);
 		lastSelectTousseName = tousseName;
 		lastSelectimageTypeTousse = imageType_tousse;
@@ -5673,7 +5661,7 @@
 						node.parentNode.set('checked', false);
 					}
 				}
-				showNoteWindow(node,true);
+				showNoteWindow(node);
 				resetScanIDCardBarcodeVisibility(node);
 				// 显示丢失报损按钮
 				showOrHideErrorAndDamageBtn();
@@ -5925,7 +5913,7 @@
 						node.parentNode.set('checked', false);
 					}
 				}
-				showNoteWindow(node,true);
+				showNoteWindow(node);
 				resetScanIDCardBarcodeVisibilityWaitPacking(node);
 				// 显示丢失报损按钮
 				showOrHideErrorAndDamageBtn();