Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r17771 -r17871
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 17771)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 17871)
@@ -433,34 +433,80 @@
 			}
 			tableHtml += "</tr>";
 		}
-		
-		// 打印合计信息
-		tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight , myObj.goodsTable.fontSize);
-		var style = getTableTdStyle(myObj.goodsTable,0);
-		tableHtml += "<td style="+style+" align='center'>合计</td>";
+		//打印表格表尾的统计信息
+		if(myObj.goodsTable.footer){
+			tableHtml += "<tfoot>"
+			var rowCount = myObj.goodsTable.footer.length;
+			for(var row = 0; row < rowCount;++row){
+				var rowObj = myObj.goodsTable.footer[row];
+				tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight , myObj.goodsTable.fontSize);
+				var colIndex = 0;
+				for(var col=0;col<rowObj.length;++col){
+					var columnObj = rowObj[col];
+					var text = columnObj.text;
+					var tdata = columnObj.tdata;
+					var tindex = columnObj.tindex;
+					var format = columnObj.format;
+					var colspan = columnObj.colspan;
+					var align = columnObj.align;
+					
+					if(isUndefinedOrNullOrEmpty(text)){
+						text = '';
+					}
+					if(isUndefinedOrNullOrEmpty(align)){
+						align = 'center';
+					}
+					if(isUndefinedOrNullOrEmpty(colspan)){
+						colspan = 1;
+					}
+					var style = getTableTdStyle(myObj.goodsTable,colIndex);
+					colIndex += parseInt(colspan);
+					tableHtml += "<td align='" + align + "' style=" + style + " colspan='" + colspan + "'";
+					if(tdata){
+						tableHtml += " tdata='" + tdata + "'";
+					}
+					if(tindex){
+						tableHtml += " tindex=" + tindex;
+					}
+					if(format){
+						tableHtml += " format='" + format + "'";
+					}
+					tableHtml += ">" + text + "&nbsp</td>";
+				}
+				tableHtml += "</tr>";
+			}
+			tableHtml += "</tfoot>";
+		}
+		if(!myObj.goodsTable.donotPrintTotal){
+			// 打印合计信息
+			tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight , myObj.goodsTable.fontSize);
+			var style = getTableTdStyle(myObj.goodsTable,0);
+			tableHtml += "<td style="+style+" align='center'>合计</td>";
 
-		for (var i=1;i<columnCount;i++){
-			var item = myObj.goodsTable.columns[i];
-			var style = getTableTdStyle(myObj.goodsTable,i);
-			var value = "";
-			var indexName = item.dataIndex;
-			if (indexName == "goodsAmount" || indexName.toLowerCase().indexOf("count") >= 0  || indexName == "amount"){
-				value = printSummaryObj.totalGoodsAmount;
+			for (var i=1;i<columnCount;i++){
+				var item = myObj.goodsTable.columns[i];
+				var style = getTableTdStyle(myObj.goodsTable,i);
+				var value = "";
+				var indexName = item.dataIndex;
+				if (indexName == "goodsAmount" || indexName.toLowerCase().indexOf("count") >= 0  || indexName == "amount"){
+					value = printSummaryObj.totalGoodsAmount;
+				}
+				else if (indexName == "applyAmount"){
+					value = printSummaryObj.totalApplyAmount;
+				}
+				else if (indexName == "recyclingAmount"){
+					value = printSummaryObj.totalRecyclingAmount;
+				}
+				else if(indexName == "rowPrice" || indexName == "totalPrice"){
+					value = formatMoney(printSummaryObj.totalPrice);
+				}
+
+				tableHtml += "<td align=" + item.align + " style="+style+">" + value + "&nbsp</td>";
 			}
-			else if (indexName == "applyAmount"){
-				value = printSummaryObj.totalApplyAmount;
-			}
-			else if (indexName == "recyclingAmount"){
-				value = printSummaryObj.totalRecyclingAmount;
-			}
-			else if(indexName == "rowPrice" || indexName == "totalPrice"){
-				value = formatMoney(printSummaryObj.totalPrice);
-			}
 
-			tableHtml += "<td align=" + item.align + " style="+style+">" + value + "&nbsp</td>";
+			tableHtml += "</tr>";
 		}
-
-		tableHtml += "</tr>";
+		
 		tableHtml += "</table>";
 		
 		LODOP.ADD_PRINT_TABLE(myObj.goodsTable.position[0], myObj.goodsTable.position[1], myObj.goodsTable.position[2], myObj.goodsTable.position[3],tableHtml);