Index: ssts-web/src/main/webapp/disinfectsystem/config/dysyy/print/printConfig.js =================================================================== diff -u -r14890 -r14893 --- ssts-web/src/main/webapp/disinfectsystem/config/dysyy/print/printConfig.js (.../printConfig.js) (revision 14890) +++ ssts-web/src/main/webapp/disinfectsystem/config/dysyy/print/printConfig.js (.../printConfig.js) (revision 14893) @@ -1212,7 +1212,9 @@ setFontSizeBold(8,0);// 设置字体 LODOP.ADD_PRINT_TEXT("32mm","20mm","40mm","5mm", "灭菌员:"+emptyStringIfUndefinedOrNull(obj.operator)); setFontSizeBold(8,0);// 设置字体 - LODOP.ADD_PRINT_TEXT("32mm","50mm","40mm","5mm", "炉次:"+emptyStringIfUndefinedOrNull(obj.frequency)); + + var frequency = emptyStringIfUndefinedOrNull(obj.sterilizerName)+'-'+emptyStringIfUndefinedOrNull(obj.sterileFrequency); + LODOP.ADD_PRINT_TEXT("32mm","50mm","40mm","5mm", "炉号/炉次:"+frequency); setFontSizeBold(8,0);// 设置字体 LODOP.ADD_PRINT_BARCODE("38mm","2mm","30mm","11mm","128Auto", obj.barcode);// 条码1 @@ -1276,7 +1278,9 @@ setFontSizeBold(8,0);// 设置字体 LODOP.ADD_PRINT_TEXT("32mm","20mm","40mm","5mm", "灭菌员:"+emptyStringIfUndefinedOrNull(obj.operator)); setFontSizeBold(8,0);// 设置字体 - LODOP.ADD_PRINT_TEXT("32mm","50mm","40mm","5mm", "炉次:"+emptyStringIfUndefinedOrNull(obj.frequency)); + + var frequency = emptyStringIfUndefinedOrNull(obj.sterilizerName)+'-'+emptyStringIfUndefinedOrNull(obj.sterileFrequency); + LODOP.ADD_PRINT_TEXT("32mm","50mm","40mm","5mm", "炉号/炉次:"+frequency); setFontSizeBold(8,0);// 设置字体 LODOP.ADD_PRINT_BARCODE("38mm","2mm","30mm","11mm","128Auto", obj.barcode);// 条码1