Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperationDetailReportView.js
===================================================================
diff -u -r37688 -r37702
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperationDetailReportView.js (.../tousseOperationDetailReportView.js) (revision 37688)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperationDetailReportView.js (.../tousseOperationDetailReportView.js) (revision 37702)
@@ -2,11 +2,13 @@
var form;
var myMask;
var is2Column = false;
+var widthArr = [];
function getTableHtml(data) {
var title = '';
var queryMode = Ext.getCmp('queryMode').getValue();
var titleArr = [];
+ widthArr = [];
if (queryMode == '明细查询') {
title = '器械包流转明细查询报表';
is2Column = false;
@@ -79,6 +81,7 @@
dataIndex: 'noOperationRecord',
width: 140
}];
+ widthArr = []
} else if (queryMode == '汇总查询') {
title = '器械包流转汇总查询报表';
is2Column = false;
@@ -178,6 +181,7 @@
} else {
var width = titleArr[i].width;
var title = titleArr[i].title;
+ widthArr.push(width);
html += "
" + title + " | ";
}
}
@@ -189,6 +193,7 @@
for (var j = 0; j < children.length; j++) {
var width = children[j].width;
var title = children[j].title;
+ widthArr.push(width);
html += "" + title + " | ";
}
}
@@ -199,11 +204,14 @@
for (var i = 0; i < titleArr.length; i++) {
var width = titleArr[i].width;
var title = titleArr[i].title;
+ widthArr.push(width);
html += "" + title + " | ";
}
html += "";
}
html += "";
+ document.getElementById('thisIframe').contentWindow.document.getElementById('widthStr').value = widthArr.join(',');
+ document.getElementById('thisIframe').contentWindow.document.getElementById('is2Column').value = is2Column;
return html;
}
Index: ssts-web/src/main/webapp/homepage/exportMonitorData.jsp
===================================================================
diff -u -r37647 -r37702
--- ssts-web/src/main/webapp/homepage/exportMonitorData.jsp (.../exportMonitorData.jsp) (revision 37647)
+++ ssts-web/src/main/webapp/homepage/exportMonitorData.jsp (.../exportMonitorData.jsp) (revision 37702)
@@ -177,10 +177,14 @@
if(widthStr !== ''){
widthArr = widthStr.split(',');
}
+ var newIs2Column = false;
+ if(is2Column == true || is2Column == 'true'){
+ newIs2Column = true;
+ }
XSExport.excelExport(
document.getElementById('table'),
title,
- is2Column || false,
+ newIs2Column,
widthArr || []
);
}