Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js =================================================================== diff -u -r13898 -r14510 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js (.../invoicePrint.js) (revision 13898) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js (.../invoicePrint.js) (revision 14510) @@ -441,21 +441,36 @@ invoicesInfo.goods = goods; printInvoiceInfo_local(invoicesInfo, printType); - }else{ + }else{ // 器械包 if(invoicesInfo.tousse.length > 0){ + invoicesInfo.formTypeOfPrinted = 'batchPrintInvoices'; + var tousseObj = printConfig['batchPrintInvoice_Tousse']; + if(!isUndefinedOrNullOrEmpty(tousseObj)){ + invoicesInfo.formTypeOfPrinted = 'batchPrintInvoice_Tousse'; + } invoicesInfo.goods = invoicesInfo.tousse; printInvoiceInfo_local(invoicesInfo, printType); } // 一次性物品 if(invoicesInfo.diposableGoods.length > 0){ //invoicesInfo.applicationType = "一次性物品申请单"; + invoicesInfo.formTypeOfPrinted = 'batchPrintInvoices'; + var tousseObj = printConfig['batchPrintInvoice_disposable']; + if(!isUndefinedOrNullOrEmpty(tousseObj)){ + invoicesInfo.formTypeOfPrinted = 'batchPrintInvoice_disposable'; + } invoicesInfo.goods = invoicesInfo.diposableGoods; printInvoiceInfo_local(invoicesInfo, printType); } // 消毒物品 if(invoicesInfo.disinfectGoods.length > 0){ //invoicesInfo.applicationType = "消毒物品申请单"; + invoicesInfo.formTypeOfPrinted = 'batchPrintInvoices'; + var tousseObj = printConfig['batchPrintInvoice_disinfect']; + if(!isUndefinedOrNullOrEmpty(tousseObj)){ + invoicesInfo.formTypeOfPrinted = 'batchPrintInvoice_disinfect'; + } invoicesInfo.goods = invoicesInfo.disinfectGoods; printInvoiceInfo_local(invoicesInfo, printType); }