Index: ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/print/printConfig.js
===================================================================
diff -u -r13804 -r14630
--- ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/print/printConfig.js	(.../printConfig.js)	(revision 13804)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/print/printConfig.js	(.../printConfig.js)	(revision 14630)
@@ -154,8 +154,150 @@
 	    	        	        ]
 	    	        }
 }
+function customPrintInvoicePlan_gzzyyfs(printSummaryObj){
+	doGetLodop();
+	setPrinterByConfig();
+	
+	var myObj = printConfig[formTypeOfPrinted];
 
+	// 打印表头的内容
+	if (!isObjEmpty(myObj.headerFooter)){
+		// 设置为页眉页脚模式
+		LODOP.SET_PRINT_STYLE("ItemType",1);
+		
+		for (var i=0;i<myObj.headerFooter.length;i++){
+			var item = myObj.headerFooter[i];
+			
+			var text = item.label;
+			if (item.dataIndex != '' && typeof item.dataIndex != 'undefined'){
+				
+				var temp = printSummaryObj[item.dataIndex];
+				if (temp != null && temp != '' && typeof temp != 'undefined'){
+					
+					// 日期字符串格式化
+					if (item.label.indexOf("日期") > 0){
+						temp = temp.substring(0,10);
+					}
+					
+					text += temp;
+				}
+			}
+			if (item.type == 'html'){
+				// 定义材料表格的打印方式
+				if (item.dataIndex == 'materials'){
+					
+					var markTousse = printSummaryObj['markTousse'];
+					text = getMaterialsTabHtml(printSummaryObj['materials'], markTousse);
+				}
+				
+			}
+			
+			item.text = text;
+			
+			addPrintItem(item, printSummaryObj);
+			
+		}
+	}
+	// 打印页码和总页数
+	if (!isObjEmpty(myObj.currentPageNumber)){
+		LODOP.SET_PRINT_STYLE("ItemType",2);
+		var item = myObj.currentPageNumber;
+		item.text = item.label;
+		addPrintItem(item, printSummaryObj);
+	}
+	if (!isObjEmpty(myObj.totalPageAmount)){
+		LODOP.SET_PRINT_STYLE("ItemType",3);
+		var item = myObj.totalPageAmount;
+		item.text = item.label;
+		addPrintItem(item, printSummaryObj);
+	}
+
+	// 打印条码信息
+	if (!isObjEmpty(myObj.barcodes)){
+		for (var i=0;i<myObj.barcodes.length;i++){
+			var item = myObj.barcodes[i];
+			
+			addPrintBarcode(item, printSummaryObj[item.dataIndex]);
+		}
+	}
+	if (!isObjEmpty(myObj.goodsTable)){
+		LODOP.SET_PRINT_STYLE("ItemType",4);
+		// 打印物品表格
+		// 打印表格头
+		var tableHtml = "<table border =0 cellspacing=0 cellpadding=0 style='border-collapse:collapse' bordercolor='#000000'>";
+		// 如果需要表头在每页重复打印，则增加thead标签
+		if (myObj.goodsTable.headRepeat){
+			tableHtml += "<thead>";
+		}
+		
+		tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight , myObj.goodsTable.fontSize);
+	
+		for (var i=0;i<myObj.goodsTable.columns.length;i++){
+			var item = myObj.goodsTable.columns[i];
+			var style = getTableTdStyle(myObj.goodsTable,i);
+			tableHtml += "<td align='center' width ='" + item.width + "' style=" + style + ">" + item.header + "</td>";
+		}
+		tableHtml += "</tr>";
+	
+		if (myObj.goodsTable.headRepeat){
+			tableHtml += "</thead>";
+		}
+		
+		// 打印物品内容行
+		var columnCount = myObj.goodsTable.columns.length;
+		var goodsArray = printSummaryObj.pages[0].rows;
+		for ( var k = 0; k < goodsArray.length; k++) {
+			var row = goodsArray[k];
+				
+			tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight , myObj.goodsTable.fontSize);
+			
+			for (var i=0;i<columnCount;i++){
+				var item = myObj.goodsTable.columns[i];
+				
+				var value = row[item.dataIndex];
+				if (item.dataIndex.toLowerCase().indexOf("price") >= 0){
+					value = formatMoney(value);
+				}
+				var style = getTableTdStyle(myObj.goodsTable,i);
+				tableHtml += "<td align=" + item.align + " style="+style+">" + value + "&nbsp</td>";
+			}
+			tableHtml += "</tr>";
+		}
+		
+		// 打印合计信息
+		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;
+			}
+			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 += "</table>";
+		
+		LODOP.ADD_PRINT_TABLE(myObj.goodsTable.position[0], myObj.goodsTable.position[1], myObj.goodsTable.position[2], myObj.goodsTable.position[3],tableHtml);
+	}
+}
 var invoicePlanPrintConfig = {
+	customPrint:customPrintInvoicePlan_gzzyyfs,
 	isPrintTousse : true,
 	isPrintDisinfectGoods : true,
     isPrintDisposableGoods : true, // 打印申请单是否打印一次性物品
@@ -166,8 +308,8 @@
     // 在器械包和一次性物品不合并打印的情况下，消毒物品打印方式：
     // 1：优先与一次性物品合并打印，如果无一次性物品则与器械包合并打印， 2：优先与器械包一起合并打印，如果没有器械包则与一次性物品合并打印 ，3：单独打印
     disinfectGoodsPrintMode : 2,
-    rowsPerPage : 9,
-        headerContent : [
+    rowsPerPage : 90000,
+    headerFooter : [
             // 页眉名称
             {label : "广州中医药大学第三附属医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]},
             // 标题
@@ -177,12 +319,17 @@
         	{label : "仓库:消毒供应中心", dataIndex : '', fontSize : 11, position : ["55","75%","90%",5]},
         	{label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["80","75%","90%",5]},
         	{label : "提交时间:", dataIndex : 'applicationTime', fontSize : 11, position : ["80","35%","90%",5]},
-        	{label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["80","2%","90%",5]}
+        	{label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["80","2%","90%",5]},
+        	//页脚
+    	    {label : "主管:", dataIndex : '', fontSize : 11, position : ["410","2%","90%",5]},
+    	    {label : "领料人:", dataIndex : '', fontSize : 11, position : ["410","20%","90%",5]},
+    	    {label : "发料人:", dataIndex : 'printUser', fontSize : 11, position : ["410","38%","90%",5]},
+    	    {label : "发货日期:", dataIndex : 'printTime', fontSize : 11, position : ["410","57%","90%",5]}
         ],
         goodsTable :{
         	rowHeight : 25,
-        	position : ["100","1%","97%","2000"],
-        	content : [
+        	position : ["100","1%","97%","305"],
+        	columns : [
                 {header : "序号", dataIndex : 'serialNumber', width : 60, align : 'center', fontSize : 11},
                 {header : "名称", dataIndex : 'goodsName', width : 340, align : 'left', fontSize : 11},
                 {header : "规格", dataIndex : 'sp', width : 185, align : 'center', fontSize : 11},
@@ -193,15 +340,8 @@
                 {header : "金额", dataIndex : 'rowPrice', width : 75, align : 'right', fontSize : 11}
             ]
         },
-        footer: {
-        	fontSize : 15,
-        	content : [
-        	    {label : "<br>主管:      ", dataIndex : ''},
-        	    {label : "   领料人:      ", dataIndex : ''},
-        	    {label : "   发料人: ", dataIndex : 'printUser'},
-        	    {label : "   发货日期:", dataIndex : 'printTime'}
-        	]
-        },
+        currentPageNumber : {label : "第#页", fontSize : 11, position : ["410","83%","90%",5]},
+        totalPageAmount : {label : "/共&页", fontSize : 11, position : ["410","89%","90%",5]},
     	barcodes : [
 				{codeType : "128Auto", dataIndex : 'departBarcode', position : ["3mm","74%","40mm","8mm"],
 					styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true},