Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r34487 -r35159
--- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 34487)
+++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 35159)
@@ -4654,16 +4654,17 @@
function exportReportExcel(data, thisID, is2Column, widthArr) {
var fileName = data.fileName + data.fileType;
if (isIE()) {
+ var iframeName = data.iframeName || 'thisIframe';
var tableHtml = '';
tableHtml += data.html;
tableHtml += '';
tableHtml = Base64.encode(encodeURI(tableHtml));
var htmlTable = LZString.compressToEncodedURIComponent(tableHtml)
var jsFileName = "\\disinfectsystem\\reportforms\\js\\LZString.js";
- document.getElementById('thisIframe').contentWindow.document.getElementById('htmlFileName').value = fileName;
- document.getElementById('thisIframe').contentWindow.document.getElementById('jsFileName').value = jsFileName;
- document.getElementById('thisIframe').contentWindow.document.getElementById('htmlTable').value = htmlTable;
- document.getElementById('thisIframe').contentWindow.document.getElementById('submitForm').click();
+ document.getElementById(iframeName).contentWindow.document.getElementById('htmlFileName').value = fileName;
+ document.getElementById(iframeName).contentWindow.document.getElementById('jsFileName').value = jsFileName;
+ document.getElementById(iframeName).contentWindow.document.getElementById('htmlTable').value = htmlTable;
+ document.getElementById(iframeName).contentWindow.document.getElementById('submitForm').click();
exportMask.hide();
} else {
XSExport.excelExport(
@@ -4812,7 +4813,7 @@
modal: true,
resizable: false,
buttonAlign: 'center',
- id:'wangEditorWin',
+ id: 'wangEditorWin',
items: [{
xtype: "panel",
html: ""
@@ -4855,7 +4856,7 @@
}
//预览富文本内容
-function previewWangEditor(title,id) {
+function previewWangEditor(title, id) {
var url = WWWROOT + '/common/previewWangEditor.jsp?id=' + id;
openModalWindowForExt(url, {}, title + '配包注意事项', 1000, 550);
}
@@ -4889,7 +4890,7 @@
hidden: false,
handler: function () {
var hiddenNote = top.Ext.getCmp('hiddenNote').getValue();
- sessionStorage.setItem('hiddenNote',hiddenNote)
+ sessionStorage.setItem('hiddenNote', hiddenNote)
previewWangEditor(title);
}
}, {
@@ -4899,7 +4900,7 @@
var hiddenNote = top.Ext.getCmp('hiddenNote').getValue();
Ext.Ajax.request({
url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!saveTousseDefinitionNote.do',
- params: {
+ params: {
id: id,
note: hiddenNote
},
@@ -4920,7 +4921,7 @@
var hiddenNote = top.Ext.getCmp('hiddenNote').getValue();
Ext.Ajax.request({
url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!saveTousseDefinitionNote.do',
- params: {
+ params: {
id: id,
note: hiddenNote
},
@@ -4944,17 +4945,17 @@
}]
})
win.show();
- if(id){
+ if (id) {
Ext.Ajax.request({
- url : WWWROOT+'/disinfectSystem/baseData/tousseDefinitionAction!loadTousseDefinitionNote.do',
- params: {
- id:id
+ 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){
+ if (result.data && result.data.note) {
text = result.data.note;
}
top.Ext.getCmp('hiddenNote').setValue(text);