Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp
===================================================================
diff -u -r29513 -r34244
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp	(.../foreignTousseView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp	(.../foreignTousseView.jsp)	(revision 34244)
@@ -89,6 +89,14 @@
 	SSTS_Tousse_Delete = false;
 </operation:authorize>
 
+/**
+ * <编辑配包注意事项》权限
+ */
+ var SSTS_TousseInstanceManager_Note_update = false;
+<operation:authorize ifAnyGranted="SSTS_TousseInstanceManager_Note_update">
+	SSTS_TousseInstanceManager_Note_update = true;
+</operation:authorize>
+
 var enableEditBtn = false;
 var enableSaveBtn = false;
 var enableSaveAndNewBtn = false;
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r34222 -r34244
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 34222)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 34244)
@@ -2790,9 +2790,16 @@
 					handler: function () {
 						if(SSTS_TousseInstanceManager_Note_update){
 							var tousseName = top.Ext.getCmp('name').getValue();
-							showWangEditor('【'+tousseName+'】', id);
+							var note = top.Ext.getCmp('note').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();
+							top.Ext.getCmp('previewNote').setValue(note);
 							previewWangEditor('【'+tousseName+'】');
 						}
 					}
@@ -2926,9 +2933,16 @@
 				handler: function () {
 					if(SSTS_TousseInstanceManager_Note_update){
 						var tousseName = top.Ext.getCmp('name').getValue();
-						showWangEditor('【'+tousseName+'】', id);
+						var note = top.Ext.getCmp('note').getValue();
+						if(isIE() && note.split('<p>').length >= 0){
+							showResult('不再支持IE浏览器编辑');
+						}else {
+							showWangEditor('【'+tousseName+'】', id);
+						}
 					}else {
 						var tousseName = top.Ext.getCmp('name').getValue();
+						var note = top.Ext.getCmp('note').getValue();
+						top.Ext.getCmp('previewNote').setValue(note);
 						previewWangEditor('【'+tousseName+'】');
 					}
 				}
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js
===================================================================
diff -u -r33539 -r34244
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js	(.../foreignTousseDefinitionForm.js)	(revision 33539)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js	(.../foreignTousseDefinitionForm.js)	(revision 34244)
@@ -737,15 +737,19 @@
 			        	  columnWidth : 1,
 				    	  layout : 'form',
 						  labelWidth : 90,
-				    	  items:[{
-				    		  xtype : 'textarea',
-				    		  fieldLabel : "配包注意事项",
-				    		  allowBlank : true,
-				    		  height :35, 
-				    		  name : "note",
-				    		  id : "note",
-				    		  anchor : '100%'
-				    	  }]
+				    	  hidden:true,
+						items: [{
+							xtype: 'textarea',
+							fieldLabel: "配包注意事项",
+							allowBlank: true,
+							height: 35,
+							name: "note",
+							id: "note",
+							anchor: '100%'
+						},{
+							xtype:'hidden',
+							id:'previewNote'
+						}]
 			          },{
 			        	  columnWidth : 1,
 				    	  layout : 'form',
@@ -820,7 +824,26 @@
     		  handler : function(){
     			uploadToussePackingImageFile(imageTypeSpecification,id);
     		  }	  
-      	  }]
+      	  }, {
+			text: '配包注意事项',
+			hidden: id == 0 ? true : false,
+			handler: function () {
+				if(SSTS_TousseInstanceManager_Note_update){
+					var tousseName = top.Ext.getCmp('name').getValue();
+					var note = top.Ext.getCmp('note').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();
+					top.Ext.getCmp('previewNote').setValue(note);
+					previewWangEditor('【'+tousseName+'】');
+				}
+			}
+		}]
 	});
 
 	foreignTousseDefinitionWin = new top.Ext.Window({