Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js =================================================================== diff -u -r12839 -r12906 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 12839) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 12906) @@ -1002,7 +1002,8 @@ var sendTime = top.Ext.getCmp("sendTime").getRawValue().substring(0,10); var serialNumber = top.Ext.getCmp("serialNumber").getValue(); var sender = top.Ext.getCmp("sender").getValue(); - batchPrintInvoices(id, depart, printType,sendTime,sender,serialNumber); + var remark = top.Ext.getCmp("remark2").getValue(); + batchPrintInvoices(id, depart, printType,sendTime,sender,serialNumber,remark); } // 统计总价 @@ -1294,6 +1295,7 @@ var sendTime = records[0].data['sendTime'].substring(0,10); var serialNumber = records[0].data['serialNumber']; var sender = records[0].data['sender']; + var remark = records[0].data['remark']; for ( var i = 1, len = records.length; i < len; i++){ if(depart != records[i].data['depart']){ showResult("请选择相同科室的申请单!"); @@ -1309,11 +1311,11 @@ ids = ids + ',' + records[i].data['id']; } } - batchPrintInvoices(ids, depart, 0,sendTime,sender,serialNumber); + batchPrintInvoices(ids, depart, 0,sendTime,sender,serialNumber,remark); } -function batchPrintInvoices(ids, depart, printType,sendTime,sender,serialNumber){ +function batchPrintInvoices(ids, depart, printType,sendTime,sender,serialNumber,remark){ if(ids == null) return; var departBarcode = getDepartBarcodeByDepart(depart); @@ -1336,6 +1338,7 @@ result.sendTime = sendTime; result.sender = sender; result.serialNumber2 = serialNumber; + result.remark2 = remark; var dt = new Date(); var printDate = dt.getFullYear() + "-" + (dt.getMonth() + 1) + "-"+dt.getDate(); result.printDate = printDate;