Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
===================================================================
diff -u -r14555 -r14788
--- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js	(.../printConfig.js)	(revision 14555)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js	(.../printConfig.js)	(revision 14788)
@@ -887,7 +887,7 @@
 }
 //小标签配置，50x30mm
 var smallLabelConfig = {
-		customPrint:printSmallLabel_fdzl
+		customPrint:printSmallLabel_dgszyy
 }
 var diposableGoodsBatchStockConfig = {
 		customPrint:printDisposableGoods_fdzl
@@ -939,44 +939,53 @@
 	
 	LODOP.ADD_PRINT_BARCODE("17mm","11mm","30mm","10mm","128Auto", obj.barcode);// 条码1
 }
-function printSmallLabel_fdzl(obj){
+// 61*34
+function printSmallLabel_dgszyy(obj){
 	doGetLodop();
 	
 	// 划线
 	if(obj.markTousse){
-		LODOP.ADD_PRINT_LINE('5mm','0mm','5mm','50mm',0,1);
-		LODOP.ADD_PRINT_LINE('16mm','0mm','16mm','50mm',0,1);
+		LODOP.ADD_PRINT_LINE('7mm','0mm','7mm','61mm',0,1);
+		LODOP.ADD_PRINT_LINE('16mm','0mm','16mm','61mm',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,[
+	var departAndName = obj.department+'-'+obj.name
+	var fontSize = getFontSizeByStr(departAndName,[
 		                                        {maxLen:10,fontSize:10},
-		                                  		{maxLen:20,fontSize:6},
-		                                		{maxLen:1000,fontSize:4}
+		                                  		{maxLen:20,fontSize:8},
+		                                		{maxLen:1000,fontSize:6}
 		                                  		]);
-	LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","5mm", obj.name);
+	LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","6mm", departAndName);
 	setFontSizeBold(fontSize,1);// 设置字体
 	setAlignment('center');// 对齐
 	
-	LODOP.ADD_PRINT_TEXT("6mm","1mm","34mm","6mm", "灭菌:"+obj.sterilizationDate);
+	LODOP.ADD_PRINT_TEXT("8mm","10mm","RightMargin:0mm","4mm", "灭菌日期:"+obj.sterilizationDate);
+	setFontSizeBold(8,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("12mm","10mm","RightMargin:0mm","4mm", "有效日期:"+obj.validDate);
+	setFontSizeBold(8,0);// 设置字体
+	
+	var s2 = '清洗/装配/灭菌:'+obj.washOperator+'/'+obj.operator+'/'+obj.sterilizationUser
+	LODOP.ADD_PRINT_TEXT("16mm","10mm","RightMargin:0mm","4mm", s2);
+	setFontSizeBold(6,0);// 设置字体
+	
+	LODOP.ADD_PRINT_BARCODE("21mm","1mm","30mm","6mm","128Auto", obj.barcode);// 条码1
+	LODOP.SET_PRINT_STYLEA(0,'ShowBarText', false);
+	LODOP.ADD_PRINT_TEXT("23mm","31mm","30mm","6mm", obj.barcode);
 	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("17mm","10mm","30mm","10mm","128Auto", obj.barcode);// 条码1
+	LODOP.ADD_PRINT_BARCODE("27mm","1mm","30mm","6mm","128Auto", obj.barcode);// 条码1
+	LODOP.SET_PRINT_STYLEA(0,'ShowBarText', false);
+	LODOP.ADD_PRINT_TEXT("29mm","31mm","30mm","6mm", obj.barcode);
+	setFontSizeBold(10,0);// 设置字体
 }
 function printSmallLabel2_fdzl(obj){
 	
-	printSmallLabel_fdzl(obj);
+	printSmallLabel_dgszyy(obj);
 	if (typeof(obj.idCardDefinitionUseAmount) != 'undefined' ){
 		LODOP.ADD_PRINT_TEXT("1mm","38mm","50mm","10px", obj.idCardDefinitionUseAmount + "次");
 		setFontSizeBold(10,0);// 设置字体
@@ -1273,7 +1282,7 @@
     
     purchasePlan : purchasePlanConfig,
     
-    // 小标签:50x30规格
+    // 小标签:61x34规格
     smallLabel : smallLabelConfig,
     // 小标签2:50x30规格
     smallLabel2 : smallLabel2Config,