Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r15245 -r15473 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 15245) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 15473) @@ -1170,7 +1170,12 @@ //打印外部代理灭菌器械包 function defaultForeignPrintPackage(printSummaryObj) { - + var pageType = obj.pageType; + if(isTemplatePageType(pageType)){ + if(invokeTemplatePrintFunction(pageType,obj)){ + return; + } + } if (!isUndefinedOrNullOrEmpty(printSummaryObj.barcode)) { setFormTypeOfPrinted(printSummaryObj); // formTypeOfPrinted = "foreignProxyDisinfectionLabel"; @@ -1257,6 +1262,13 @@ printSummaryObj.packageNumber = getTousseNumber(printSummaryObj.name); printSummaryObj.nameWithoutPartInfo = deleteTousseNumber(printSummaryObj.name); + var pageType = printSummaryObj.pageType; + if(isTemplatePageType(pageType)){ + if(invokeTemplatePrintFunction(pageType,printSummaryObj)){ + return; + } + } + if(labelType == "大标签"){ // printForeignTousse_100x80(barcode,name,material,operator,reviewer,sterilizationDate,validDate,foreignPackageObjectArray,sterilizer,frequency,hospitalName,total); printSummaryObj.formTypeOfPrinted = 'foreignTousseLargeLabel';