Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js =================================================================== diff -u -r28106 -r28558 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 28106) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 28558) @@ -1461,28 +1461,33 @@ params : {ids : ids}, success : function(response){ var result = Ext.decode(response.responseText); - result.depart = depart; - result.departBarcode = departBarcode; - result.sendTime = sendTime; - result.sendFullTime = sendFullTime; - result.sender = sender; - result.serialNumber2 = serialNumber; - result.remark2 = remark; - result.applicationTime = applicationTime; - result.applicant = applicant; - if(isUndefinedOrNullOrEmpty(result.hospitalNumber) && !isUndefinedOrNullOrEmpty(hospitalNumber)){ - result.hospitalNumber = hospitalNumber; - } - var dt = new Date(); - var printDate = dt.getFullYear() + "-" + (dt.getMonth() + 1) + "-"+dt.getDate(); - result.printDate = printDate; - invoicePrintModule.batchPrintInvoices_result(result, printType); + if(result.success == true){ + result.depart = depart; + result.departBarcode = departBarcode; + result.sendTime = sendTime; + result.sendFullTime = sendFullTime; + result.sender = sender; + result.serialNumber2 = serialNumber; + result.remark2 = remark; + result.applicationTime = applicationTime; + result.applicant = applicant; + if(isUndefinedOrNullOrEmpty(result.hospitalNumber) && !isUndefinedOrNullOrEmpty(hospitalNumber)){ + result.hospitalNumber = hospitalNumber; + } + var dt = new Date(); + var printDate = dt.getFullYear() + "-" + (dt.getMonth() + 1) + "-"+dt.getDate(); + result.printDate = printDate; + invoicePrintModule.batchPrintInvoices_result(result, printType); + + if (printType == 0){ + updatePrintStatus(ids); + } + hideMessageBox(true); + }else{ + top.Ext.MessageBox.hide(); + showResult(result.message); + } - if (printType == 0){ - updatePrintStatus(ids); - } - - hideMessageBox(true); }, failure: function(response){ showResult("打印失败!"); Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js =================================================================== diff -u -r28508 -r28558 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js (.../invoicePrint.js) (revision 28508) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js (.../invoicePrint.js) (revision 28558) @@ -495,7 +495,7 @@ //DGSDBZXYY-47 外来器械发货单打印格式优化 if(true == sstsConfig.mergePrintForeignTousseInvoiceByApplication){ - if(invoicesInfo.foreignTousseList.length > 0){ + if(invoicesInfo.foreignTousseList && invoicesInfo.foreignTousseList.length > 0){ var foreignTousseObj = printConfig['batchPrintInvoice_foreignGoods']; if(!isUndefinedOrNullOrEmpty(foreignTousseObj)){ if(!isUndefinedOrNullOrEmpty(foreignTousseObj)){