Index: ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
===================================================================
diff -u -r32124 -r32131
--- ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js	(.../printRecyclingDetailWin.js)	(revision 32124)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js	(.../printRecyclingDetailWin.js)	(revision 32131)
@@ -12,7 +12,7 @@
 
 var assetBelongStore = new Ext.data.SimpleStore({
 	fields : [ 'departId','name' ],
-	data : [['01','供应室'],[ '02','手术室']]
+	data : [['01','消毒供应中心'],[ '02','手术室']]
 });
 
 var supplyRoomStore = new Ext.data.Store({
@@ -563,8 +563,7 @@
 	chooseRecyclingDetailWin.show();
 	// 给combo设置默认值
 	if (sstsConfig.recyclingRecordListFilterByAssetBelong){
-		var departName = document.getElementById('departName').value;
-		Ext.getCmp('depart').setRawValue(departName);
+		Ext.getCmp('depart').setRawValue('消毒供应中心');
 	}
 	else{
 		supplyRoomStore.reload();
@@ -1689,16 +1688,18 @@
 function lodopPrint(printType,startDateTime,endDateTime,obj,params){
 	var printUser = obj.printUser || '';
 	var printDetail = obj.printDetail || [];
+	var printDate = obj.printDate || '';
 	var disinfectionDetail = obj.disinfectionDetail || [];
 	var tableRowSize = obj.tableRowSize || 1;
 
 	var LODOP = getLodop(document.getElementById('LODOP'), document.getElementById('LODOP_EM'));
 	LODOP.SET_PRINT_STYLE("FontSize",17);
 	LODOP.ADD_PRINT_TEXT(5,300,"100%",5,"CSSD每日回收登记表");
 	LODOP.SET_PRINT_STYLE("FontSize",11);
-	LODOP.ADD_PRINT_TEXT(35,50,"100%",5,"制单人： " + printUser);
-	LODOP.ADD_PRINT_TEXT(35,200,"100%",5,"开始时间：" + startDateTime);
-	LODOP.ADD_PRINT_TEXT(35,450,"100%",5,"结束时间： " + endDateTime);
+	LODOP.ADD_PRINT_TEXT(35,15,"100%",5,"制单人:" + printUser);
+	LODOP.ADD_PRINT_TEXT(35,130,"100%",5,"开始时间:" + startDateTime);
+	LODOP.ADD_PRINT_TEXT(35,350,"100%",5,"结束时间:" + endDateTime);
+	LODOP.ADD_PRINT_TEXT(35,570,"100%",5,"打印时间:" + printDate);
 
 	var htmlTable = "";
 	if(params){
@@ -1746,6 +1747,9 @@
 	var needAddRowLength = rowMaxLength - rowIndex;
 	if(needAddRowLength > 0){
 		for(var i = 0;i < needAddRowLength;i++){
+			if(tableArray[tableIndex] == null || tableArray[tableIndex] == undefined){
+				tableArray[tableIndex] = "";
+			}
 			tableArray[tableIndex] += "<tr style='height: 8mm'><td>&nbsp</tr><td>&nbsp</tr><td>&nbsp</tr></tr>";
 		}
 	}
@@ -1760,7 +1764,7 @@
 	for(var i = 0;i < arrayLength;i++){
 		var tempTable = tableArray[i];
 			tempTable = (table + tempTable + table2);
-			htmlTable += "<td valign='top'>" + tempTable + "</td>";
+			htmlTable += "<td valign='top'>" + tempTable || '' + "</td>";
 	}
 	//空td填空table
 	if(tableIndex < 2){
@@ -1775,7 +1779,6 @@
 		}
 	}
 	htmlTable += "</tr>";
-	
 	//表二
 	var table4 = "<table border ='1' cellspacing=0 cellpadding=0 style='width: 195mm; border-collapse:collapse' bordercolor='#000000'>";
 	table4 += "<tr style='height: 8mm'>";