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 = '';