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'} ];