Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r34249 -r34261
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 34249)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 34261)
@@ -826,7 +826,11 @@
 			} else {
 				Ext4.getCmp('packageType').enable();
 			}
-			showNoteWindow(idCardTaskNode.parentNode);
+			if(idCardTaskNode.data.note && idCardTaskNode.data.note !== ''){
+				showNoteWindow(idCardTaskNode,true);
+			}else {
+				showNoteWindow(idCardTaskNode.parentNode,true);
+			}
 		}
 		// 取消选中所有的装配任务，只选中该标识牌的
 		uncheckAllExceptCurrentIDCardPackingTask();
@@ -3354,13 +3358,16 @@
 			hideScanIDCardBarcode(); // 只要左边有选中的项，那么隐藏标识牌输入框
 		}
 	}
-	function showNoteWindow(node) {
+	function showNoteWindow(node,idCard) {
 		if (!sstsConfig.showTousseNoteOnClickTousse) {
 			return;
 		}
 		var tousseName = node.get('tousseName');
 		var note = node.get('note');
 		var checked = node.get('checked');
+		if(idCard){
+			checked = true;
+		}
 		if (!Ext.isEmpty(note) && checked) {
 			sessionStorage.setItem('hiddenNote',note);
 			Ext4.MessageBox.confirm("配包注意事项", tousseName + " 含有配包注意事项，是否查看?",function (btn) {
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r34244 -r34261
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 34244)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 34261)
@@ -2799,6 +2799,10 @@
 						}else {
 							var tousseName = top.Ext.getCmp('name').getValue();
 							var note = top.Ext.getCmp('note').getValue();
+							if(note == ''){
+								showResult('暂无注意事项');
+								return;
+							}
 							top.Ext.getCmp('previewNote').setValue(note);
 							previewWangEditor('【'+tousseName+'】');
 						}
Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r34222 -r34261
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 34222)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 34261)
@@ -4907,6 +4907,8 @@
             text: '预览',
             hidden: isPreview,
             handler: function () {
+                var hiddenNote = top.Ext.getCmp('hiddenNote').getValue();
+                top.Ext.getCmp('previewNote').setValue(hiddenNote);
                 previewWangEditor(title);
             }
         }, {