Index: ssts-web/src/main/webapp/disinfectsystem/config/gd2zyy/print/printConfig.js
===================================================================
diff -u -r17099 -r17194
--- ssts-web/src/main/webapp/disinfectsystem/config/gd2zyy/print/printConfig.js	(.../printConfig.js)	(revision 17099)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gd2zyy/print/printConfig.js	(.../printConfig.js)	(revision 17194)
@@ -166,7 +166,7 @@
     printOrder : 1, // 1:优先打印一次性物品， 2：优先打印器械包
     // 在器械包和一次性物品不合并打印的情况下，消毒物品打印方式：
     // 1：优先与一次性物品合并打印，如果无一次性物品则与器械包合并打印， 2：优先与器械包一起合并打印，如果没有器械包则与一次性物品合并打印 ，3：单独打印
-    disinfectGoodsPrintMode : 2,
+    disinfectGoodsPrintMode : 3,
     rowsPerPage :16,
         headerContent : [
             // 标题
@@ -816,16 +816,16 @@
 	
 	LODOP.ADD_PRINT_TEXT("6mm","5mm","50mm","10px", "装配员:"+obj.operator);
 	setFontSizeBold(11,1);// 设置字体
-	LODOP.ADD_PRINT_TEXT("6mm","55mm","50mm","10px", "审核员:"+obj.reviewer);
+	LODOP.ADD_PRINT_TEXT("6mm","52mm","50mm","10px", "审核员:"+obj.reviewer);
 	setFontSizeBold(11,1);// 设置字体
 	LODOP.ADD_PRINT_TEXT("11mm","5mm","50mm","10px", "灭菌日期:"+obj.sterilizationDate);
 	setFontSizeBold(11,1);// 设置字体
-	LODOP.ADD_PRINT_TEXT("11mm","55mm","50mm","10px", "失效日期:"+obj.validDate);
+	LODOP.ADD_PRINT_TEXT("11mm","52mm","50mm","10px", "失效日期:"+obj.validDate);
 	setFontSizeBold(11,1);// 设置字体
 	
 	// 打印表格
 	var tableStr = getMaterialsTabHtml_largeLabel_gd2zyy(obj);
-	addPrintTable(tableStr,"16mm","0mm","RightMargin:0mm","44mm");
+	addPrintTable(tableStr,"16mm","3mm","RightMargin:0mm","44mm");
 	setAlignment('center');// 居中对齐
 	
 	LODOP.ADD_PRINT_TEXT("58mm","0mm","RightMargin:50mm","BottomMargin:0mm", "灭菌程序:"+obj.sterilingType);
@@ -916,23 +916,23 @@
 	
 	var fontSize = getFontSizeByStr(obj.name,[
 		                                        {maxLen:10,fontSize:10},
-		                                  		{maxLen:20,fontSize:6},
+		                                  		{maxLen:20,fontSize:9},
 		                                		{maxLen:1000,fontSize:4}
 		                                  		]);
 	LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","5mm", obj.name);
-	setFontSizeBold(fontSize,1);// 设置字体
+	setFontSizeBold(fontSize,7);// 设置字体
 	setAlignment('center');// 对齐
 
 	LODOP.ADD_PRINT_TEXT("1mm","1mm","20mm","4mm", obj.virtualBasketSeqNum);
-	setFontSizeBold(10,0);// 设置字体
+	setFontSizeBold(8,0);// 设置字体
 	LODOP.ADD_PRINT_TEXT("6mm","1mm","34mm","6mm", "灭菌:"+obj.sterilizationDate);
 	setFontSizeBold(10,0);// 设置字体
 	LODOP.ADD_PRINT_TEXT("6mm","30mm","30mm","6mm", "装配:"+obj.operator);
-	setFontSizeBold(10,0);// 设置字体
+	setFontSizeBold(8,0);// 设置字体
 	LODOP.ADD_PRINT_TEXT("12mm","1mm","34mm","6mm", "失效:"+obj.validDate);
 	setFontSizeBold(10,0);// 设置字体
 	LODOP.ADD_PRINT_TEXT("12mm","30mm","30mm","6mm", "审核:"+obj.reviewer);
-	setFontSizeBold(10,0);// 设置字体
+	setFontSizeBold(8,0);// 设置字体
 	
 	LODOP.ADD_PRINT_BARCODE("17mm","10mm","30mm","10mm","128Auto", obj.barcode);// 条码1
 }