Index: ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/print/printConfig.js
===================================================================
diff -u -r34598 -r34603
--- ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/print/printConfig.js (.../printConfig.js) (revision 34598)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/print/printConfig.js (.../printConfig.js) (revision 34603)
@@ -1337,7 +1337,7 @@
}, {
label: '科室:',
dataIndex: "depart",
- left: 500,
+ left: 430,
top: 85
}, {
label: ' / ',
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
===================================================================
diff -u -r34598 -r34603
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 34598)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 34603)
@@ -33,18 +33,19 @@
}
for (var k = 0; k < headerArr.length; k++) {
var value = headerArr[k].label;
+ var top = headerArr[k].top;
if (headerArr[k].dataIndex == 'depart') {
value = headerArr[k].label + depart;
+ top = top + 10 ;
} else if (headerArr[k].dataIndex == 'date') {
value = headerArr[k].label + startDateAndEndDate;
+ top = top - 13 ;
+ }else {
+ top = top + 33 ;
}
- if (headerArr[k].dataIndex !== 'depart') {
- LODOP.ADD_PRINT_HTM(headerArr[k].top, headerArr[k].left, "90%", 40, value);
- LODOP.SET_PRINT_STYLEA(0, "ItemType", 1);
- LODOP.SET_PRINT_STYLEA(0, "LinkedItem", 1);
- } else {
- LODOP.ADD_PRINT_HTM(headerArr[k].top - 10, headerArr[k].left, "90%", 40, value);
- }
+ LODOP.ADD_PRINT_HTM(top, headerArr[k].left, "90%", 40, value);
+ LODOP.SET_PRINT_STYLEA(0, "ItemType", 1);
+ LODOP.SET_PRINT_STYLEA(0, "LinkedItem", -1);
}
}
@@ -1129,18 +1130,18 @@
var result = Ext.decode(response.responseText);
if (result.data.length > 0) {
doGetLodop();
+ if (newPrintConfig && newPrintConfig.pageSize) {
+ LODOP.SET_PRINT_PAGESIZE(1, newPrintConfig.pageSize[0], newPrintConfig.pageSize[1], '');
+ } else {
+ LODOP.SET_PRINT_PAGESIZE(1, '21.8cm', '14cm', '');
+ }
newPrintConfig = printConfig.monthlyReportByDept;
var title = result.parametMap.title || '';
getTitleHtml(title);
for (var i = 0; i < result.data.length; i++) {
- if (newPrintConfig && newPrintConfig.pageSize) {
- LODOP.SET_PRINT_PAGESIZE(1, newPrintConfig.pageSize[0], newPrintConfig.pageSize[1], '');
- } else {
- LODOP.SET_PRINT_PAGESIZE(1, '21.8cm', '14cm', '');
- }
- getHeaderHtml(result.data[i].depart);
getFooterHtml();
getHtml(result.data[i]);
+ getHeaderHtml(result.data[i].depart);
LODOP.NewPageA();
}
LODOP.PREVIEW();