Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
===================================================================
diff -u -r14821 -r14826
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js	(.../printConfig.js)	(revision 14821)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js	(.../printConfig.js)	(revision 14826)
@@ -1192,8 +1192,8 @@
 
 //小标签2配置，77x50mm
 var smallLabel2Config = {
+		customPrint:printSmallLable2_zsyy,
 		// 可带表格线的table定义
-		
 	    table : {
 	    	rules : 'rows',
 	    	style : 'width: 77mm; height: 50mm',
@@ -1238,6 +1238,66 @@
 	    	]
 	    }
 }
+//小标签2打印，77x50mm
+function printSmallLable2_zsyy(obj){
+	doGetLodop();
+	
+	// 划线
+	if(obj.markTousse){
+		LODOP.ADD_PRINT_LINE('17mm','0mm','17mm','77mm',0,1);
+		LODOP.ADD_PRINT_LINE('32mm','0mm','32mm','77mm',0,1);
+	}
+	// 设置默认字体
+	setDefaultFontNameSizeBold('宋体',15,1);
+	// 默认条码属性
+	LODOP.SET_PRINT_STYLE('ShowBarText', true);
+	LODOP.SET_PRINT_STYLE('FontSize', 6);
+	LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true);
+	
+	var fontSize = getFontSizeByStr(obj.name,[
+	                                        {maxLen:5,fontSize:35},
+	                                        {maxLen:8,fontSize:25},
+	                                        {maxLen:10,fontSize:20},
+	                                  		{maxLen:12,fontSize:16},
+	                                		{maxLen:15,fontSize:13},
+	                                		{maxLen:20,fontSize:10},
+	                                		{maxLen:21,fontSize:8},
+	                                		{maxLen:31,fontSize:6},
+	                                		{maxLen:35,fontSize:5},
+	                                		{maxLen:100,fontSize:4}
+	                                  		]);
+	LODOP.ADD_PRINT_TEXT("2mm","0mm","RightMargin:0mm","13mm", obj.name);
+	setFontSizeBold(fontSize,1);// 设置字体
+	setAlignment('center');// 对齐
+	
+	// 打印表格
+//	var tableStr = getMaterialsTabHtml_middleLable(obj);
+//	addPrintTable(tableStr,"12mm","1mm","RightMargin:1mm","29mm");
+//	setAlignment('center');// 居中对齐
+	
+	LODOP.ADD_PRINT_TEXT("17mm","1mm","38mm","5mm", "灭菌:"+obj.sterilizationDate);
+	setFontSizeBold(13,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("17mm","39mm","37mm","5mm", "装配员:"+obj.operator);
+	setFontSizeBold(13,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("27mm","1mm","38mm","5mm", "失效:"+obj.validDate);
+	setFontSizeBold(13,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("27mm","39mm","37mm","5mm", "审核员:"+obj.reviewer);
+	setFontSizeBold(13,0);// 设置字体
+	LODOP.ADD_PRINT_BARCODE("37mm","10mm","57mm","11mm","128Auto", obj.barcode);// 条码1
+	setAlignment('center');// 对齐
+	
+//	var fontSize = getFontSizeByStr(obj.name,[
+//		                                        {maxLen:10,fontSize:10},
+//		                                  		{maxLen:20,fontSize:8},
+//		                                		{maxLen:1000,fontSize:6}
+//		                                  		]);
+//	LODOP.ADD_PRINT_TEXT("34mm","0mm","RightMargin:0mm","3mm", obj.name);
+//	setFontSizeBold(fontSize,1);// 设置字体
+//	setAlignment('center');// 对齐
+	
+//	LODOP.ADD_PRINT_BARCODE("67mm","10mm","40mm","11mm","128Auto", obj.barcode);// 条码2
+//	setAlignment('center');// 对齐
+}
 
 var foreignProxyDisinfectionLabelConfig = {
 		// 可带表格线的table定义