Index: ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js
===================================================================
diff -u -r13225 -r13232
--- ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js	(.../printConfig.js)	(revision 13225)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js	(.../printConfig.js)	(revision 13232)
@@ -675,8 +675,10 @@
 	if(materials != null && materialsAmount > 0){
 		var materialStr = "";
 		var fontSize = 10;
-		var rows = Math.ceil(materialsAmount / 3) ; // 向上取整
-		if ( rows > 13){
+		var rows = Math.ceil(materialsAmount / 2) ; // 向上取整
+		if ( rows >= 23){
+			fontSize = 6;
+		}else if(rows >= 18){
 			fontSize = 8;
 		}
 		else if (rows >= 12){
@@ -692,10 +694,10 @@
 			fontSize = 10;
 		}
 //		alert(fontSize)
-		materialStr += "<td width='200px' style='font-size: " + fontSize + "px;'>名称</td>";
-		materialStr += "<td width='100px' style='font-size: " + fontSize + "px;'>数量</td>";
-		materialStr += "<td width='200px' style='font-size: " + fontSize + "px;'>名称</td>";
-		materialStr += "<td width='100px' style='font-size: " + fontSize + "px;'>数量</td>";
+		materialStr += "<td align='left' width='250px' style='font-weight:bold;font-size: " + fontSize + "px;'>名称</td>";
+		materialStr += "<td align='left' width='50px' style='font-weight:bold;font-size: " + fontSize + "px;'>数量</td>";
+		materialStr += "<td align='left' width='250px' style='font-weight:bold;font-size: " + fontSize + "px;'>名称</td>";
+		materialStr += "<td align='left' width='50px' style='font-weight:bold;font-size: " + fontSize + "px;'>数量</td>";
 		materialStr += "#;";
 		for (var i=0;i<materialsAmount;i++){
 			
@@ -709,8 +711,8 @@
 //			if (material.specification != null && material.specification != ""){
 //				temp += "[" + material.specification + "]";
 //			}
-			materialStr += "<td width='200px' style='font-size: " + fontSize + "px;'>" + temp + "</td>";
-			materialStr += "<td width='100px' style='font-size: " + fontSize + "px;'>" + material.count + "</td>";
+			materialStr += "<td align='left' width='250px' style='font-size: " + fontSize + "px;'>" + temp + "</td>";
+			materialStr += "<td align='left' width='50px' style='font-size: " + fontSize + "px;'>" + material.count + "</td>";
 		}
 		if (materialsAmount % 2 != 0) {
 			for (var i = 0; i < (2 - materialsAmount % 2); i++) {
@@ -719,17 +721,17 @@
 		}
 		
 		if (materialStr.length > 0) {
-			materialsTab += "<table id= 'materialsTable' border=" + borderSize + " cellspacing=0 cellpadding=0 style='width: 60mm; height: 70mm;overflow:hidden'>";
+			materialsTab += "<table id= 'materialsTable' border=" + borderSize + " cellspacing=0 cellpadding=0 style='overflow:hidden'>";
 			var materialArray = materialStr.split("#;");
 			for (var i=0; i<materialArray.length; i++) {
-				materialsTab += "<tr>"
+				materialsTab += "<tr height='5px'>"
 						+ materialArray[i] + "</tr>";
 			}
 			materialsTab += "</table>";
 		}
 		
 	}
-	alert(materialsTab)
+	//alert(materialsTab)
 	return materialsTab;
 }
 
@@ -742,20 +744,24 @@
 	LODOP.SET_PRINT_STYLE('FontSize', 6);
 	LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true);
 	
-	LODOP.ADD_PRINT_TEXT("0mm","0mm","RightMargin:60mm","BottomMargin:0mm", obj.name);
+	LODOP.ADD_PRINT_TEXT("3mm","1mm","40mm","60px", obj.name);
 	setFontSizeBold(11,1);// 设置字体
 	setAlignment('center');// 对齐
+	var base = 0;
+	if(obj.name.length > 16){
+		base = 5;
+	}
 	
-	LODOP.ADD_PRINT_TEXT("15mm","1mm","30mm","10px", "操作员:"+obj.operator);
-	LODOP.ADD_PRINT_TEXT("20mm","1mm","30mm","10px", "炉号/炉次:"+obj.reviewer);
-	LODOP.ADD_PRINT_TEXT("25mm","1mm","30mm","10px", "灭菌日期:"+obj.sterilizationDate);
-	LODOP.ADD_PRINT_TEXT("30mm","1mm","30mm","10px", "失效日期:"+obj.validDate);
-	LODOP.ADD_PRINT_TEXT("35mm","1mm","30mm","10px", "包装:"+obj.validDate);
-	LODOP.ADD_PRINT_TEXT("40mm","1mm","30mm","10px", "核对:"+obj.validDate);
+	LODOP.ADD_PRINT_TEXT((base + 15) + "mm","5mm","27mm","10px", "操作员:"+obj.operator);
+	LODOP.ADD_PRINT_TEXT((base + 19) + "mm","5mm","27mm","10px", "炉号/炉次:"+obj.frequency);
+	LODOP.ADD_PRINT_TEXT((base + 23) + "mm","5mm","27mm","10px", "灭菌日期:"+obj.sterilizationDate);
+	LODOP.ADD_PRINT_TEXT((base + 27) + "mm","5mm","27mm","10px", "失效日期:"+obj.validDate);
+	LODOP.ADD_PRINT_TEXT((base + 31) + "mm","5mm","27mm","10px", "包装:"+obj.packageTypeAbbreviation);
+	LODOP.ADD_PRINT_TEXT((base + 35) + "mm","5mm","27mm","10px", "核对:"+obj.reviewer);
 	
 	// 打印表格
 	var tableStr = getMaterialsTabHtml_largeLabel(obj);
-	addPrintTable(tableStr,"0mm","40mm","RightMargin:0mm","70mm");
+	addPrintTable(tableStr,"3mm","40mm","RightMargin:1mm","65mm");
 	setAlignment('center');// 居中对齐
 	
 	//LODOP.ADD_PRINT_TEXT("58mm","0mm","RightMargin:50mm","BottomMargin:0mm", "灭菌程序:"+obj.sterilingType);