Index: ssts-web/src/main/webapp/common/wangEditor.jsp
===================================================================
diff -u -r34298 -r34403
--- ssts-web/src/main/webapp/common/wangEditor.jsp	(.../wangEditor.jsp)	(revision 34298)
+++ ssts-web/src/main/webapp/common/wangEditor.jsp	(.../wangEditor.jsp)	(revision 34403)
@@ -27,6 +27,7 @@
 		</div>
 		<!--隐藏区域-->
 		<button style="display:none" id="btn" type="button">获取内容</button>
+		<button style="display:none" id="btn1" type="button">获取内容</button>
 		<button style="display:none" id="btn2" type="button">获取内容</button>
 	</body>
 	<script type="text/javascript" src="wangEditor.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/common/wangEditor.js
===================================================================
diff -u -r34312 -r34403
--- ssts-web/src/main/webapp/common/wangEditor.js	(.../wangEditor.js)	(revision 34312)
+++ ssts-web/src/main/webapp/common/wangEditor.js	(.../wangEditor.js)	(revision 34403)
@@ -102,6 +102,30 @@
                 if(top.Ext.getCmp('wangEditorWin')){
                     setTimeout(function () {
                         top.Ext.MessageBox.hide();
+                    }, 1000);
+                }
+            } else {
+                showResult(result.message);
+            }
+        }
+    })
+});
+$('#btn1').click(function () {
+    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);
+                if(top.Ext.getCmp('wangEditorWin')){
+                    setTimeout(function () {
+                        top.Ext.MessageBox.hide();
                         top.Ext.getCmp('wangEditorWin').close();
                     }, 1000);
                 }
Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r34370 -r34403
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 34370)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 34403)
@@ -4841,13 +4841,8 @@
             text: '保存并关闭',
             handler: function (that) {
                 that.disable(true);
-                top.document.getElementById('wangEditorIframe').contentWindow.document.getElementById('btn').click();
+                top.document.getElementById('wangEditorIframe').contentWindow.document.getElementById('btn1').click();
                 top.Ext.MessageBox.wait('保存中，请稍候……', '请等待');
-            	setTimeout(function () {
-                    hideMessageBox(true);
-                    that.enable();
-                    win.close();
-                }, 1000);
             }
         }, {
             text: '取消',