Index: ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js
===================================================================
diff -u -r13898 -r13915
--- ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js	(.../printConfig.js)	(revision 13898)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js	(.../printConfig.js)	(revision 13915)
@@ -52,15 +52,15 @@
             // 标题
             {label : "材料出库单", dataIndex : '', fontSize : 15, position : ["20","40%","99%",5]},
             {label : "部门：", dataIndex : 'depart', fontSize : 11, position : ["55","2%","90%",5]},
-        	{label : "单号：", dataIndex : 'serialNumber', fontSize : 11, position : ["55","35%","90%",5]},
+        	{label : "单号：", dataIndex : 'serialNumber2', fontSize : 11, position : ["55","35%","90%",5]},
         	{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 : 'printUser', fontSize : 11, position : ["80","35%","90%",5]},
+        	{label : "申请时间:", dataIndex : 'applicationTime', fontSize : 11, position : ["80","2%","90%",5]},
+        	{label : "备注:", dataIndex : 'remark2', fontSize : 11, position : ["465","5%","90%",5]},
     	    {label : "主管:", dataIndex : '', fontSize : 11, position : ["415","5%","90%",5]},
     	    {label : "领料人:", dataIndex : '', fontSize : 11, position : ["415","40%","90%",5]},
     	    {label : "发货员:", dataIndex : 'sender', fontSize : 11, position : ["415","75%","90%",5]},
-    	    {label : "发货日期:", dataIndex : 'sendTime', fontSize : 11, position : ["445","5%","90%",5]},
+    	    {label : "发货日期:", dataIndex : 'sendTime', fontSize : 11, position : ["440","5%","90%",5]},
 	    	{barcodes : [
 				{codeType : "128Auto", dataIndex : 'departBarcode', position : ["3mm","74%","40mm","8mm"],
 					styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true},
@@ -70,8 +70,8 @@
 			    }
 		    ]}
         ],
-        currentPageNumber : {label : "第#页", fontSize : 11, position : ["445","75%","90%",5]},
-        totalPageAmount : {label : "共&页", fontSize : 11, position : ["445","81%","90%",5]},
+        currentPageNumber : {label : "第#页", fontSize : 11, position : ["440","75%","90%",5]},
+        totalPageAmount : {label : "共&页", fontSize : 11, position : ["440","81%","90%",5]},
         goodsTable :{
         	rowHeight : 25,
         	fontSize : 11,
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r13906 -r13915
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 13906)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 13915)
@@ -915,7 +915,7 @@
 	});
 
 	window.show();
-	top.Ext.getCmp('depart1').focus(false, 100);
+	//top.Ext.getCmp('depart1').focus(false, 100);
 	
 	form.form.load({
 		url : WWWROOT + '/disinfectSystem/invoiceAction!loadInvoice.do',
@@ -984,7 +984,8 @@
 	 var serialNumber = top.Ext.getCmp("serialNumber").getValue();
 	 var sender = top.Ext.getCmp("sender").getValue();
 	 var remark = top.Ext.getCmp("remark2").getValue();
-	 batchPrintInvoices(id, depart, printType,sendTime,sender,serialNumber,remark);
+	 var applicationTime2 = top.Ext.getCmp("applicationTime2").getValue();
+	 batchPrintInvoices(id, depart, printType,sendTime,sender,serialNumber,remark,applicationTime2);
 
 }
 // 统计总价
@@ -1277,6 +1278,7 @@
   var serialNumber = records[0].data['serialNumber'];
   var sender = records[0].data['sender'];
   var remark = records[0].data['remark'];
+  var applicationTime = records[0].data['applicationTime'];
   for ( var i = 1, len = records.length; i < len; i++){
       if(depart != records[i].data['depart']){
           showResult("请选择相同科室的发货单！");
@@ -1292,11 +1294,11 @@
           ids = ids + ',' + records[i].data['id'];
       }
   }
-  batchPrintInvoices(ids, depart, 0,sendTime,sender,serialNumber,remark);
+  batchPrintInvoices(ids, depart, 0,sendTime,sender,serialNumber,remark,applicationTime);
 
 }
 
-function batchPrintInvoices(ids, depart, printType,sendTime,sender,serialNumber,remark){
+function batchPrintInvoices(ids, depart, printType,sendTime,sender,serialNumber,remark,applicationTime){
 	  if(ids == null)
 	       return;
 	  var departBarcode = getDepartBarcodeByDepart(depart);
@@ -1320,6 +1322,7 @@
 	    	  result.sender = sender;
 	    	  result.serialNumber2 = serialNumber;
 	    	  result.remark2 = remark;
+	    	  result.applicationTime = applicationTime;
 	    	  var dt = new Date();
 	    	  var printDate = dt.getFullYear() + "-" + (dt.getMonth() + 1) + "-"+dt.getDate();
 	    	  result.printDate = printDate;
@@ -1349,7 +1352,7 @@
 function batchPrintInvoices_result_default(result, printType) {
 	result.serialNumber = '';
 	result.applicant = '';
-	result.applicationTime = '';
+	//result.applicationTime = '';
 	result.printUser = curUserName;
 	result.printTime = Ext.util.Format.date(new Date(), 'Y-m-d H:i');
 	result.remark = '';