Index: ssts-web/src/main/webapp/common/wangEditor.js
===================================================================
diff -u -r34302 -r34312
--- ssts-web/src/main/webapp/common/wangEditor.js	(.../wangEditor.js)	(revision 34302)
+++ ssts-web/src/main/webapp/common/wangEditor.js	(.../wangEditor.js)	(revision 34312)
@@ -99,6 +99,12 @@
         success: function (result) {
             if (result.success) {
                 showResult(result.message);
+                if(top.Ext.getCmp('wangEditorWin')){
+                    setTimeout(function () {
+                        top.Ext.MessageBox.hide();
+                        top.Ext.getCmp('wangEditorWin').close();
+                    }, 1000);
+                }
             } else {
                 showResult(result.message);
             }
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js
===================================================================
diff -u -r34298 -r34312
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js	(.../foreignTousseDefinitionForm.js)	(revision 34298)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js	(.../foreignTousseDefinitionForm.js)	(revision 34312)
@@ -734,22 +734,8 @@
 							anchor : '95%'
 						}]
 					},{
-			        	  columnWidth : 1,
-				    	  layout : 'form',
-						  labelWidth : 90,
-				    	  hidden:true,
-						items: [{
-							xtype: 'textarea',
-							fieldLabel: "配包注意事项",
-							allowBlank: true,
-							height: 35,
-							name: "note",
-							id: "note",
-							anchor: '100%'
-						},{
-							xtype:'hidden',
-							id:'previewNote'
-						}]
+						xtype:'hidden',
+						id:'previewNote'
 			          },{
 			        	  columnWidth : 1,
 				    	  layout : 'form',
@@ -830,7 +816,7 @@
 			handler: function () {
 				if(SSTS_TousseInstanceManager_Note_update){
 					var tousseName = top.Ext.getCmp('name').getValue();
-					var note = top.Ext.getCmp('note').getValue();
+					var note = top.Ext.getCmp('previewNote').getValue();
 					if(isIE() && note.indexOf('<p>') >= 0){
 						showResult('不再支持IE浏览器编辑');
 					}else {
@@ -867,6 +853,7 @@
 				if(tousseDefinition.riskLevel == 0){
 					top.Ext.getCmp("riskLevel").setValue('')
 				}
+				top.Ext.getCmp('previewNote').setValue(tousseDefinition.note || '');
 			},
 			failure : function(form, action) {
 			},
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r34298 -r34312
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 34298)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 34312)
@@ -2651,23 +2651,8 @@
 						anchor: '100%'
 					}]
 				}, {
-					columnWidth: 1,
-					layout: 'form',
-					labelWidth: fontSize == 12 ? 90 : 100,
-					labelAlign: "right",
-					hidden:true,
-					items: [{
-						xtype: 'textarea',
-						fieldLabel: "配包注意事项",
-						allowBlank: true,
-						height: 35,
-						name: "note",
-						id: "note",
-						anchor: '100%'
-					},{
-						xtype:'hidden',
-						id:'previewNote'
-					}]
+					xtype:'hidden',
+					id:'hiddenNoteValue'
 				}]
 			}, {
 				columnWidth: 0.9,
@@ -2790,15 +2775,15 @@
 					handler: function () {
 						if(SSTS_TousseInstanceManager_Note_update){
 							var tousseName = top.Ext.getCmp('name').getValue();
-							var note = top.Ext.getCmp('note').getValue();
+							var note = top.Ext.getCmp('hiddenNoteValue').getValue();
 							if(isIE() && note.indexOf('<p>') >= 0){
 								showResult('不再支持IE浏览器编辑');
 							}else {
 								showWangEditor('【'+tousseName+'】', id);
 							}
 						}else {
 							var tousseName = top.Ext.getCmp('name').getValue();
-							var note = top.Ext.getCmp('note').getValue();
+							var note = top.Ext.getCmp('hiddenNoteValue').getValue();
 							if(note == ''){
 								showResult('暂无注意事项');
 								return;
@@ -2936,14 +2921,19 @@
 				handler: function () {
 					if(SSTS_TousseInstanceManager_Note_update){
 						var tousseName = top.Ext.getCmp('name').getValue();
-						var note = top.Ext.getCmp('note').getValue();
+						var note = top.Ext.getCmp('hiddenNoteValue').getValue();
 						if(isIE() && note.indexOf('<p>') >= 0){
 							showResult('不再支持IE浏览器编辑');
 						}else {
 							showWangEditor('【'+tousseName+'】', id);
 						}
 					}else {
 						var tousseName = top.Ext.getCmp('name').getValue();
+						var note = top.Ext.getCmp('hiddenNoteValue').getValue();
+						if(note == ''){
+							showResult('暂无注意事项');
+							return;
+						}
 						previewWangEditor('【'+tousseName+'】', id);
 					}
 				}
@@ -3018,6 +3008,7 @@
 						top.Ext.getCmp('uuid_vedioNames').setValue(videoName);
 					}
 				}
+				top.Ext.getCmp('hiddenNoteValue').setValue(tousseDefinition.note || '');
 				//初始化此包定义的所有材料
 				for (var i = 0; i < tousseDefinition.tousseDefinitionMaterials.length; i++) {
 					var tousseDefinitionMaterial = tousseDefinition.tousseDefinitionMaterials[i];