Index: ssts-web/src/main/webapp/common/previewWangEditor.jsp
===================================================================
diff -u -r34251 -r34298
--- ssts-web/src/main/webapp/common/previewWangEditor.jsp	(.../previewWangEditor.jsp)	(revision 34251)
+++ ssts-web/src/main/webapp/common/previewWangEditor.jsp	(.../previewWangEditor.jsp)	(revision 34298)
@@ -15,6 +15,7 @@
 		<%@ include file="/common/include_Ext425JsAndCss.jsp"%>
 		<script>
 			var WWWROOT = '${ctx}';
+			var objectId = '${param.id}';
 		</script>
 		<script type="text/javascript" src="${ctx}/jquery/jquery-1.11.2.js?version=${svnRevision}"></script>
 		<script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
@@ -82,17 +83,48 @@
 	</body>
 	<script>
 		var text = '';
-		if(top.Ext.getCmp('previewNote')){
-			text = top.Ext.getCmp('previewNote').getValue();
-		}else if(window.parent.document.getElementById('iframe_packing')){
-			text = sessionStorage.getItem('hiddenNote');
-		}
 		var note = '';
-		if(text.split('<p>').length > 1){
-			note = text;
+		var id;
+		if(objectId.split('?').length >= 1){
+			id = objectId.split('?')[0];
 		}else {
-			note = '<p>'+text+'</p>';
+			id = objectId;
 		}
-		$('#editor-content-view').html(note);
+		if(id && id !== '' && id !== 'undefined'){
+			$.ajax({
+				type:'post',
+				dataType:'json',
+				url :  WWWROOT+'/disinfectSystem/baseData/tousseDefinitionAction!loadTousseDefinitionNote.do',
+				data:{
+					id:id
+				},
+				success : function(result) {
+					if(result.success){
+						if(result.data && result.data.note){
+							text = result.data.note;
+						}
+						if(text.indexOf('<p>') >= 0){
+							note = text;
+						}else {
+							note = '<p>'+text+'</p>';
+						}
+						$('#editor-content-view').html(note);
+					}else {
+						showResult(result.message);
+					}
+				}
+			})
+		}else {
+			if(sessionStorage.getItem('hiddenNote')){
+				text = sessionStorage.getItem('hiddenNote');
+				sessionStorage.removeItem('hiddenNote');
+			}
+			if(text.indexOf('<p>') >= 0){
+				note = text;
+			}else {
+				note = '<p>'+text+'</p>';
+			}
+			$('#editor-content-view').html(note);
+		}
 	</script>
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/common/wangEditor.js
===================================================================
diff -u -r34209 -r34298
--- ssts-web/src/main/webapp/common/wangEditor.js	(.../wangEditor.js)	(revision 34209)
+++ ssts-web/src/main/webapp/common/wangEditor.js	(.../wangEditor.js)	(revision 34298)
@@ -1,15 +1,12 @@
-var text = top.Ext.getCmp('note').getValue();
-var note = '';
-if (text.split('<p>').length > 1) {
-    note = text;
-} else {
-    note = '<p>' + text + '</p>';
-}
+var editor;
 var E = window.wangEditor;
 var { createEditor, createToolbar, IEditorConfig, uploadImage } = window.wangEditor;
 var editorConfig = {
     MENU_CONF: {}
 }
+if(objectId && objectId !== '' && objectId == 'undefined'){
+    objectId = parseInt(objectId);
+}
 editorConfig.placeholder = '请输入内容';
 editorConfig.MENU_CONF['uploadImage'] = {
     server: WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!uploadImage.do',
@@ -46,18 +43,63 @@
         }
     }
 };
-var editor = createEditor({
-    selector: '#editor-container',
-    config: editorConfig,
-    html: note,
-    mode: 'default'
-});
-// 创建工具栏1
-var toolbar = createToolbar({
-    editor: editor,
-    selector: '#toolbar-container',
-    mode: 'default'
-});
+$(document).ready(function () {
+    $.ajax({
+        type: 'post',
+        dataType: 'json',
+        url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!loadTousseDefinitionNote.do',
+        data: {
+            id: objectId
+        },
+        success: function (result) {
+            if (result.success) {
+                var note = '';
+                if (result.data && result.data.note) {
+                    note = result.data.note;
+                    if (note.split('<p>').length > 1) {
+                        note = note;
+                    } else {
+                        note = '<p>' + note + '</p>';
+                    }
+                }
+                editor = createEditor({
+                    selector: '#editor-container',
+                    config: editorConfig,
+                    html: note,
+                    mode: 'default'
+                });
+                // 创建工具栏1
+                var toolbar = createToolbar({
+                    editor: editor,
+                    selector: '#toolbar-container',
+                    mode: 'default'
+                });
+            } else {
+                showResult(result.message);
+            }
+        }
+    })
+})
 $('#btn').click(function () {
-    $('#getHtml').html(editor.getHtml());
-});
\ No newline at end of file
+    var note = editor.getHtml();
+    $.ajax({
+        type: 'post',
+        dataType: 'json',
+        url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!saveTousseDefinitionNote.do',
+        data: {
+            id: objectId,
+            note: note
+        },
+        success: function (result) {
+            if (result.success) {
+                showResult(result.message);
+            } else {
+                showResult(result.message);
+            }
+        }
+    })
+});
+$('#btn2').click(function () {
+    var note = editor.getHtml();
+    sessionStorage.setItem('hiddenNote', note);
+})
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r34261 -r34298
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 34261)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 34298)
@@ -2803,8 +2803,7 @@
 								showResult('暂无注意事项');
 								return;
 							}
-							top.Ext.getCmp('previewNote').setValue(note);
-							previewWangEditor('【'+tousseName+'】');
+							previewWangEditor('【'+tousseName+'】', id);
 						}
 					}
 				}, {
@@ -2938,16 +2937,14 @@
 					if(SSTS_TousseInstanceManager_Note_update){
 						var tousseName = top.Ext.getCmp('name').getValue();
 						var note = top.Ext.getCmp('note').getValue();
-						if(isIE() && note.split('<p>').length >= 0){
+						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+'】');
+						previewWangEditor('【'+tousseName+'】', id);
 					}
 				}
 			}, {
Index: ssts-web/src/main/webapp/common/wangEditor.jsp
===================================================================
diff -u -r34209 -r34298
--- ssts-web/src/main/webapp/common/wangEditor.jsp	(.../wangEditor.jsp)	(revision 34209)
+++ ssts-web/src/main/webapp/common/wangEditor.jsp	(.../wangEditor.jsp)	(revision 34298)
@@ -27,7 +27,7 @@
 		</div>
 		<!--隐藏区域-->
 		<button style="display:none" id="btn" type="button">获取内容</button>
-		<textarea style="display:none" id="getHtml" ></textarea>
+		<button style="display:none" id="btn2" type="button">获取内容</button>
 	</body>
 	<script type="text/javascript" src="wangEditor.js?version=${svnRevision}"></script>
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js
===================================================================
diff -u -r34244 -r34298
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js	(.../foreignTousseDefinitionForm.js)	(revision 34244)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js	(.../foreignTousseDefinitionForm.js)	(revision 34298)
@@ -838,9 +838,7 @@
 					}
 				}else {
 					var tousseName = top.Ext.getCmp('name').getValue();
-					var note = top.Ext.getCmp('note').getValue();
-					top.Ext.getCmp('previewNote').setValue(note);
-					previewWangEditor('【'+tousseName+'】');
+					previewWangEditor('【'+tousseName+'】', id);
 				}
 			}
 		}]
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r34261 -r34298
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 34261)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 34298)
@@ -284,8 +284,7 @@
 			noteGrid.getStore().remove(rows)
 			noteGrid.getStore().insert(i, record);
 			if(status == 1){
-				sessionStorage.setItem('hiddenNote',rows.data.note);
-				previewWangEditor('【'+rows.data.tousseName+'】');
+				previewWangEditor('【'+rows.data.tousseName+'】',tousseID);
 			}
 			break;
 		}
@@ -1599,9 +1598,8 @@
 								var ret = Ext4.decode(result.responseText);
 								if(ret.success){
 									if(ret.note && ret.note !== ''){
-										sessionStorage.setItem('hiddenNote',ret.note);
 										setTimeout(function(){
-											previewWangEditor('【'+ret.packageName+'】');
+											previewWangEditor('【'+ret.packageName+'】',td_id);
 											myMask.hide();
 										}, 1000);
 									}else {
@@ -3369,10 +3367,10 @@
 			checked = true;
 		}
 		if (!Ext.isEmpty(note) && checked) {
-			sessionStorage.setItem('hiddenNote',note);
+			var tousseID = node.get('tousseID');
 			Ext4.MessageBox.confirm("配包注意事项", tousseName + " 含有配包注意事项，是否查看?",function (btn) {
 				if (btn == 'yes') {
-					previewWangEditor('【'+tousseName+'】');
+					previewWangEditor('【'+tousseName+'】', tousseID);
 				}
 			});
 		}
Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r34261 -r34298
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 34261)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 34298)
@@ -4799,7 +4799,7 @@
 //显示富文本编辑器
 function showWangEditor(title, id) {
     if (isIE()) {
-        showNoteText(title, false);
+        showNoteText(title, id);
         return;
     }
     var url = WWWROOT + '/common/wangEditor.jsp?id=' + id;
@@ -4820,10 +4820,8 @@
             text: '预览',
             handler: function (that) {
                 that.disable(true);
-                top.document.getElementById('wangEditorIframe').contentWindow.document.getElementById('btn').click();
+                top.document.getElementById('wangEditorIframe').contentWindow.document.getElementById('btn2').click();
                 setTimeout(function () {
-                    var html = top.document.getElementById('wangEditorIframe').contentWindow.document.getElementById('getHtml').value;
-                    top.Ext.getCmp('previewNote').setValue(html);
                     previewWangEditor(title);
                     that.enable();
                 }, 1000);
@@ -4835,8 +4833,6 @@
                 that.disable(true);
                 top.document.getElementById('wangEditorIframe').contentWindow.document.getElementById('btn').click();
                 setTimeout(function () {
-                    var html = top.document.getElementById('wangEditorIframe').contentWindow.document.getElementById('getHtml').value;
-                    top.Ext.getCmp('note').setValue(html);
                     that.enable();
                 }, 1000);
             }
@@ -4847,8 +4843,6 @@
                 top.document.getElementById('wangEditorIframe').contentWindow.document.getElementById('btn').click();
                 top.Ext.MessageBox.wait('保存中，请稍候……', '请等待');
                 setTimeout(function () {
-                    var html = top.document.getElementById('wangEditorIframe').contentWindow.document.getElementById('getHtml').value;
-                    top.Ext.getCmp('note').setValue(html);
                     hideMessageBox(true);
                     that.enable();
                     win.close();
@@ -4865,74 +4859,111 @@
 }
 
 //预览富文本内容
-function previewWangEditor(title) {
-    var url = WWWROOT + '/common/previewWangEditor.jsp';
+function previewWangEditor(title,id) {
+    var url = WWWROOT + '/common/previewWangEditor.jsp?id=' + id;
     openModalWindowForExt(url, {}, title + '配包注意事项', 1000, 550);
 }
 
 //IE配包注意事项不显示编辑器
-function showNoteText(title, isPreview) {
-    var content = '';
-    var note = top.Ext.getCmp('note').getValue();
-    if (note.split('<p>').length <= 1) {
-        content = note;
-    }
+function showNoteText(title, id) {
     var win = new top.Ext.Window({
         title: title + '配包注意事项编辑器',
         width: 1000,
         height: 600,
-        autoScroll: isPreview,
+        autoScroll: false,
         isTopContainer: true,
         modal: true,
         resizable: false,
         buttonAlign: 'center',
         items: [{
-            xtype: "panel",
-            hidden: !isPreview,
-            html: note
-        }, {
             xtype: 'textarea',
             name: 'hiddenNote',
             id: 'hiddenNote',
             emptyText: '请输入内容',
             height: 506,
             width: 990,
-            hidden: isPreview,
-            value: content
+            hidden: false,
+            value: ''
         }],
         tbar: [{
             text: 'IE浏览器不能使用富文本编辑器'
         }],
         buttons: [{
             text: '预览',
-            hidden: isPreview,
+            hidden: false,
             handler: function () {
                 var hiddenNote = top.Ext.getCmp('hiddenNote').getValue();
-                top.Ext.getCmp('previewNote').setValue(hiddenNote);
+                sessionStorage.setItem('hiddenNote',hiddenNote)
                 previewWangEditor(title);
             }
         }, {
             text: '保存',
-            hidden: isPreview,
+            hidden: false,
             handler: function () {
                 var hiddenNote = top.Ext.getCmp('hiddenNote').getValue();
-                top.Ext.getCmp('note').setValue(hiddenNote);
+                Ext.Ajax.request({
+                    url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!saveTousseDefinitionNote.do',
+                    params: { 
+                        id: id,
+                        note: hiddenNote
+                    },
+                    success: function (response, options) {
+                        var result = Ext.decode(response.responseText);
+                        if (result.success) {
+                            showResult(result.message);
+                        } else {
+                            showResult(result.message);
+                        }
+                    }
+                });
             }
         }, {
             text: '保存并关闭',
-            hidden: isPreview,
+            hidden: false,
             handler: function () {
                 var hiddenNote = top.Ext.getCmp('hiddenNote').getValue();
-                top.Ext.getCmp('note').setValue(hiddenNote);
-                win.close();
+                Ext.Ajax.request({
+                    url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!saveTousseDefinitionNote.do',
+                    params: { 
+                        id: id,
+                        note: hiddenNote
+                    },
+                    success: function (response, options) {
+                        var result = Ext.decode(response.responseText);
+                        if (result.success) {
+                            showResult(result.message);
+                            win.close();
+                        } else {
+                            showResult(result.message);
+                        }
+                    }
+                });
             }
         }, {
             text: '取消',
-            hidden: isPreview,
+            hidden: false,
             handler: function () {
                 win.close();
             }
         }]
     })
     win.show();
+    if(id){
+        Ext.Ajax.request({
+            url :  WWWROOT+'/disinfectSystem/baseData/tousseDefinitionAction!loadTousseDefinitionNote.do',
+            params: { 
+                id:id
+            },
+            success: function (response, options) {
+                var result = Ext.decode(response.responseText);
+                if (result.success) {
+                    var text;
+                    if(result.data && result.data.note){
+                        text = result.data.note;
+                    }
+                    top.Ext.getCmp('hiddenNote').setValue(text);
+                }
+            }
+        });
+    }
 }
\ No newline at end of file