Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r23871 -r23879
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 23871)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 23879)
@@ -2205,30 +2205,46 @@
 	}
 	var name = tousseDefinition.name;
 	
+	
+	var materials = [];
+	if(!isUndefinedOrNullOrEmpty(tousseDefinition) && !isUndefinedOrNullOrEmpty(tousseDefinition.materialInstances)){
+		materials = tousseDefinition.materialInstances;
+	}
+
+	var total = materials.length;
+	
+	//simon-add:动态设置字体大小
+	//标题字体大小
+	var titleSize='15px';
+	//表头字体大小
+	var tableHeadSize='12px';
+	//表格内容字体大小
+	var tableContext='8px';
+	
+	if(total<=15){
+		//表格内容字体大小
+		tableContext='10px';
+	}
+	
 	var tableHtml = "<table border ='0' align='center' cellspacing=0>";
 	tableHtml += "<tr>";
-	tableHtml += "<td colspan='6' style='font-size: 17px;' border='0'><center>"+unit+"</center></td>";
+	tableHtml += "<td colspan='6' style='font-size: "+titleSize+";' border='0'><center>"+unit+"</center></td>";
 	tableHtml += "</tr>";
 	tableHtml += "<tr>";
-	tableHtml += "<td colspan='6' style='font-size: 25px;' border='0'><center><B>"+name+"</B></center></td>";
+	tableHtml += "<td colspan='6' style='font-size: "+titleSize+";' border='0'><center><B>"+name+"</B></center></td>";
 	tableHtml += "</tr>";
 	tableHtml += "</table>";
-	tableHtml += "<table border ='1' align='center' cellspacing=0>";
-	tableHtml += "<tr>";
-	tableHtml += "<td style='font-size: 15px;' width='100px'><center>器械名称</center></td>";
-	tableHtml += "<td style='font-size: 15px;' width='33px' align='center'>数量</td>";
-	tableHtml += "<td style='font-size: 15px;' width='100px'><center>器械名称</center></td>";
-	tableHtml += "<td style='font-size: 15px;' width='33px' align='center'>数量</td>";
+	tableHtml += "<table border ='0' align='center' cellspacing=0  style='margin-button:5px;'>";
+	tableHtml += "<tr  style='font-size: "+tableHeadSize+";' width='140px' align='center'><center>";
+	tableHtml += "<td>器械名称</center></td>";
+	tableHtml += "<td>数量</td>";
+	tableHtml += "<td><center>器械名称</center></td>";
+	tableHtml += "<td>数量</td>";
 	//simon-add
-	tableHtml += "<td style='font-size: 15px;' width='100px'><center>器械名称</center></td>";
-	tableHtml += "<td style='font-size: 15px;' width='33px' align='center'>数量</td>";
+	tableHtml += "<td><center>器械名称</center></td>";
+	tableHtml += "<td>数量</td>";
 	tableHtml += "</tr>";
-	
-	var materials = [];
-	if(!isUndefinedOrNullOrEmpty(tousseDefinition) && !isUndefinedOrNullOrEmpty(tousseDefinition.materialInstances)){
-		materials = tousseDefinition.materialInstances;
-	}
-	var total = materials.length;
+
 	var remainder = 0;  //simon-edit:计算总数除以3的余数
 	if(total%3 == 1){
 		remainder = 1;
@@ -2255,9 +2271,9 @@
 			amount += parseInt(count);
 		}
 		
-		tableHtml += "<tr>";
-		tableHtml += "<td style='font-size: 10px;' align='left'>"+materialName;
-		tableHtml += "</td><td style='font-size: 10px;' align='center'><center>"+count+"</center></td>";
+		tableHtml += "<tr style='font-size:"+tableContext+";' align='center'>";
+		tableHtml += "<td>"+materialName;
+		tableHtml += "</td><td><center>"+count+"</center></td>";
 		//simon-edit:更新判断条件：遍历到最后一个并且当总数/3的余数为2时才再最后面增加一个空
 		if(i==total-1&& (remainder!=0)){
 			//simon:添加第二部分的内容
@@ -2272,12 +2288,12 @@
 			if(type2 != '一次性物品'){
 				amount += parseInt(count2);
 			}
-			tableHtml += "<td style='font-size: 10px;' align='left'>"+materialName2;
-			tableHtml += "</td><td style='font-size: 10px;' align='center'><center>"+count2+"</center>";
+			tableHtml += "<td>"+materialName2;
+			tableHtml += "</td><td><center>"+count2+"</center>";
 			tableHtml += "</td>";
 			
-			tableHtml += "<td style='font-size: 10px' align='left'></td>";
-			tableHtml += "<td style='font-size: 10px' align='center'><center></center></td>";
+			tableHtml += "<td></td>";
+			tableHtml += "<td><center></center></td>";
 		}else if(i==total-2&&(remainder == 1)){
 			//simon:添加第二部分的内容
 			var record2 = materials[total+i];
@@ -2291,12 +2307,12 @@
 			if(type2 != '一次性物品'){
 				amount += parseInt(count2);
 			}
-			tableHtml += "<td style='font-size: 10px;' align='left'>"+materialName2;
-			tableHtml += "</td><td style='font-size: 10px;' align='center'><center>"+count2+"</center>";
+			tableHtml += "<td>"+materialName2;
+			tableHtml += "</td><td><center>"+count2+"</center>";
 			tableHtml += "</td>";
 			
-			tableHtml += "<td style='font-size: 10px' align='left'></td>";
-			tableHtml += "<td style='font-size: 10px' align='center'><center></center></td>";
+			tableHtml += "<td></td>";
+			tableHtml += "<td><center></center></td>";
 		}else{
 			//simon:添加第二部分的内容
 			var record2 = materials[total+i];
@@ -2310,8 +2326,8 @@
 			if(type2 != '一次性物品'){
 				amount += parseInt(count2);
 			}
-			tableHtml += "<td style='font-size: 10px;' align='left'>"+materialName2;
-			tableHtml += "</td><td style='font-size: 10px;' align='center'><center>"+count2+"</center>";
+			tableHtml += "<td>"+materialName2;
+			tableHtml += "</td><td><center>"+count2+"</center>";
 			tableHtml += "</td>";
 			
 			//simon-add:添加第三部分的内容
@@ -2326,8 +2342,8 @@
 			if(type3 != '一次性物品'){
 				amount += parseInt(count3);
 			}
-			tableHtml += "<td style='font-size: 10px;' align='left'>"+materialName3;
-			tableHtml += "</td><td style='font-size: 10px;' align='center'><center>"+count3+"</center>";
+			tableHtml += "<td>"+materialName3;
+			tableHtml += "</td><td><center>"+count3+"</center>";
 			tableHtml += "</td>";
 			
 		}