Index: ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
===================================================================
diff -u -r32040 -r32065
--- ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js	(.../printRecyclingDetailWin.js)	(revision 32040)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js	(.../printRecyclingDetailWin.js)	(revision 32065)
@@ -613,14 +613,9 @@
 		recyDepartmentGroupDepartCodes = (recyDepartmentGroupDepartCodes.split(',')[0] == 'all')?'all':recyDepartmentGroupDepartCodes;
 	}
 
-	var taskGroupNames = Ext.getCmp('taskGroupName').getValue() || '';
-	taskGroupNames = (taskGroupNames == '')?taskGroupNames:taskGroupNames.substr(3);
-
+	var taskGroupNames = Ext.getCmp('taskGroupName').getRawValue() || '';
 	var tousseGroupNames = Ext.getCmp('tousseGroupName').getRawValue() || '';
-	tousseGroupNames = (tousseGroupNames == '全部')?tousseGroupItemArray.join(','):tousseGroupNames;
-
 	var deptGroupNames = Ext.getCmp('deptGroupName').getRawValue() || '';
-	deptGroupNames = (deptGroupNames == '全部')?deptGroupItemArray.join(','):deptGroupNames;
 	var params = {
 		taskGroupNames:taskGroupNames,
 		tousseGroupNames:tousseGroupNames,
@@ -637,8 +632,8 @@
 	}
 	var period = parseInt(d2 - d1);
 	if (period > (48*3600*1000)){
-		//alert('开始时间、结束时间跨度不能超过两天！！');
-		//return ;
+		alert('开始时间、结束时间跨度不能超过两天！！');
+		return ;
 	}
 
 	//东莞市中医院定制开发
@@ -1145,6 +1140,7 @@
 	var printUser = recyclingDetail.printUser || '';
 	var printDate = recyclingDetail.printDate || '';
 	var configTable = recyclingDetail['配置文件'];
+	var htmlTable = "";
 	if(configTable.headerContent && configTable.headerContent.length > 0){
 		var headerContent0 = configTable.headerContent[0];
 		var position0 = headerContent0.position;
@@ -1156,30 +1152,31 @@
 		var position2 = headerContent2.position;
 		var position3 = headerContent3.position;
 		var position4 = headerContent4.position;
-		LODOP.SET_PRINT_STYLE("FontSize",headerContent0.fontSize);
-		LODOP.ADD_PRINT_TEXT(position0[0],position0[1],position0[2],position0[3],headerContent0.label);
-		LODOP.SET_PRINT_STYLE("FontSize",headerContent1.fontSize);
-		LODOP.ADD_PRINT_TEXT(position1[0],position1[1],position1[2],position1[3],headerContent1.label + ' ' + printUser);
-		LODOP.ADD_PRINT_TEXT(position2[0],position2[1],position2[2],position2[3],headerContent2.label + ' ' + startDateTime);
-		LODOP.ADD_PRINT_TEXT(position3[0],position3[1],position3[2],position3[3],headerContent3.label + ' ' + endDateTime);
-		LODOP.ADD_PRINT_TEXT(position4[0],position4[1],position4[2],position4[3],headerContent4.label + ' ' + printDate);
+		htmlTable += "<div style='width: 98%;margin: 5px auto;position: relative;height: 50px;'>";
+		htmlTable += "<p style='text-align:center;font-size:"+headerContent0.fontSize+"px'>"+headerContent0.label+"</p>";
+		htmlTable += "<span style='text-align:left;font-size:"+headerContent1.fontSize+"px;position: absolute;left: "+position1[1]+"px;top:"+position1[0]+"px;'>"+headerContent1.label + ' ' + printUser+"</span>";
+		htmlTable += "<span style='text-align:left;font-size:"+headerContent2.fontSize+"px;position: absolute;left: "+position2[1]+"px;top:"+position2[0]+"px;'>"+headerContent2.label + ' ' + startDateTime+"</span>";
+		htmlTable += "<span style='text-align:left;font-size:"+headerContent3.fontSize+"px;position: absolute;left: "+position3[1]+"px;top:"+position3[0]+"px;'>"+headerContent3.label + ' ' + endDateTime+"</span>";
+		htmlTable += "<span style='text-align:left;font-size:"+headerContent4.fontSize+"px;position: absolute;left: "+position4[1]+"px;top:"+position4[0]+"px;'>"+headerContent4.label + ' ' + printDate+"</span>";
+		htmlTable += "</div>";
 	}else {
-		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,12,"100%",5,"制单人： " + printUser);
-		LODOP.ADD_PRINT_TEXT(35,162,"100%",5,"开始时间：" + startDateTime);
-		LODOP.ADD_PRINT_TEXT(35,412,"100%",5,"结束时间： " + endDateTime);
-		LODOP.ADD_PRINT_TEXT(35,662,"100%",5,"打印时间： " + printDate);
+		htmlTable += "<div style='width: 98%;margin: 5px auto;position: relative;height: 50px;'>";
+		htmlTable += "<p style='text-align:center;font-size:17px'>CSSD每日回收登记表</p>";
+		htmlTable += "<span style='text-align:left;font-size:14px;position: absolute;left: 10px;top:35px;'>制单人:"+ ' ' + printUser+"</span>";
+		htmlTable += "<span style='text-align:left;font-size:14px;position: absolute;left: 130px;top:35px;'>开始时间:"+ ' ' + startDateTime+"</span>";
+		htmlTable += "<span style='text-align:left;font-size:14px;position: absolute;left: 350px;top:35px;'>结束时间:"+ ' ' + endDateTime+"</span>";
+		htmlTable += "<span style='text-align:left;font-size:14px;position: absolute;left: 570px;top:35px;'>打印时间:"+ ' ' + printDate+"</span>";
+		htmlTable += "</div>";
 	}
 	if(params){
-		LODOP.SET_PRINT_STYLE("FontSize",11);
-		LODOP.ADD_PRINT_TEXT(55,12,"100%",5,"任务组： " + params.taskGroupNames);
-		LODOP.ADD_PRINT_TEXT(75,12,"100%",5,"器械包分组：" + params.tousseGroupNames);
-		LODOP.ADD_PRINT_TEXT(95,12,"100%",5,"回收科室分组： " + params.deptGroupNames);
+		htmlTable += "<div style='width: 98%;margin: 5px auto;position: relative;min-height: 60px;'>";
+		htmlTable += "<div style='text-align:left;font-size:14px;margin-bottom:5px;width:100%'>任务组:"+ ' ' + params.taskGroupNames+"</div>";
+		htmlTable += "<div style='text-align:left;font-size:14px;margin-bottom:5px;width:100%'>器械包分组:"+ ' ' + params.tousseGroupNames+"</div>";
+		htmlTable += "<div style='text-align:left;font-size:14px;margin-bottom:5px;width:100%'>回收科室分组:"+ ' ' + params.deptGroupNames+"</div>";
+		htmlTable += "</div>";
 	}
 	if(configTable){
-		var htmlTable = "";
+		htmlTable += "";
 		for(var i=0;i<configTable.tables.length;i++){
 			var table = configTable.tables[i];
 			var tableData = recyclingDetail['tableData'][i].tableData;
@@ -1358,7 +1355,7 @@
 			}
 		}
 	}else {
-		var htmlTable ="<table border ='0' style='width: 200mm'>";
+		htmlTable +="<table border ='0' style='width: 200mm'>";
 		var departmentGroupNames = recyclingDetail.departmentGroupNames
 		if(departmentGroupNames && departmentGroupNames.length > 0){
 			for(var i = 0; i < departmentGroupNames.length;++i){
@@ -1370,10 +1367,9 @@
 		}
 	}
 	htmlContent = "<body leftmargin=0 topmargin=0 style='text-align:center'>" + htmlTable + "</body>";
-	LODOP.ADD_PRINT_HTM(115,5,"100%","100%",htmlContent);
-
+	LODOP.ADD_PRINT_HTM(10,5,"100%","96%",htmlContent);
 	LODOP.SET_PRINT_STYLE("ItemType",2);
-	LODOP.ADD_PRINT_TEXT(5,"90%","90%",5,"第#页/共&页");
+	LODOP.ADD_PRINT_TEXT("98%","88%","90%",5,"第#页/共&页");
 	LODOP.SET_PRINT_STYLE("ItemType",0);
 
 	if(printType == 0){//直接打印