Index: ssts-web/src/main/webapp/disinfectsystem/config/gyey/print/printConfig.js
===================================================================
diff -u -r13313 -r19672
--- ssts-web/src/main/webapp/disinfectsystem/config/gyey/print/printConfig.js	(.../printConfig.js)	(revision 13313)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gyey/print/printConfig.js	(.../printConfig.js)	(revision 19672)
@@ -984,7 +984,7 @@
 //小标签配置，50x30mm
 var smallLabelConfig = {
 		// 可带表格线的table定义
-		
+//		customPrint:printSmallLabel_gyey,
 	    table : {
 	    	rules : 'rows',
 	    	style : 'width: 50mm; height: 30mm',
@@ -1000,17 +1000,17 @@
 	    	      ]
 	    	    },
 	    	    {height : "", tds : [
-	    	        { label : "灭菌:", dataIndex : '', style : "font-size:12px; text-align:center;width:10mm"},
+	    	        { label : "灭菌:", dataIndex : '', style : "font-size:12px; text-align:right;width:16mm"},
 	    	        { label : "", dataIndex : 'sterilizationDate', style : "font-size:12px; text-align:center;width:20mm"},
-	    	        { label : "装配:", dataIndex : '', style : "font-size:12px; text-align:center;width:10mm"},
-	    	        { label : "", dataIndex : 'operator', style : "font-size:12px; text-align:center;width:16mm"}
+	    	        { label : "装配:", dataIndex : '', style : "font-size:10px; text-align:center;width:10mm"},
+	    	        { label : "", dataIndex : 'operator', style : "font-size:10px; text-align:left;width:16mm"}
 	    	       ]
 	    	    },
 	    	    {height : "", tds : [
-	    	        { label : "失效:", dataIndex : '', style : "font-size:12px; text-align:center"},
+	    	        { label : "失效:", dataIndex : '', style : "font-size:12px; text-align:right"},
 	    	        { label : "", dataIndex : 'validDate', style : "font-size:12px; text-align:center"},
-	    	        { label : "审核:", dataIndex : '', style : "font-size:12px; text-align:center"},
-	    	        { label : "", dataIndex : 'reviewer', style : "font-size:12px; text-align:center"}
+	    	        { label : "审核:", dataIndex : '', style : "font-size:10px; text-align:center"},
+	    	        { label : "", dataIndex : 'reviewer', style : "font-size:10px; text-align:left"}
 	    	      ]
 	    	    },
 	    	    {height : "", tds : [
@@ -1020,7 +1020,43 @@
 	    	]
 	    }
 }
+// 60*40
+function printSmallLabel_gyey(obj){
+	doGetLodop();
+	// 划线
+	if(obj.markTousse){
+		LODOP.ADD_PRINT_LINE('5mm','0mm','5mm','60mm',0,1);
+		LODOP.ADD_PRINT_LINE('16mm','0mm','16mm','60mm',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:12},
+		                                  		{maxLen:20,fontSize:11},
+		                                		{maxLen:1000,fontSize:8}
+		                                  		]);
+	LODOP.ADD_PRINT_TEXT("1mm","1mm","RightMargin:0mm","5mm", obj.name);
+	setFontSizeBold(fontSize,1);// 设置字体
+	setAlignment('center');// 对齐
 
+	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);// 设置字体
+	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);// 设置字体
+	
+	LODOP.ADD_PRINT_BARCODE("27mm","15mm","30mm","10mm","128Auto", obj.barcode);// 条码1
+	
+}
+
 var foreignProxyDisinfectionLabelConfig = {
 		// 可带表格线的table定义
 	    table : {