Index: ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js
===================================================================
diff -u -r16662 -r16851
--- ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js	(.../printConfig.js)	(revision 16662)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js	(.../printConfig.js)	(revision 16851)
@@ -154,9 +154,8 @@
 	    	        	        ]
 	    	        }
 }
-//宽24cm.   长28cm
+
 var invoicePlanPrintConfig = {
-		print2:true,
 		isPrintTousse : true,
 		isPrintDisinfectGoods : true,
 	    isPrintDisposableGoods : true, // 打印申请单是否打印一次性物品
@@ -167,37 +166,39 @@
 	    // 在器械包和一次性物品不合并打印的情况下，消毒物品打印方式：
 	    // 1：优先与一次性物品合并打印，如果无一次性物品则与器械包合并打印， 2：优先与器械包一起合并打印，如果没有器械包则与一次性物品合并打印 ，3：单独打印
 	    disinfectGoodsPrintMode : 2,
-	    rowsPerPage : 1000000,
-	    headerFooter : [
-	    	            // 标题
-	    	            {label : "无菌物品领用单 ", dataIndex : 'header',type:'html', beforeStr:'<center><font size=5>',afterStr:'</font></center>', position : ["0","0mm","80%",22]},
-//	    	            {label : "无菌物品领用单 ", dataIndex : 'header', fontSize : 17, position : ["0","60mm","99%",22]},
-	    	            {label : "单号：", dataIndex : 'serialNum', fontSize : 11, position : ["30","1%","90%",10]},
-	    	            {label : "接收部门：", dataIndex : 'depart', fontSize : 11, position : ["30","45mm","90%",5]},
-	    	            {label : "收物者:", dataIndex : '', fontSize : 11, position : ["30","100mm","90%",5]},
-	    	            {label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["26.3cm","1%","90%",5]},
-	                {label : "回收人:", dataIndex : 'recyclingUser', fontSize : 11, position : ["25.7cm","1%","90%",5]},
-	                {label : "清点人:", dataIndex : 'applicant', fontSize : 11, position : ["25.7cm","35mm","90%",5]},
-	                {label : "发货者:", dataIndex : '', fontSize : 11, position : ["25.7cm","70mm","90%",5]},
-//	                {label : "收物者:", dataIndex : '', fontSize : 11, position : ["8.1cm","105mm","90%",5]},
-	                {label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["25.7cm","130mm","90%",5]}
-	    	        ],
-	    	currentPageNumber : {label : "第#页", fontSize : 11, position : ["25.7cm","190mm","90%",5]},
-	    	totalPageAmount : {label : "/共&页", fontSize : 11, position : ["25.7cm","200mm","90%",5]},
-	    	goodsTable :{
-	        	rowHeight : 25,
-	        	position : ["49","1%","99%","23.5cm"],
-			fontSize : 14,
-        	headRepeat : true,
-	        	columns : [
-	                {header : "序号", dataIndex : 'serialNumber', width : 110, align : 'center', fontSize : 11},
-	                {header : "名称", dataIndex : 'goodsName', width : 250, align : 'left', fontSize : 11},
-	                {header : "规格", dataIndex : 'sp', width : 170, align : 'left', fontSize : 11},
-					{header : "申请数量", dataIndex : 'applyAmount', width : 120, align : 'center', fontSize : 11},
-					{header : "回收数量", dataIndex : 'recyclingAmount', width : 120, align : 'center', fontSize : 11}
+	    rowsPerPage : 99,
+	        headerContent : [
+	            // 标题
+	            {label : "无菌物品领用单 ", dataIndex : 'header', fontSize : 17, position : ["0","60mm","99%",22]},
+	            {label : "单号：", dataIndex : 'serialNum', fontSize : 10, position : ["30","1%","90%",10]},
+	            {label : "接收部门：", dataIndex : 'depart', fontSize : 10, position : ["30","45mm","90%",5]},
+	            {label : "收物者:", dataIndex : '', fontSize : 10, position : ["30","100mm","90%",5]}
+	            
+	        ],
+	        goodsTable :{
+//	        	rowHeight : 16,
+	        	position : ["49","1%","99%","2000"],
+	        	fontSize : 13,
+	        	content : [
+	                {header : "序号", dataIndex : 'serialNumber', width : 60, align : 'center'},
+	                {header : "名称", dataIndex : 'goodsName', width : 280, align : 'left'},
+	                {header : "规格", dataIndex : 'sp', width : 260, align : 'left'},
+					{header : "申请数量", dataIndex : 'applyAmount', width : 70, align : 'center'},
+					{header : "回收数量", dataIndex : 'recyclingAmount', width : 70, align : 'center'}
 					//{header : "单位", dataIndex : 'unit', width : 60, align : 'left', fontSize : 11},
 	            ]
-	        }
+	        },
+	        footer: {
+	        fontSize : 12,
+	        content : [
+	            {label : "回收人:", dataIndex : 'recyclingUser'},
+				{label : " 清点人:", dataIndex : 'applicant'},
+	            {label : " 发货者:", dataIndex : ''},
+	            //{label : "       收物者:", dataIndex : ''},                        
+	            {label : "       打印时间:", dataIndex : 'printTime'},
+	            {label : "<br>备注:", dataIndex : 'remark'}
+	        ]
+	    }
 }
 var batchPrintMaterialInvoicesConfig = {
         headerFooter : [
@@ -1138,9 +1139,92 @@
 					}
 	    	]
 }
+
+var foreignTousseLargeLabelConfig = {
+		customPrint:foreignTousseLargeLabel_zsszyy
+}
+function foreignTousseLargeLabel_zsszyy(obj){
+	doGetLodop();
+    var tableHtml ="<table border ='0' style=\"width: 100mm; height: 80mm\">";
+    
+    tableHtml += "<tr>";
+    tableHtml += "<td colspan='4' style='font-size: 17px;'><center>"+emptyStringIfUndefinedOrNull(obj.name)+"</center>";
+//  tableHtml += "<hr width=300 size=1 color=#00ffff align=center noshade>";
+    tableHtml += "</td>";
+    tableHtml += "</tr>";
+    
+    tableHtml += "<tr>";
+    tableHtml += "<td style='font-size: 14px;'><center>病人:</center></td>";
+    tableHtml += "<td style='font-size: 14px;' align='left'>"+emptyStringIfUndefinedOrNull(obj.patient)+"</td>";
+    tableHtml += "<td style='font-size: 14px;'><center>住院号:</center></td>";
+    tableHtml += "<td style='font-size: 14px;' align='left'>"+emptyStringIfUndefinedOrNull(obj.hospitalNumber)+"</td>";
+    tableHtml += "</tr>";
+    
+    tableHtml += "<tr>";
+    tableHtml += "<td style='font-size: 14px;'><center>科室:</center></td>";
+    tableHtml += "<td style='font-size: 14px;' align='left'>"+emptyStringIfUndefinedOrNull(obj.depart)+"</td>";
+    tableHtml += "<td style='font-size: 14px;'><center>手术间:</center></td>";
+    tableHtml += "<td style='font-size: 14px;' align='left'>"+emptyStringIfUndefinedOrNull(obj.operationRoom)+"</td>";
+    tableHtml += "</tr>";
+    
+    tableHtml += "<tr>";
+    tableHtml += "<td style='font-size: 14px;'><center>医生:</center></td>";
+    tableHtml += "<td style='font-size: 14px;' align='left'>"+emptyStringIfUndefinedOrNull(obj.doctor)+"</td>";
+    tableHtml += "<td style='font-size: 14px;'>&nbsp;</center></td>";
+    tableHtml += "<td style='font-size: 14px;' align='left'>&nbsp;</td>";
+    tableHtml += "</tr>";
+    
+    tableHtml += "<tr>";
+    tableHtml += "<td style='font-size: 14px;'><center>灭菌:</center></td>";
+    tableHtml += "<td style='font-size: 14px;' align='left'>"+emptyStringIfUndefinedOrNull(obj.sterilizationDate)+"</td>";
+    tableHtml += "<td style='font-size: 14px;'><center>装配员:</center></td>";
+    tableHtml += "<td style='font-size: 14px;' align='left'>"+emptyStringIfUndefinedOrNull(obj.operator)+"</td>";
+    tableHtml += "</tr>";
+    
+    tableHtml += "<tr>";
+    tableHtml += "<td style='font-size: 14px;'><center>失效:</center></td>";
+    tableHtml += "<td style='font-size: 14px;' align='left'>"+emptyStringIfUndefinedOrNull(obj.validDate)+"</td>";
+    tableHtml += "<td style='font-size: 14px;'><center>审核员:</center></td>";
+    tableHtml += "<td style='font-size: 14px;' align='left'>"+emptyStringIfUndefinedOrNull(obj.reviewer)+"</td>";
+    tableHtml += "</tr>";
+    
+    tableHtml += "<tr>";
+    tableHtml += "<td style='font-size: 14px;' colspan='4' align='center'>"+emptyStringIfUndefinedOrNull(obj.total)+"</td>";
+    tableHtml += "</tr>";
+    
+    var sterilizerStr = "";
+    if(obj.sterilizer == null || obj.sterilizer.length == 0){
+       sterilizerStr = "<td colspan='2' style='font-size: 14px;'><center>"+emptyStringIfUndefinedOrNull(obj.hospitalName)+"</center></td>";
+    }else{
+        var str = "【"+obj.sterilizer + "】第" + obj.frequency +"炉";
+        sterilizerStr = "<td colspan='2' style='font-size: 14px;'><center>"+str+"</center></td>";
+    }
+    tableHtml += "<tr>";
+    tableHtml += sterilizerStr;
+    tableHtml += "<td colspan='2' style='font-size: 10px;' height='50px' height='10px'><center>";
+    tableHtml += "<img src='" + WWWROOT + "/disinfectSystem/printBarcodeAction!printBarcodeImage.do?barcode=" + obj.barcode + "'/>";
+    tableHtml += "</br>"+obj.barcode;
+    tableHtml += "</center></td></tr>";
+    
+    tableHtml += "<tr>";
+    tableHtml += "<td colspan='2' style='font-size: 10px;' height='50px'><center>";
+    tableHtml += "<img src='" + WWWROOT + "/disinfectSystem/printBarcodeAction!printBarcodeImage.do?barcode=" + obj.barcode + "'/>";
+    tableHtml += "</br>"+obj.barcode;
+    tableHtml += "</center></td>";
+    tableHtml += "<td colspan='2' style='font-size: 10px;' height='50px'><center>";
+    tableHtml += "<img src='" + WWWROOT + "/disinfectSystem/printBarcodeAction!printBarcodeImage.do?barcode=" + obj.barcode + "'/>";
+    tableHtml += "</br>"+obj.barcode;
+    tableHtml += "</center></td>";
+    tableHtml += "</tr>";
+
+    tableHtml += "</table>";
+    LODOP.ADD_PRINT_HTM(0,0,"100%","100%","<body leftmargin=0 topmargin=0>"+tableHtml+"</body>");
+    LODOP.SET_PRINT_MODE("PRINT_PAGE_PERCENT","Full-Page");
+}
 var idCardLargeLabelConfig = {
 		customPrint:printIDCardLargeLabel_gzfdzl
 }
+
 function printIDCardLargeLabel_gzfdzl(idCardInstance){
 	if(isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition)){
 		alert('包定义不能为空!');
@@ -1325,6 +1409,8 @@
     //middleLable : middleLableConfig,
     // 大标签:100x80规格
     largeLabel : largeLabelConfig,
+    // 外来器械大标签打印格式
+    foreignTousseLargeLabel:foreignTousseLargeLabelConfig,
     // 加大标签:100x100规格
     exLargeLabel : exLargeLabelConfig,
     // 外部代理灭菌标签