Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r33422 -r33429
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 33422)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 33429)
@@ -4859,84 +4859,87 @@
 
 //打印待接收外来器械包
 function printForeignTousseForReceived(printObj, printType) {
-	var data = printObj.data;
 	var configObj = printConfig.printForeignTousseForReceived;
 	if (isUndefinedOrNullOrEmpty(configObj)) {
 		var msg = '未找到(printForeignTousseForReceived)的打印配置';
 		showResult(msg);
 		return;
 	}
 	doGetLodop();
-	LODOP.PRINT_INIT("");
-	setPrinterByConfig();
-	LODOP.SET_PRINT_STYLE("ItemType", 4);
-	LODOP.SET_PRINT_PAGESIZE(1, '297mm', '210mm', "");
-	if (!isObjEmpty(configObj.headerFooter)) {
-		var label = configObj.headerFooter[0].label;
-		var fontSize = configObj.headerFooter[0].fontSize;
-		var position = configObj.headerFooter[0].position;
-		var headHtml = "<p style='font-size:" + fontSize + "px;text-align: center;'><b>" + label + "</b></p>";
-		LODOP.ADD_PRINT_HTM(position[0], position[1], position[2], position[3], headHtml);
-		var headHtml1 = "<p style='font-size:16px;text-align: center;'>" + printObj.startDate + " - " + printObj.endDate + "</p>";
-		LODOP.ADD_PRINT_HTM(50, 20, "95%", 50, headHtml1);
-	}
-	if (!isObjEmpty(configObj.goodsTable)) {
-		var tableHtml = "<table border='1' cellspacing=0 cellpadding=0 style='border-collapse:collapse;font-size:16px;margin:0px auto;width:100%' bordercolor='#000000'>";
-		var rowHeight = configObj.goodsTable.rowHeight;
-		var fontSize = configObj.goodsTable.fontSize;
-		tableHtml += "<thead>";
-		tableHtml += "<tr height='" + rowHeight + "px' style='width:100%;font-size: " + fontSize + "px;text-align:center;'>";
-		for (var i = 0; i < configObj.goodsTable.columns.length; i++) {
-			var width = configObj.goodsTable.columns[i].width;
-			var header = configObj.goodsTable.columns[i].header;
-			tableHtml += "<td style='width:" + width + "px;font-size: " + fontSize + "px;'>" + header + "</td>";
+	for (var m = 0; m < printObj.data.length; m++) {
+		var data = printObj.data[m].applicationList;
+		LODOP.PRINT_INIT("");
+		setPrinterByConfig();
+		LODOP.SET_PRINT_STYLE("ItemType", 4);
+		LODOP.SET_PRINT_PAGESIZE(1, '297mm', '210mm', "");
+		if (!isObjEmpty(configObj.headerFooter)) {
+			var label = configObj.headerFooter[0].label;
+			var fontSize = configObj.headerFooter[0].fontSize;
+			var position = configObj.headerFooter[0].position;
+			var headHtml = "<p style='font-size:" + fontSize + "px;text-align: center;'><b>" + label + "</b></p>";
+			LODOP.ADD_PRINT_HTM(position[0], position[1], position[2], position[3], headHtml);
+			var headHtml1 = "<p style='font-size:16px;text-align: center;'>" + printObj.startDate + " - " + printObj.endDate + "</p>";
+			LODOP.ADD_PRINT_HTM(50, 20, "95%", 50, headHtml1);
 		}
-		tableHtml += "</tr>";
-		tableHtml += "</thead>";
-		tableHtml += "<tbody>";
-		var sum = 0;
-		for (var i = 0; i < data.length; i++) {
-			var applicationItems = data[i].applicationItems;
-			for (var k = 0; k < applicationItems.length; k++) {
-				tableHtml += "<tr height='" + rowHeight + "px' style='width:100%;font-size: " + fontSize + "px;text-align:center;'>";
-				for (var j = 0; j < configObj.goodsTable.columns.length; j++) {
-					var width = configObj.goodsTable.columns[j].width;
-					var header = configObj.goodsTable.columns[j].header;
-					var dataIndex = configObj.goodsTable.columns[j].dataIndex;
-					var align = configObj.goodsTable.columns[j].align;
-					var name = '';
-					if (header == '序号') {
-						name = (i + 1);
-						if (k == 0) {
-							tableHtml += "<td style='width:" + width + "px;text-align:" + align + ";font-size: " + fontSize + "px;' rowspan=" + applicationItems.length + ">" + name + "</td>";
-							sum++;
+		if (!isObjEmpty(configObj.goodsTable)) {
+			var tableHtml = "<table border='1' cellspacing=0 cellpadding=0 style='border-collapse:collapse;font-size:16px;margin:0px auto;width:100%' bordercolor='#000000'>";
+			var rowHeight = configObj.goodsTable.rowHeight;
+			var fontSize = configObj.goodsTable.fontSize;
+			tableHtml += "<thead>";
+			tableHtml += "<tr height='" + rowHeight + "px' style='width:100%;font-size: " + fontSize + "px;text-align:center;'>";
+			for (var i = 0; i < configObj.goodsTable.columns.length; i++) {
+				var width = configObj.goodsTable.columns[i].width;
+				var header = configObj.goodsTable.columns[i].header;
+				tableHtml += "<td style='width:" + width + "px;font-size: " + fontSize + "px;'>" + header + "</td>";
+			}
+			tableHtml += "</tr>";
+			tableHtml += "</thead>";
+			tableHtml += "<tbody>";
+			var sum = 0;
+			console.log(data)
+			for (var i = 0; i < data.length; i++) {
+				var applicationItems = data[i].applicationItems;
+				for (var k = 0; k < applicationItems.length; k++) {
+					tableHtml += "<tr height='" + rowHeight + "px' style='width:100%;font-size: " + fontSize + "px;text-align:center;'>";
+					for (var j = 0; j < configObj.goodsTable.columns.length; j++) {
+						var width = configObj.goodsTable.columns[j].width;
+						var header = configObj.goodsTable.columns[j].header;
+						var dataIndex = configObj.goodsTable.columns[j].dataIndex;
+						var align = configObj.goodsTable.columns[j].align;
+						var name = '';
+						if (header == '序号') {
+							name = (i + 1);
+							if (k == 0) {
+								tableHtml += "<td style='width:" + width + "px;text-align:" + align + ";font-size: " + fontSize + "px;' rowspan=" + applicationItems.length + ">" + name + "</td>";
+								sum++;
+							}
+						} else if (dataIndex == 'tousseName' || dataIndex == 'supplier') {
+							name = applicationItems[k][dataIndex] || '';
+							tableHtml += "<td style='width:" + width + "px;text-align:" + align + ";font-size: " + fontSize + "px;'>" + name + "</td>";
+						} else {
+							name = data[i][dataIndex] || '';
+							if (k == 0) {
+								tableHtml += "<td style='width:" + width + "px;text-align:" + align + ";font-size: " + fontSize + "px;' rowspan=" + applicationItems.length + ">" + name + "</td>";
+							}
 						}
-					} else if (dataIndex == 'tousseName' || dataIndex == 'supplier') {
-						name = applicationItems[k][dataIndex] || '';
-						tableHtml += "<td style='width:" + width + "px;text-align:" + align + ";font-size: " + fontSize + "px;'>" + name + "</td>";
-					} else {
-						name = data[i][dataIndex] || '';
-						if (k == 0) {
-							tableHtml += "<td style='width:" + width + "px;text-align:" + align + ";font-size: " + fontSize + "px;' rowspan=" + applicationItems.length + ">" + name + "</td>";
-						}
 					}
+					tableHtml += "</tr>";
 				}
-				tableHtml += "</tr>";
 			}
+			tableHtml += "<tr style='font-size: " + fontSize + "px;text-align:center;'>";
+			tableHtml += "<td style='width:" + configObj.goodsTable.columns[0].width + "px;padding: 5px;'><b>总单数</b></td>";
+			tableHtml += "<td colspan='" + (configObj.goodsTable.columns.length - 1) + "' style='text-align:left;padding-left:10px'>" + sum + "</td>";
+			tableHtml += "</td>";
+			tableHtml += "</tr>";
+			tableHtml += "</tbody>";
 		}
-		tableHtml += "<tr style='font-size: " + fontSize + "px;text-align:center;'>";
-		tableHtml += "<td style='width:" + configObj.goodsTable.columns[0].width + "px;padding: 5px;'><b>总单数</b></td>";
-		tableHtml += "<td colspan='" + (configObj.goodsTable.columns.length - 1) + "' style='text-align:left;padding-left:10px'>" + sum + "</td>";
-		tableHtml += "</td>";
-		tableHtml += "</tr>";
-		tableHtml += "</tbody>";
+		tableHtml += "</table>";
+		LODOP.ADD_PRINT_TABLE(configObj.goodsTable.position[0], configObj.goodsTable.position[1], configObj.goodsTable.position[2], configObj.goodsTable.position[3], tableHtml);
+		if (printType == 0) {//直接打印
+			LODOP.PRINT();
+		} else {//打印预览
+			LODOP.SET_SHOW_MODE("HIDE_PAPER_BOARD", 1);
+			LODOP.PREVIEW();
+		}
 	}
-	tableHtml += "</table>";
-	LODOP.ADD_PRINT_TABLE(configObj.goodsTable.position[0], configObj.goodsTable.position[1], configObj.goodsTable.position[2], configObj.goodsTable.position[3], tableHtml);
-	if (printType == 0) {//直接打印
-		LODOP.PRINT();
-	} else {//打印预览
-		LODOP.SET_SHOW_MODE("HIDE_PAPER_BOARD", 1);
-		LODOP.PREVIEW();
-	}
 }
\ No newline at end of file