Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r35974 -r36171
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 35974)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 36171)
@@ -4997,10 +4997,143 @@
 	return t;
 }
 
+function godownOutToSupplyRoomConfigFun(printSummaryObj, print2column) {
+	doGetLodop();
+	var myObj = {
+		headerContent : [
+			// 标题
+			{label : "消毒供应中心领用单", dataIndex : '', fontSize : 14, position : ["10","35%","99%",5]},
+			{label : "领用科室:   ", dataIndex : 'depart', fontSize : 11, position : ["50","5mm","50%",5]},
+			{label : "领用时间:   ", dataIndex : 'time', fontSize : 11, position : ["50","50%","50%",5]},
+			{label : "发货仓库:   ", dataIndex : '', fontSize : 11, position : ["70","5mm","50%",5]},
+			{label : "操作人:   ", dataIndex : 'operator', fontSize : 11, position : ["70","50%","50%",5]}
+		],
+		currentPageNumber : {label : "第#页", fontSize : 11, position : ["27.5cm","75%","90%",5]},
+		totalPageAmount : {label : "共&页", fontSize : 11, position : ["27.5cm","81%","90%",5]},
+		goodsTable :{
+			rowHeight : 25,
+			position : ["100","5mm","95%","24cm"],
+			headRepeat : true,	   
+			donotPrintTotal:false,     	
+			content : [
+				{header : "序号", dataIndex : 'serialNumber', width : 40, align : 'center', fontSize : 11},
+				{header : "名称", dataIndex : 'name', width : 90, align : 'center', fontSize : 11},
+				{header : "规格", dataIndex : 'specification', width : 100, align : 'center', fontSize : 11},
+				{header : "数量", dataIndex : 'amount', width : 50, align : 'right', fontSize : 11},
+				{header : "单价", dataIndex : 'cost', width : 50, align : 'right', fontSize : 11},
+				{header : "批次", dataIndex : 'batchNumber', width : 90, align : 'center', fontSize : 11},
+				{header : "金额", dataIndex : 'totalCost', width : 90, align : 'center', fontSize : 11}
+			]
+		},
+		footer: {
+			fontSize : 16,
+			content : [
+				{label : "   收货人:      ", dataIndex : ''},
+				{label : "   发货日期:", dataIndex : ''}
+			]
+		}
+	}
+	LODOP.SET_PRINT_STYLE("ItemType",0);
+	logPrintTousse(printSummaryObj, printSummaryObj.barcode);
+	// 打印表头的内容
+	if (!isObjEmpty(myObj.headerContent)) {
+		for (var i = 0; i < myObj.headerContent.length; i++) {
+			var item = myObj.headerContent[i];
+			var text = item.label;
+			LODOP.SET_PRINT_STYLE("FontSize", item.fontSize);
+			LODOP.ADD_PRINT_TEXT(item.position[0], item.position[1], item.position[2], item.position[3], text);
+		}
+	}
+
+	if (!isObjEmpty(myObj.goodsTable)) {
+		// 打印物品表格
+		// 打印表格头
+		var tableHtml = "<table border =0 cellspacing=0 cellpadding=0 style='border-collapse:collapse' bordercolor='#000000'>";
+		tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight, myObj.goodsTable.fontSize);
+		for (var i = 0; i < myObj.goodsTable.content.length; i++) {
+			var item = myObj.goodsTable.content[i];
+
+			tableHtml += "<td align='center' width ='" + item.width + "' style='BORDER: #000000 1px solid'>" + item.header + "</td>";
+		}
+		tableHtml += "</tr>";
+		// 打印物品内容行
+		var columnCount = myObj.goodsTable.content.length;
+		var page = printSummaryObj.pages[printSummaryObj.pageIndex];
+		var rows = page.rows;
+		if (rows != null && rows.length > 0) {
+			for (var k = 0; k < rows.length; k++) {
+				var row = rows[k];
+				tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight, myObj.goodsTable.fontSize);
+
+				for (var i = 0; i < columnCount; i++) {
+					var item = myObj.goodsTable.content[i];
+
+					var value = row[item.dataIndex];
+
+					if (value == undefined || value == 'undefined') {
+						value = "";
+					}
+
+					if (item.dataIndex == 'cost' || item.dataIndex == "totalCost") {
+						value = formatMoney(value);
+					}
+
+					if(item.dataIndex == 'cost' && k == (rows.length-1)){
+						value = "";
+					}
+
+					if (item.dataIndex == 'goodsName' && sstsConfig.enableDisposableGoodsFullCaseApplicationAmount) {
+						if (row.goodsAmount % row.fullCaseApplicationAmount == 0) {
+							tableHtml += "<td align=" + item.align + " style='BORDER: #000000 1px solid'><img style='vertical-align:middle;' src='" + WWWROOT + "/images/star.png' />" + value + "&nbsp</td>";
+						} else {
+							tableHtml += "<td align=" + item.align + " style='BORDER: #000000 1px solid'>" + value + "&nbsp</td>";
+						}
+					} else {
+						tableHtml += "<td align=" + item.align + " style='BORDER: #000000 1px solid'>" + value + "&nbsp</td>";
+					}
+				}
+
+				tableHtml += "</tr>";
+			}
+		}
+
+		// 打印页脚信息
+		tableHtml = appendTableRowString(tableHtml, myObj.footer.rowHeight, myObj.footer.fontSize)
+		tableHtml += "<td colspan = " + columnCount + ">";
+		var text = "";
+
+		for (var i = 0; i < myObj.footer.content.length; i++) {
+			var item = myObj.footer.content[i];
+			text += item.label;
+			if (item.dataIndex != '') {
+
+				var temp = printSummaryObj[item.dataIndex];
+				if (temp != null && temp != '' && typeof temp != 'undefined') {
+
+					// 日期字符串格式化
+					if (item.label.indexOf("日期") > 0) {
+						temp = temp.substring(0, 10);
+					}
+
+					text += temp;
+				}
+			}
+
+		}
+		tableHtml += "<pre style='white-space: pre-wrap;word-wrap: break-word;'>" + text;
+		tableHtml += "   第" + page.pageNumber + "页/共" + printSummaryObj.pageAmount + "页";
+		tableHtml += "</pre></td></tr>";
+
+		tableHtml += "</table>";
+
+		LODOP.ADD_PRINT_TABLE(myObj.goodsTable.position[0], myObj.goodsTable.position[1], myObj.goodsTable.position[2], myObj.goodsTable.position[3], tableHtml);
+	}
+}
+
 //打印消毒供应中心领用单
 function printGodownOutToSupplyRoom(obj, printType) {
-	formTypeOfPrinted = 'godownOutToSupplyRoomConfig';
-	print(obj);
+	godownOutToSupplyRoomConfigFun(obj);
+
 	if (printType == 0) {//直接打印
 		LODOP.PRINT();
 	} else {//打印预览