Index: ssts-web/src/main/webapp/disinfectsystem/config/dysyy/print/printConfig.js
===================================================================
diff -u -r14870 -r14871
--- ssts-web/src/main/webapp/disinfectsystem/config/dysyy/print/printConfig.js	(.../printConfig.js)	(revision 14870)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dysyy/print/printConfig.js	(.../printConfig.js)	(revision 14871)
@@ -1095,26 +1095,26 @@
 	
 	
 	
-	LODOP.ADD_PRINT_TEXT("8mm","13mm","10mm","5mm", '品名:');
+	LODOP.ADD_PRINT_TEXT("8mm","1mm","10mm","5mm", '品名:');
 	setFontSizeBold(8,0);// 设置字体
 	
-	LODOP.ADD_PRINT_TEXT("8mm","23mm","RightMargin:0mm","16mm", obj.name);
+	LODOP.ADD_PRINT_TEXT("8mm","11mm","RightMargin:0mm","16mm", obj.name);
 	setFontSizeBold(fontSize,1);// 设置字体
 	
-	LODOP.ADD_PRINT_TEXT("24mm","13mm","60mm","5mm", "科室:"+emptyStringIfUndefinedOrNull(obj.department));
-	setFontSizeBold(8,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("29mm","13mm","40mm","5mm", "配包:"+obj.operator);
-	setFontSizeBold(8,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("29mm","38mm","40mm","5mm", "核包:"+obj.reviewer);
-	setFontSizeBold(8,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("34mm","13mm","40mm","5mm", "灭菌:"+obj.sterilizationDate);
-	setFontSizeBold(8,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("34mm","38mm","40mm","5mm", "失效:"+obj.validDate);
-	setFontSizeBold(8,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("39mm","13mm","40mm","5mm", "灭菌员:"+obj.operator);
-	setFontSizeBold(8,0);// 设置字体
-	LODOP.ADD_PRINT_TEXT("39mm","38mm","40mm","5mm", "炉次:"+emptyStringIfUndefinedOrNull(obj.frequency));
-	setFontSizeBold(8,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("24mm","1mm","60mm","5mm", "科室:"+emptyStringIfUndefinedOrNull(obj.department));
+	setFontSizeBold(10,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("29mm","1mm","40mm","5mm", "配包:"+obj.operator);
+	setFontSizeBold(10,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("29mm","32mm","40mm","5mm", "核包:"+obj.reviewer);
+	setFontSizeBold(10,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("34mm","1mm","40mm","5mm", "灭菌:"+obj.sterilizationDate);
+	setFontSizeBold(10,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("34mm","32mm","40mm","5mm", "失效:"+obj.validDate);
+	setFontSizeBold(10,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("39mm","1mm","40mm","5mm", "灭菌员:"+obj.operator);
+	setFontSizeBold(10,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("39mm","32mm","40mm","5mm", "炉次:"+emptyStringIfUndefinedOrNull(obj.frequency));
+	setFontSizeBold(10,0);// 设置字体
 	
 	LODOP.ADD_PRINT_BARCODE("45mm","2mm","30mm","11mm","128Auto", obj.barcode);// 条码1
 	LODOP.SET_PRINT_STYLEA(0,'ShowBarText',0);
@@ -1160,6 +1160,68 @@
 	    }
 }
 
+var largeLabel_foreignProxyDisinfectionConfig = {
+		customPrint:printLargeLabel_foreignProxyDisinfectionCon_dysyy
+}
+function printLargeLabel_foreignProxyDisinfectionCon_dysyy(obj){
+
+	doGetLodop();
+	
+	// 划线
+	if(obj.markTousse){
+		LODOP.ADD_PRINT_LINE('6mm','0mm','6mm','80mm',0,1);
+		LODOP.ADD_PRINT_LINE('37mm','0mm','37mm','80mm',0,1);
+	}
+	// 设置默认字体
+	setDefaultFontNameSizeBold('宋体',15,1);
+	// 默认条码属性
+	LODOP.SET_PRINT_STYLE('ShowBarText', true);
+	LODOP.SET_PRINT_STYLE('FontSize', 6);
+	LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true);
+	
+	LODOP.ADD_PRINT_TEXT("1mm","5mm","RightMargin:0mm","6mm", '德阳市人民医院');
+	setFontSizeBold(11,0);// 设置字体
+	
+	var tousseName = '品名:'+obj.name;
+	var fontSize = getFontSizeByStr(obj.name,[
+	                                        {maxLen:5,fontSize:20},
+	                                        {maxLen:10,fontSize:13},
+	                                  		{maxLen:20,fontSize:11},
+	                                		{maxLen:30,fontSize:8},
+	                                		{maxLen:200,fontSize:5}
+	                                  		]);
+	
+	
+	
+	LODOP.ADD_PRINT_TEXT("6mm","20mm","10mm","5mm", '品名:');
+	setFontSizeBold(8,0);// 设置字体
+	
+	LODOP.ADD_PRINT_TEXT("6mm","30mm","RightMargin:0mm","10mm", obj.name);
+	setFontSizeBold(fontSize,1);// 设置字体
+	
+	LODOP.ADD_PRINT_TEXT("17mm","20mm","60mm","5mm", "科室:"+emptyStringIfUndefinedOrNull(obj.depart));
+	setFontSizeBold(8,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("22mm","20mm","40mm","5mm", "配包:"+emptyStringIfUndefinedOrNull(obj.operator));
+	setFontSizeBold(8,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("22mm","50mm","40mm","5mm", "核包:"+emptyStringIfUndefinedOrNull(obj.reviewer));
+	setFontSizeBold(8,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("27mm","20mm","40mm","5mm", "灭菌:"+obj.sterilizationDate);
+	setFontSizeBold(8,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("27mm","50mm","40mm","5mm", "失效:"+obj.validDate);
+	setFontSizeBold(8,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("32mm","20mm","40mm","5mm", "灭菌员:"+emptyStringIfUndefinedOrNull(obj.operator));
+	setFontSizeBold(8,0);// 设置字体
+	LODOP.ADD_PRINT_TEXT("32mm","50mm","40mm","5mm", "炉次:"+emptyStringIfUndefinedOrNull(obj.frequency));
+	setFontSizeBold(8,0);// 设置字体
+	
+	LODOP.ADD_PRINT_BARCODE("38mm","2mm","30mm","11mm","128Auto", obj.barcode);// 条码1
+	LODOP.SET_PRINT_STYLEA(0,'ShowBarText',0);
+	setAlignment('center');// 对齐
+	
+	LODOP.ADD_PRINT_TEXT("42mm","35mm","30mm","11mm", obj.barcode);
+	setFontSizeBold(10,0);// 设置字体
+
+}
 var foreignTousseAppliationPrintConfig = {
 		isPrintTousse : true,
 		isPrintDisinfectGoods : false,
@@ -1426,7 +1488,7 @@
     exLargeLabel : exLargeLabelConfig,
     // 外部代理灭菌标签
     foreignProxyDisinfectionLabel : foreignProxyDisinfectionLabelConfig,
-//    largeLabel_foreignProxyDisinfection : largeLabel_foreignProxyDisinfectionConfig, // 80*50
+    largeLabel_foreignProxyDisinfection : largeLabel_foreignProxyDisinfectionConfig, // 80*50
     //外来器械申请单
     foreignTousseAppliation : foreignTousseAppliationPrintConfig,
  // 标识牌