Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r14392 -r14569 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 14392) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 14569) @@ -48,7 +48,6 @@ // 打印表单的类型 var formTypeOfPrinted = PRINT_FORM_TYPE_INVOICEPLAN; - function getMaterialsTabHtml(materialsJsonArr, markTousse){ //绘制材料明细表格 // 打印材料明细 @@ -1062,6 +1061,7 @@ } function setPrinterByConfig(){ // 读取配置,如果没有获取到对应的打印机,则会用默认打印机打印。 + doGetLodop(); var printerName = getPrinterNameByType(formTypeOfPrinted); if(printerName == null){ // 未配置,设置为默认打印机 @@ -1070,7 +1070,6 @@ LODOP.SET_PRINTER_INDEX(printerName); } -// alert(printerName) } function printPackage_60x80(barcode,name,material,operator,reviewer,sterilizationDate,validDate,hospitalName,sterilizer,frequency,markTousse,sterilingType) { LODOP = getLodop(document.getElementById('LODOP'), document @@ -2016,7 +2015,7 @@ if(isUndefinedOrNullOrEmpty(idCardInstance.configKey)){ var paperType = idCardInstance.idCardPaperType; - var formTypeOfPrinted = "idCardLargeLabel"; + formTypeOfPrinted = "idCardLargeLabel"; if(paperType == "大标签"){ formTypeOfPrinted = "idCardLargeLabel"; }else if(paperType == "中标签"){ @@ -2027,6 +2026,8 @@ formTypeOfPrinted = "idCardLargeLabel"; } idCardInstance.configKey = formTypeOfPrinted; + }else{ + formTypeOfPrinted = idCardInstance.configKey; } var configObj = printConfig[idCardInstance.configKey]; if(isUndefinedOrNullOrEmpty(configObj)){ @@ -2035,6 +2036,7 @@ // return; configObj = idCardLargeLabelConfig_default; } + setPrinterByConfig(); // 自定义打印 if (!isUndefinedOrNullOrEmpty(configObj.customPrint)) { configObj.customPrint(idCardInstance);