Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r34209 -r34214
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 34209)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 34214)
@@ -1468,7 +1468,31 @@
 					if (isUndefinedOrNullOrEmpty(td_id)) {
 						showResult("请选择装配任务", null, sstsConfig.messagePauseTimeOnPackingPage);
 					} else {
-						showToussePackingNote(td_id);
+						var myMask = new Ext4.LoadMask({ msg: "加载中，请稍候...", target: Ext4.getCmp('packingViewTab0') });
+						myMask.show();
+						Ext4.Ajax.request({
+							url : WWWROOT + '/disinfectSystem/packingAction!getPackageNote.do',
+							params : {
+								td_id : td_id
+							},
+							success : function(result){
+								var ret = Ext4.decode(result.responseText);
+								if(ret.success){
+									if(ret.note){
+										$('#hiddenNote').val(ret.note);
+										setTimeout(function(){
+											previewWangEditor('【'+ret.packageName+'】');
+											myMask.hide();
+										}, 1000);
+									}
+								}else {
+									myMask.hide();
+								}
+							},
+							failure : function(){
+								myMask.hide();
+							}
+						});
 					}
 				}
 			},
Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r34209 -r34214
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 34209)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 34214)
@@ -4798,6 +4798,10 @@
 
 //显示富文本编辑器
 function showWangEditor(title, id) {
+    if (isIE()) {
+        showNoteText(title, false);
+        return;
+    }
     var url = WWWROOT + '/common/wangEditor.jsp?id=' + id;
     var win = new top.Ext.Window({
         title: title + '配包注意事项编辑器',
@@ -4810,7 +4814,6 @@
         buttonAlign: 'center',
         items: [{
             xtype: "panel",
-            id: "index",
             html: "<iframe src='" + url + "' id='wangEditorIframe' scrolling='yes' frameborder=0 width=985 height=600></iframe>"
         }],
         buttons: [{
@@ -4852,5 +4855,70 @@
 //预览富文本内容
 function previewWangEditor(title) {
     var url = WWWROOT + '/common/previewWangEditor.jsp';
-    openModalWindowForExt(url, {}, title + '配包注意事项', 1000, 600);
+    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;
+    }
+    var win = new top.Ext.Window({
+        title: title + '配包注意事项编辑器',
+        width: 1000,
+        height: 600,
+        autoScroll: isPreview,
+        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
+        }],
+        tbar: [{
+            text: 'IE浏览器不能使用富文本编辑器'
+        }],
+        buttons: [{
+            text: '预览',
+            hidden: isPreview,
+            handler: function () {
+                previewWangEditor(title);
+            }
+        }, {
+            text: '保存',
+            hidden: isPreview,
+            handler: function () {
+                var hiddenNote = top.Ext.getCmp('hiddenNote').getValue();
+                top.Ext.getCmp('note').setValue(hiddenNote);
+            }
+        }, {
+            text: '保存并关闭',
+            hidden: isPreview,
+            handler: function () {
+                var hiddenNote = top.Ext.getCmp('hiddenNote').getValue();
+                top.Ext.getCmp('note').setValue(hiddenNote);
+                win.close();
+            }
+        }, {
+            text: '取消',
+            hidden: isPreview,
+            handler: function () {
+                win.close();
+            }
+        }]
+    })
+    win.show();
 }
\ No newline at end of file
Fisheye: Tag 34214 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingNoteWindow.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-web/src/main/webapp/common/previewWangEditor.jsp
===================================================================
diff -u -r34209 -r34214
--- ssts-web/src/main/webapp/common/previewWangEditor.jsp	(.../previewWangEditor.jsp)	(revision 34209)
+++ ssts-web/src/main/webapp/common/previewWangEditor.jsp	(.../previewWangEditor.jsp)	(revision 34214)
@@ -19,18 +19,65 @@
 		<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>
 		<script type="text/javascript" src="${ctx}/js/json3.min.js?version=${svnRevision}"></script>
-		<script type="text/javascript" src="wangEditor/index.js"></script>
-		<div id="editor-container" style="height:600px">
+		<div id="editor-content-view" class="editor-content-view" style="height:530px">
 			
 		</div>
 		<style>
-			.w-e-text-container [data-slate-editor] .table-container {
+			.editor-content-view {
 				border: 0;
+				border-radius: 5px;
+				padding: 10px;
+				overflow-y: auto;
 			}
-			.w-e-textarea-video-container {
-				background: #fff;
-				border: 0;
+
+			.editor-content-view p,
+			.editor-content-view li {
+				white-space: pre-wrap; /* 保留空格 */
 			}
+
+			.editor-content-view blockquote {
+				border-left: 8px solid #d0e5f2;
+				padding: 10px 10px;
+				margin: 10px 0;
+				background-color: #f1f1f1;
+			}
+
+			.editor-content-view code {
+				font-family: monospace;
+				background-color: #eee;
+				padding: 3px;
+				border-radius: 3px;
+			}
+			.editor-content-view pre>code {
+				display: block;
+				padding: 10px;
+			}
+
+			.editor-content-view table {
+				border-collapse: collapse;
+			}
+			.editor-content-view td,
+			.editor-content-view th {
+				border: 1px solid #ccc;
+				min-width: 50px;
+				height: 20px;
+			}
+			.editor-content-view th {
+				background-color: #f1f1f1;
+			}
+
+			.editor-content-view ul,
+			.editor-content-view ol {
+				padding-left: 20px;
+			}
+
+			.editor-content-view input[type="checkbox"] {
+				margin-right: 5px;
+			}
+
+			div[data-w-e-type = 'video']{
+				text-align: center;
+			}  
 		</style>
 	</body>
 	<script>
@@ -47,15 +94,6 @@
 		}else {
 			note = '<p>'+text+'</p>';
 		}
-		var { createEditor, createToolbar, IEditorConfig, uploadImage } = window.wangEditor;
-		var editorConfig = {
-		}
-		editorConfig.readOnly = true
-		var editor = createEditor({
-			selector: '#editor-container',
-			config: editorConfig,
-			html:note,
-			mode: 'default'
-		});
+		$('#editor-content-view').html(note);
 	</script>
 </html>
\ No newline at end of file