Index: ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/print/printConfig.js
===================================================================
diff -u -r34527 -r34598
--- ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/print/printConfig.js	(.../printConfig.js)	(revision 34527)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/print/printConfig.js	(.../printConfig.js)	(revision 34598)
@@ -1321,20 +1321,28 @@
 //供应室出库统计表
 var monthlyReportByDeptConfig = {
 	title:{
-		label : "供应室出库统计表", fontSize : 20
+		label : "供应室出库统计表", 
+		fontSize : 20,
+		top:30,
+		left:0
 	},
 	pageSize:['21.8cm','14cm'],
 	header : [
 		// 页眉
 		{
 			label: '统计日期：',
-			left: 0,
 			dataIndex: "date",
-			top: 0
+			left: 15,
+			top: 85
 		}, {
-			label: '第#页 / 共&页',
-			left: 620,
-			top: 0
+			label: '科室：',
+			dataIndex: "depart",
+			left: 500,
+			top: 85
+		}, {
+			label: '<label tdata="pageNO">第 ## 页</label> / <label tdata="pageCount">共 ## 页</label>',
+			left: 640,
+			top: 85
 		}
 	],
 	goodsTable :{
@@ -1343,11 +1351,6 @@
 		tableWidth:750,
 		columns: [{
 			align: "center",
-			dataIndex: "depart",
-			header: "科室",
-			width: 100
-		}, {
-			align: "center",
 			dataIndex: "externalCode",
 			header: "物资编码",
 			width: 85
@@ -1391,23 +1394,23 @@
 	footer:[{
 		label: '发货人：',
 		dataIndex: "sender",
-		left: 0,
-		top: 0
+		left: 15,
+		top: 450
 	}, {
 		label: '收货人：',
 		dataIndex: "",
 		left: 205,
-		top: 0
+		top: 450
 	}, {
 		label: '制单人：',
 		dataIndex: "printUser",
 		left: 390,
-		top: 0
+		top: 450
 	}, {
 		label: '打印时间：',
 		dataIndex: "printData",
 		left: 555,
-		top: 0
+		top: 450
 	}]
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
===================================================================
diff -u -r34470 -r34598
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 34470)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 34598)
@@ -7,30 +7,113 @@
 var departMode;
 var ALL = '全部';
 var newPrintConfig;
-function getHtml(obj, pageIndex, pageSize) {
-	var titleName = '供应室出库统计表';
-	var titleSize = 15;
+
+//页眉
+function getHeaderHtml(depart) {
+	var startTime = Ext.getCmp('startTime').getRawValue();
+	var endTime = Ext.getCmp('endTime').getRawValue();
+	var startDateAndEndDate = startTime + ' 至 ' + endTime;
 	var headerArr = [{
 		label: '统计日期：',
 		dataIndex: "date",
-		left: 0,
-		top: 0
+		left: 15,
+		top: 85
 	}, {
-		label: '第' + pageIndex + '页 / 共' + pageSize + '页',
-		left: 675,
-		top: 0
+		label: '科室：',
+		dataIndex: "depart",
+		left: 500,
+		top: 85
+	}, {
+		label: '<label tdata="pageNO">第 ## 页</label> / <label tdata="pageCount">共 ## 页</label>',
+		left: 640,
+		top: 85
 	}];
+	if (newPrintConfig && newPrintConfig.header) {
+		headerArr = newPrintConfig.header;
+	}
+	for (var k = 0; k < headerArr.length; k++) {
+		var value = headerArr[k].label;
+		if (headerArr[k].dataIndex == 'depart') {
+			value = headerArr[k].label + depart;
+		} else if (headerArr[k].dataIndex == 'date') {
+			value = headerArr[k].label + startDateAndEndDate;
+		}
+		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);
+		}
+	}
+}
+
+//页脚
+function getFooterHtml() {
+	var footerArr = [{
+		label: '发货人：',
+		dataIndex: "sender",
+		left: 15,
+		top: 450
+	}, {
+		label: '收货人：',
+		dataIndex: "",
+		left: 205,
+		top: 450
+	}, {
+		label: '制单人：',
+		dataIndex: "printUser",
+		left: 390,
+		top: 450
+	}, {
+		label: '打印时间：',
+		dataIndex: "printData",
+		left: 555,
+		top: 450
+	}];
+	if (newPrintConfig && newPrintConfig.footer) {
+		footerArr = newPrintConfig.footer;
+	}
+	for (var k = 0; k < footerArr.length; k++) {
+		var value = '';
+		if (footerArr[k].dataIndex == 'sender') {
+			value = currentUserFullName
+		} else if (footerArr[k].dataIndex == 'printUser') {
+			value = currentUserFullName
+		} else if (footerArr[k].dataIndex == 'printData') {
+			var dt = new Date();
+			value = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/" + dt.getDate();
+		}
+		LODOP.ADD_PRINT_HTM(footerArr[k].top, footerArr[k].left, "90%", 30, footerArr[k].label + value);
+		LODOP.SET_PRINT_STYLEA(0, "ItemType", 1);
+		LODOP.SET_PRINT_STYLEA(0, "LinkedItem", 1);
+	}
+}
+
+//标题
+function getTitleHtml(title) {
+	var titleName = title;
+	var titleSize = 15;
+	var top = 30;
+	var left = 0;
+	if (newPrintConfig && newPrintConfig.title) {
+		titleSize = newPrintConfig.title.fontSize || 15;
+		top = newPrintConfig.title.top || 15;
+		left = newPrintConfig.title.left || 15;
+	}
+	var titleHtml = '<p style="font-family: SansSerif;color: #000000;font-size: ' + titleSize + 'px;font-weight: bold;text-align: center;">' + titleName + '</p>';
+	LODOP.ADD_PRINT_HTM(top, left, "100%", 30, titleHtml);
+	LODOP.SET_PRINT_STYLEA(0, "ItemType", 1);
+	LODOP.SET_PRINT_STYLEA(0, "LinkedItem", 1);
+}
+
+function getHtml(obj) {
 	var goodsTable = {
 		fontSize: 14,
 		rowHeight: 30,
 		tableWidth: 800,
 		columns: [{
 			align: "center",
-			dataIndex: "depart",
-			header: "科室",
-			width: 100
-		}, {
-			align: "center",
 			dataIndex: "externalCode",
 			header: "物资编码",
 			width: 100
@@ -71,61 +154,13 @@
 			width: 80
 		}]
 	};
-	var footerArr = [{
-		label: '发货人：',
-		dataIndex: "sender",
-		left: 0,
-		top: 0
-	}, {
-		label: '收货人：',
-		dataIndex: "",
-		left: 205,
-		top: 0
-	}, {
-		label: '制单人：',
-		dataIndex: "printUser",
-		left: 390,
-		top: 0
-	}, {
-		label: '打印时间：',
-		dataIndex: "printData",
-		left: 555,
-		top: 0
-	}];
-	var startTime = Ext.getCmp('startTime').getRawValue();
-	var endTime = Ext.getCmp('endTime').getRawValue();
-	var startDateAndEndDate = startTime + ' 至 ' + endTime;
-	if (newPrintConfig) {
-		if (newPrintConfig.title) {
-			titleName = newPrintConfig.title.label || '';
-			titleSize = newPrintConfig.title.fontSize || 15;
-		}
-		if (newPrintConfig.goodsTable) {
-			goodsTable = newPrintConfig.goodsTable;
-		}
-		if (newPrintConfig.header) {
-			for (var k = 0; k < newPrintConfig.header.length; k++) {
-				newPrintConfig.header[k].label = newPrintConfig.header[k].label.replace('#', pageIndex);
-				newPrintConfig.header[k].label = newPrintConfig.header[k].label.replace('&', pageSize);
-			}
-			headerArr = newPrintConfig.header;
-		}
-		if (newPrintConfig.footer) {
-			footerArr = newPrintConfig.footer;
-		}
+
+	if (newPrintConfig && newPrintConfig.goodsTable) {
+		goodsTable = newPrintConfig.goodsTable;
 	}
 	var tableWidth = goodsTable.tableWidth;
-	var html = '<p style="font-family: SansSerif;color: #000000;font-size: ' + titleSize + 'px;font-weight: bold;text-align: center;">' + titleName + '</p>';
-	html += '<div style="width:' + tableWidth + 'px;margin:0 auto;position: relative;height:30px;line-height: 30px;">';
-	for (var k = 0; k < headerArr.length; k++) {
-		var value = headerArr[k].label;
-		if (headerArr[k].dataIndex == 'date') {
-			value = headerArr[k].label + startDateAndEndDate;
-		}
-		html += '<span style="position: absolute;left:' + headerArr[k].left + 'px;top:' + headerArr[k].top + 'px">' + value + '</span>';
-	}
-	html += '</div>';
-	html += '<div style="width:' + tableWidth + 'px;margin:0 auto;text-align:center">';
+
+	var html = '<div style="width:' + tableWidth + 'px;margin:0 auto;text-align:center">';
 	html += '<table border="0" width="' + tableWidth + 'px" style="empty-cells:show; border-collapse:collapse;margin:0 auto" cellspacing=0 cellpadding=0>';
 	html += '<thead>';
 	html += '<tr>';
@@ -137,11 +172,7 @@
 	html += '<tbody>';
 	for (var k = 0; k < obj.items.length; k++) {
 		html += '<tr>';
-		if (k == 0) {
-			var dataIndex = goodsTable.columns[0].dataIndex;
-			html += '<td align="center" style="height:' + (goodsTable.rowHeight || 30) + 'px;font-size:' + (goodsTable.fontSize || 14) + 'px;border: 1px solid #000;word-break: break-all;" rowspan="' + (obj.items.length + 1) + '">' + obj[dataIndex] + '</td>';
-		}
-		for (var m = 1; m < goodsTable.columns.length; m++) {
+		for (var m = 0; m < goodsTable.columns.length; m++) {
 			var dataIndex = goodsTable.columns[m].dataIndex;
 			var value = obj.items[k][dataIndex] || '';
 			if (dataIndex == 'price' || dataIndex == 'settlementPrice') {
@@ -160,7 +191,7 @@
 		html += '</tr>';
 	}
 	html += '<tr>';
-	html += '<td align="left" style="height:' + (goodsTable.rowHeight || 30) + 'px;font-size:' + (goodsTable.fontSize || 14) + 'px;border: 1px solid #000;word-break: break-all;padding-left: 10px;" colspan="' + (goodsTable.columns.length - 2) + '">合计：</td>';
+	html += '<td align="left" style="height:' + (goodsTable.rowHeight || 30) + 'px;font-size:' + (goodsTable.fontSize || 14) + 'px;border: 1px solid #000;word-break: break-all;padding-left: 10px;" colspan="' + (goodsTable.columns.length - 1) + '">合计：</td>';
 	var totalPrice = 0;
 	if (obj.totalPrice == '') {
 		totalPrice = 0;
@@ -172,21 +203,8 @@
 	html += '</tbody>';
 	html += '</table>';
 	html += '</div>';
-	html += '<div style="width:' + tableWidth + 'px;margin:0 auto;position: relative;height:30px;line-height: 30px;">';
-	for (var k = 0; k < footerArr.length; k++) {
-		var value = '';
-		if (footerArr[k].dataIndex == 'sender') {
-			value = currentUserFullName
-		} else if (footerArr[k].dataIndex == 'printUser') {
-			value = currentUserFullName
-		} else if (footerArr[k].dataIndex == 'printData') {
-			var dt = new Date();
-			value = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/" + dt.getDate();
-		}
-		html += '<span style="position: absolute;left:' + footerArr[k].left + 'px;top:' + footerArr[k].top + 'px">' + footerArr[k].label + value + '</span>';
-	}
-	html += '</div>';
-	return html;
+	LODOP.ADD_PRINT_TABLE(100, 10, "90%", '10cm', html);
+	LODOP.SET_PRINT_STYLEA(0, "Vorient", 3);
 }
 
 Ext.onReady(function () {
@@ -1112,16 +1130,20 @@
 						if (result.data.length > 0) {
 							doGetLodop();
 							newPrintConfig = printConfig.monthlyReportByDept;
-							if (newPrintConfig && newPrintConfig.pageSize) {
-								LODOP.SET_PRINT_PAGESIZE(1, newPrintConfig.pageSize[0], newPrintConfig.pageSize[1], '');
-							} else {
-								LODOP.SET_PRINT_PAGESIZE(1, '21.8cm', '14cm', '');
-							}
+							var title = result.parametMap.title || '';
+							getTitleHtml(title);
 							for (var i = 0; i < result.data.length; i++) {
-								var html = getHtml(result.data[i], (i + 1), result.data.length);
-								LODOP.ADD_PRINT_HTM(10, 10, "95%", "100%", "<body leftmargin='8px' topmargin=0>" + html + "</body>");
-								LODOP.PRINT();
+								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]);
+								LODOP.NewPageA();
 							}
+							LODOP.PREVIEW();
 						} else {
 							showResult('暂无数据！');
 						}