Index: ssts-web/src/main/webapp/disinfectsystem/config/dysyy/print/printConfig.js =================================================================== diff -u -r14902 -r14903 --- ssts-web/src/main/webapp/disinfectsystem/config/dysyy/print/printConfig.js (.../printConfig.js) (revision 14902) +++ ssts-web/src/main/webapp/disinfectsystem/config/dysyy/print/printConfig.js (.../printConfig.js) (revision 14903) @@ -1071,8 +1071,8 @@ // 划线 if(obj.markTousse){ - LODOP.ADD_PRINT_LINE('6mm','0mm','6mm','65mm',0,1); - LODOP.ADD_PRINT_LINE('34mm','0mm','34mm','65mm',0,1); + LODOP.ADD_PRINT_LINE('8mm','0mm','8mm','65mm',0,1); + LODOP.ADD_PRINT_LINE('36mm','0mm','36mm','65mm',0,1); } // 设置默认字体 setDefaultFontNameSizeBold('宋体',15,1); @@ -1081,53 +1081,52 @@ LODOP.SET_PRINT_STYLE('FontSize', 6); LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true); - LODOP.ADD_PRINT_TEXT("1mm","12mm","RightMargin:0mm","6mm", '德阳市人民医院'); - setFontSizeBold(9,0);// 设置字体 + LODOP.ADD_PRINT_TEXT("2mm","12mm","RightMargin:0mm","8mm", '德阳市人民医院'); + setFontSizeBold(10,0);// 设置字体 - LODOP.ADD_PRINT_TEXT("0.5mm","38mm","RightMargin:0mm","3mm", '消毒供应中心灭菌标签'); - setFontSizeBold(6,0);// 设置字体 - LODOP.ADD_PRINT_TEXT("3mm","38mm","RightMargin:0mm","3mm", '电话:0838-2418425'); - setFontSizeBold(6,0);// 设置字体 + LODOP.ADD_PRINT_TEXT("1mm","37mm","RightMargin:0mm","4mm", '消毒供应中心灭菌标签'); + setFontSizeBold(7,0);// 设置字体 + LODOP.ADD_PRINT_TEXT("4.5mm","37mm","RightMargin:0mm","3mm", '电话:0838-2418425'); + setFontSizeBold(7,0);// 设置字体 var tousseName = '品名:'+obj.name; var fontSize = getFontSizeByStr(obj.name,[ - {maxLen:5,fontSize:18}, {maxLen:10,fontSize:13}, - {maxLen:20,fontSize:9}, + {maxLen:20,fontSize:8}, {maxLen:30,fontSize:7}, {maxLen:200,fontSize:5} ]); - LODOP.ADD_PRINT_TEXT("7mm","1mm","12mm","5mm", '品名:'); + LODOP.ADD_PRINT_TEXT("9mm","1mm","12mm","5mm", '品名:'); setFontSizeBold(10,0);// 设置字体 - LODOP.ADD_PRINT_TEXT("7mm","11mm","RightMargin:0mm","9mm", obj.name); + LODOP.ADD_PRINT_TEXT("9mm","11mm","RightMargin:0mm","9mm", obj.name); setFontSizeBold(fontSize,1);// 设置字体 // LODOP.ADD_PRINT_TEXT("14mm","1mm","60mm","5mm", "科室:"+emptyStringIfUndefinedOrNull(obj.department)); - LODOP.ADD_PRINT_TEXT("14mm","1mm","60mm","5mm", "科室:"+'消毒供应中心'); + LODOP.ADD_PRINT_TEXT("16mm","1mm","60mm","5mm", "科室:"+'消毒供应中心'); setFontSizeBold(10,0);// 设置字体 - LODOP.ADD_PRINT_TEXT("19mm","1mm","40mm","5mm", "配包:"+obj.operator); + LODOP.ADD_PRINT_TEXT("21mm","1mm","40mm","5mm", "配包:"+obj.operator); setFontSizeBold(10,0);// 设置字体 - LODOP.ADD_PRINT_TEXT("19mm","32mm","40mm","5mm", "核包:"+obj.reviewer); + LODOP.ADD_PRINT_TEXT("21mm","32mm","40mm","5mm", "核包:"+obj.reviewer); setFontSizeBold(10,0);// 设置字体 - LODOP.ADD_PRINT_TEXT("24mm","1mm","40mm","5mm", "灭菌:"+obj.sterilizationDate); + LODOP.ADD_PRINT_TEXT("26mm","1mm","40mm","5mm", "灭菌:"+obj.sterilizationDate); setFontSizeBold(10,0);// 设置字体 - LODOP.ADD_PRINT_TEXT("24mm","32mm","40mm","5mm", "失效:"+obj.validDate); + LODOP.ADD_PRINT_TEXT("26mm","32mm","40mm","5mm", "失效:"+obj.validDate); setFontSizeBold(10,0);// 设置字体 - LODOP.ADD_PRINT_TEXT("29mm","1mm","40mm","5mm", "灭菌员:"+obj.operator); + LODOP.ADD_PRINT_TEXT("31mm","1mm","40mm","5mm", "灭菌员:"+obj.operator); setFontSizeBold(10,0);// 设置字体 var frequency = emptyStringIfUndefinedOrNull(obj.sterilizerName)+'-'+emptyStringIfUndefinedOrNull(obj.sterileFrequency); - LODOP.ADD_PRINT_TEXT("29mm","32mm","40mm","5mm", "锅号/次:"+frequency); + LODOP.ADD_PRINT_TEXT("31mm","32mm","40mm","5mm", "锅号/次:"+frequency); setFontSizeBold(10,0);// 设置字体 - LODOP.ADD_PRINT_BARCODE("35mm","6mm","30mm","11mm","128Auto", obj.barcode);// 条码1 + LODOP.ADD_PRINT_BARCODE("37mm","6mm","30mm","11mm","128Auto", obj.barcode);// 条码1 LODOP.SET_PRINT_STYLEA(0,'ShowBarText',0); setAlignment('center');// 对齐 - LODOP.ADD_PRINT_TEXT("38mm","35mm","30mm","11mm", obj.barcode); + LODOP.ADD_PRINT_TEXT("40mm","37mm","30mm","11mm", 'No:'+obj.barcode); setFontSizeBold(10,0);// 设置字体 } var foreignProxyDisinfectionLabelConfig = {