Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r15659 -r15714
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 15659)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 15714)
@@ -1019,7 +1019,9 @@
 	 var remark = top.Ext.getCmp("remark2").getValue();
 	 var hospitalNumber = top.Ext.getCmp("hospitalNumber").getValue();
 	 var applicationTime2 = top.Ext.getCmp("applicationTime2").getValue();
-	 batchPrintInvoices(id, depart, printType,sendTime,sender,serialNumber,remark,applicationTime2,hospitalNumber);
+	 var applicant = top.Ext.getCmp("applicant2").getValue();
+	 
+	 batchPrintInvoices(id, depart, printType,sendTime,sender,serialNumber,remark,applicationTime2,hospitalNumber,applicant);
 
 }
 // 统计总价
@@ -1329,6 +1331,7 @@
   var serialNumber = records[0].data['serialNumber'];
   var sender = records[0].data['sender'];
   var remark = records[0].data['remark'];
+  var applicant = records[0].data['applicant'];
   var applicationTime = records[0].data['applicationTime'];
   for ( var i = 1, len = records.length; i < len; i++){
       if(depart != records[i].data['depart']){
@@ -1345,11 +1348,11 @@
 //          ids = ids + ',' + records[i].data['id'];
 //      }
 //  }
-  batchPrintInvoices(ids, depart, 0,sendTime,sender,serialNumber,remark,applicationTime);
+  batchPrintInvoices(ids, depart, 0,sendTime,sender,serialNumber,remark,applicationTime,null,applicant);
 
 }
 
-function batchPrintInvoices(ids, depart, printType,sendTime,sender,serialNumber,remark,applicationTime,hospitalNumber){
+function batchPrintInvoices(ids, depart, printType,sendTime,sender,serialNumber,remark,applicationTime,hospitalNumber,applicant){
 	  if(ids == null)
 	       return;
 	  var departBarcode = getDepartBarcodeByDepart(depart);
@@ -1374,6 +1377,7 @@
 	    	  result.serialNumber2 = serialNumber;
 	    	  result.remark2 = remark;
 	    	  result.applicationTime = applicationTime;
+	    	  result.applicant = applicant;
 	    	  if(isUndefinedOrNullOrEmpty(result.hospitalNumber) && !isUndefinedOrNullOrEmpty(hospitalNumber)){
 	    		  result.hospitalNumber = hospitalNumber;
 	    	  }
@@ -1405,7 +1409,7 @@
 }
 function batchPrintInvoices_result_default(result, printType) {
 	result.serialNumber = '';
-	result.applicant = '';
+//	result.applicant = '';
 	//result.applicationTime = '';
 	result.printUser = curUserName;
 	result.printTime = Ext.util.Format.date(new Date(), 'Y-m-d H:i');
@@ -1788,6 +1792,7 @@
 	    {name : 'receiptingTime'},
 	    {name : 'personInCharge'},
 	    {name : 'warehouseName'},
+	    {name : 'applicant'},
 	    {name : 'personInChargeCode'}
 	];
 
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
===================================================================
diff -u -r15584 -r15714
--- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js	(.../printConfig.js)	(revision 15584)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js	(.../printConfig.js)	(revision 15714)
@@ -257,40 +257,42 @@
     	            // 页眉名称
     	            //{label : "东莞市中医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]},
     	            // 标题
-    	            {label : "东莞市中医院供应室材料出库单", dataIndex : '', fontSize : 15, position : ["5","40%","99%",5]},
-    	            {label : "出库单号:", dataIndex : 'serialNumber2', fontSize : 11, position : ["30","1.35cm","90%",5]},
-    	            {label : "仓库:", dataIndex : 'sourceWarehouseName', fontSize : 11, position : ["30","45%","90%",5]},
-    	            {label : "领料科室:", dataIndex : 'depart', fontSize : 11, position : ["30","80%","90%",5]},
-    	            {label : "业务类型:科室领用", dataIndex : '', fontSize : 11, position : ["50","1.35cm","90%",5]},
-    	            {label : "摘要:", dataIndex : 'remark2', fontSize : 11, position : ["50","45%","90%",5]},
-    	            {label : "编制日期:", dataIndex : 'sendTime', fontSize : 11, position : ["50","80%","90%",5]},
+    	            {label : "东莞市中医院供应室材料出库单", dataIndex : '', bold:1, fontSize : 15, position : ["5","40%","99%",5]},
+    	            {label : "出库单号:", dataIndex : 'serialNumber2', fontSize : 9, position : ["30","0.25cm","90%",5]},
+    	            {label : "仓库:", dataIndex : 'sourceWarehouseName', fontSize : 9, position : ["30","45%","90%",5]},
+    	            {label : "领料科室:", dataIndex : 'depart', fontSize : 9, position : ["30","80%","90%",5]},
+    	            {label : "业务类型:科室领用", dataIndex : '', fontSize : 9, position : ["50","0.25cm","90%",5]},
+    	            {label : "摘要:", dataIndex : 'remark2', fontSize : 9, position : ["50","30%","90%",5]},
+    	            {label : "领料人:", dataIndex : 'applicant', fontSize : 9, position : ["50","60%","90%",5]},
+    	            {label : "编制日期:", dataIndex : 'sendTime', fontSize : 9, position : ["50","80%","90%",5]},
     	            
 //    	            {label : "住院号:", dataIndex : 'hospitalNumber', fontSize : 11, position : ["50","2%","90%",5]},
     	            //页脚
-    	            {label : "审核人:", dataIndex : '', fontSize : 11, position : ["13cm","1.35cm","90%",5]},
-    	        	{label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["13cm","40%","90%",5]},
-            	    {label : "签收人:", dataIndex : '', fontSize : 11, position : ["13cm","60%","90%",5]}
+    	            {label : "审核人:", dataIndex : '', fontSize : 9, position : ["13cm","0.25cm","90%",5]},
+    	        	{label : "制单人:", dataIndex : 'printUser', fontSize : 9, position : ["13cm","40%","90%",5]},
+            	    {label : "签收人:", dataIndex : '', fontSize : 9, position : ["13cm","60%","90%",5]}
     	        ],
-    	        currentPageNumber : {label : "第#页", fontSize : 11, position : ["13cm","80%","90%",5]},
-    	        totalPageAmount : {label : "共&页", fontSize : 11, position : ["13cm","85%","90%",5]},
+    	        currentPageNumber : {label : "第#页", fontSize : 9, position : ["13cm","80%","90%",5]},
+    	        totalPageAmount : {label : "共&页", fontSize : 9, position : ["13cm","85%","90%",5]},
     	        goodsTable :{
     	        	rowHeight : 20,
-    	        	position : ["70","1.35cm","26cm","10cm"],
+    	        	fontSize : 11,
+    	        	position : ["70","0.25cm","26cm","10cm"],
     	        	headRepeat : true,
     	        	columns : [
     	        	    //{header : "序号", dataIndex : 'serialNumber', width : '5%', align : 'center', fontSize : 11},
-    	        	    {header : "材料编码", dataIndex : 'externalCode', width : 100, align : 'left', fontSize : 11},
-    	                {header : "材料名称", dataIndex : 'name', width : 300, align : 'center', fontSize : 11},
-    	                {header : "规格型号", dataIndex : 'specification', width : 120, align : 'center', fontSize : 11},
-    	                {header : "产地", dataIndex : 'supplierName', width : 200, align : 'center', fontSize : 11},
-    	                {header : "批号", dataIndex : 'batchNumber', width : 100, align : 'center', fontSize : 11},
+    	        	    {header : "材料编码", dataIndex : 'externalCode', width : 100, align : 'left', fontSize : 9},
+    	                {header : "材料名称", dataIndex : 'name', width : 300, align : 'center', fontSize : 9},
+    	                {header : "规格型号", dataIndex : 'specification', width : 120, align : 'center', fontSize : 9},
+    	                {header : "产地", dataIndex : 'supplierName', width : 200, align : 'center', fontSize : 9},
+    	                {header : "批号", dataIndex : 'batchNumber', width : 100, align : 'center', fontSize : 9},
 //    	                {header : "包装规格", dataIndex : 'packageSpec', width : '15%', align : 'center', fontSize : 11},
-    	                {header : "单位", dataIndex : 'unit', width : 80, align : 'center', fontSize : 11},
-    	                {header : "数量", dataIndex : 'amount', width : 80, align : 'right', fontSize : 11},
-    	                {header : "单价", dataIndex : 'price', width : 80, align : 'right', fontSize : 11},
-    	                {header : "金额", dataIndex : 'totalPrice', width : 100, align : 'right', fontSize : 11},
-    	                {header : "有效期", dataIndex : 'expireDate', width : 110, align : 'center', fontSize : 11},
-    	                {header : "备注", dataIndex : '', width : 50, align : 'center', fontSize : 11}
+    	                {header : "单位", dataIndex : 'unit', width : 80, align : 'center', fontSize : 9},
+    	                {header : "数量", dataIndex : 'amount', width : 80, align : 'right', fontSize : 9},
+    	                {header : "单价", dataIndex : 'price', width : 80, align : 'right', fontSize : 9},
+    	                {header : "金额", dataIndex : 'totalPrice', width : 100, align : 'right', fontSize : 9},
+    	                {header : "有效期", dataIndex : 'expireDate', width : 110, align : 'center', fontSize : 9},
+    	                {header : "备注", dataIndex : '', width : 50, align : 'center', fontSize : 9}
     	                
     	            ]
     	        }