Index: ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
===================================================================
diff -u -r16076 -r16114
--- ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js	(.../printRecyclingDetailWin.js)	(revision 16076)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js	(.../printRecyclingDetailWin.js)	(revision 16114)
@@ -355,8 +355,10 @@
 			}
 			htmlTable += "</tr>";
 		}
+	}else{
+		return "";
 	}
-	//默认填充空行
+	/*//默认填充空行
 	if(defaultRow > result.length){
 		for(var i = 0 ; i < (defaultRow - result.length) ; i++){
 			htmlTable += "<tr style='height: 7mm;'>";
@@ -366,7 +368,7 @@
 			}
 			htmlTable += "</tr>";
 		}
-	}
+	}*/
 	
 	//合计
 	if(titleConfig.length > 0){
@@ -389,9 +391,12 @@
 function buildDepartTable(data,model){
 	var html ="<table border ='1' cellspacing=0 cellpadding=0 style='border-collapse:collapse' bordercolor='#000000'>";
 	    html += "<tr>";
-		html += "<td style='width: 15mm;height: 139mm;font-size:30px;' align='center'>" + model + "</td>";
-		html += "<td style='width: 195mm;height: 139mm;' valign='top'>";
+		html += "<td style='width: 15mm;font-size:30px;' align='center'>" + model + "</td>";
+		html += "<td style='width: 195mm;' valign='top'>";
 		var result = data[model];
+		if(result.length <= 0){
+			return "";
+		}
 		for(var i = 0 ; i < result.length ; i++){
 			html += ("<strong>" + result[i].showDepart + "：</strong>");
 			for(var j = 0 ; j < result[i].items.length ; j++){
@@ -400,7 +405,7 @@
 			}
 			html += "<br>";
 			html += "--------------------------------------------------------------------------------------------";
-			html += "-----------------------------------------";
+			html += "--------------------";
 			html += "<br>";
 		}
 		html += "</td>"; 
@@ -418,6 +423,9 @@
 	LODOP.ADD_PRINT_TEXT(35,200,"100%",5,"开始时间：" + startDateTime);
 	LODOP.ADD_PRINT_TEXT(35,450,"100%",5,"结束时间： " + endDateTime);
 	
+//	LODOP.SET_PRINT_STYLE("ItemType", 2);
+//	LODOP.ADD_PRINT_TEXT(10,600,"95%",5,"第#页/共&页");
+	
 	var htmlTable ="<table border ='0' style='width: 200mm'>";
 	//普通器械
 	htmlTable += "<tr><td>";