Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js =================================================================== diff -u -r17503 -r17927 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 17503) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 17927) @@ -1015,14 +1015,15 @@ function printInvoiceLocal(printType,type,id){ var depart = top.Ext.getCmp("depart2").getValue(); var sendTime = top.Ext.getCmp("sendTime").getRawValue().substring(0,10); + var sendFullTime = top.Ext.getCmp("sendTime").getRawValue(); var serialNumber = top.Ext.getCmp("serialNumber").getValue(); var sender = top.Ext.getCmp("sender").getValue(); var remark = top.Ext.getCmp("remark2").getValue(); var hospitalNumber = top.Ext.getCmp("hospitalNumber").getValue(); var applicationTime2 = top.Ext.getCmp("applicationTime2").getValue(); var applicant = top.Ext.getCmp("applicant2").getValue(); - batchPrintInvoices(id, depart, printType,sendTime,sender,serialNumber,remark,applicationTime2,hospitalNumber,applicant); + batchPrintInvoices(id, depart, printType,sendTime,sender,serialNumber,remark,applicationTime2,hospitalNumber,applicant,sendFullTime); } // 统计总价 @@ -1329,6 +1330,7 @@ // 保证选的是同一部门的发货单 var depart = records[0].data['depart']; var sendTime = records[0].data['sendTime'].substring(0,10); + var sendFullTime = records[0].data['sendTime']; var serialNumber = records[0].data['serialNumber']; var sender = records[0].data['sender']; var remark = records[0].data['remark']; @@ -1349,11 +1351,11 @@ // ids = ids + ',' + records[i].data['id']; // } // } - batchPrintInvoices(ids, depart, 0,sendTime,sender,serialNumber,remark,applicationTime,null,applicant); + batchPrintInvoices(ids, depart, 0,sendTime,sender,serialNumber,remark,applicationTime,null,applicant,sendFullTime); } -function batchPrintInvoices(ids, depart, printType,sendTime,sender,serialNumber,remark,applicationTime,hospitalNumber,applicant){ +function batchPrintInvoices(ids, depart, printType,sendTime,sender,serialNumber,remark,applicationTime,hospitalNumber,applicant,sendFullTime){ if(ids == null) return; var departBarcode = getDepartBarcodeByDepart(depart); @@ -1374,6 +1376,7 @@ result.depart = depart; result.departBarcode = departBarcode; result.sendTime = sendTime; + result.sendFullTime = sendFullTime; result.sender = sender; result.serialNumber2 = serialNumber; result.remark2 = remark;