Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
===================================================================
diff -u -r14434 -r14459
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js	(.../printConfig.js)	(revision 14434)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js	(.../printConfig.js)	(revision 14459)
@@ -967,7 +967,46 @@
 	LODOP.ADD_PRINT_BARCODE("17mm","10mm","30mm","10mm","128Auto", obj.barcode);// 条码1
 
 }
+// 小标签2
+var smallLabelConfig2 = {
+		customPrint:printSmallLabel2_gdsy
+}
 
+function printSmallLabel2_gdsy(obj){
+	doGetLodop();
+	// 划线
+	if(obj.markTousse){
+		LODOP.ADD_PRINT_LINE('4mm','0mm','4mm','50mm',0,1);
+		LODOP.ADD_PRINT_LINE('13mm','0mm','13mm','50mm',0,1);
+	}
+	// 设置默认字体
+	setDefaultFontNameSizeBold('宋体',12,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:10,fontSize:6},
+		                                  		{maxLen:20,fontSize:5},
+		                                  		{maxLen:20,fontSize:4},
+		                                		{maxLen:1000,fontSize:3}
+		                                  		]);
+	LODOP.ADD_PRINT_TEXT("1mm","1mm","RightMargin:0mm","3mm", obj.name);
+	setFontSizeBold(fontSize,1);// 设置字体
+	setAlignment('center');// 对齐
+
+	var sterilizationDate = "灭菌日期:"+obj.sterilizationDate+' ['+obj.virtualBasketSeqNum+']';
+	LODOP.ADD_PRINT_TEXT("4mm","1mm","RightMargin:0mm","3mm", sterilizationDate);
+	setFontSizeBold(7,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("7mm","1mm","RightMargin:0mm","3mm", "失效日期:"+obj.validDate);
+	setFontSizeBold(7,0);// 设置字体
+	var line4 = "制作:"+obj.operator+'  核对:'+obj.reviewer;
+	LODOP.ADD_PRINT_TEXT("10mm","1mm","RightMargin:0mm","3mm", line4);
+	setFontSizeBold(7,0);// 设置字体
+	
+	LODOP.ADD_PRINT_BARCODE("13mm","5mm","30mm","7mm","128Auto", obj.barcode);// 条码1
+}
 var middleLable2Config = {
 		table : {
 	    	rules : 'rows',
@@ -1459,6 +1498,7 @@
     
     // 小标签:47mmx29mm规格
     smallLabel : smallLabelConfig,
+    smallLabel2 : smallLabelConfig2,// 40mm*20mm
     // 中标签:77mmx49mm规格
     middleLable : middleLableConfig,
  // 中标签:77mmx49mm规格(不打内容物)