Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js =================================================================== diff -u -r15277 -r15281 --- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js (.../printConfig.js) (revision 15277) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js (.../printConfig.js) (revision 15281) @@ -992,8 +992,8 @@ doGetLodop(); // 划线 if(obj.markTousse){ - LODOP.ADD_PRINT_LINE('4mm',childXToParentX(cfg,indexInColumn,0),'4mm',childXToParentX(cfg,indexInColumn,40),0,1); - LODOP.ADD_PRINT_LINE('13.5mm',childXToParentX(cfg,indexInColumn,0),'13.5mm',childXToParentX(cfg,indexInColumn,40),0,1); + LODOP.ADD_PRINT_LINE('5.5mm',childXToParentX(cfg,indexInColumn,0),'5.5mm',childXToParentX(cfg,indexInColumn,40),0,1); + LODOP.ADD_PRINT_LINE('15mm',childXToParentX(cfg,indexInColumn,0),'15mm',childXToParentX(cfg,indexInColumn,40),0,1); } // LODOP.ADD_PRINT_LINE('20mm',childXToParentX(cfg,indexInColumn,0),'20mm',childXToParentX(cfg,indexInColumn,40),0,1); // 设置默认字体 @@ -1004,28 +1004,31 @@ LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true); var fontSize = getFontSizeByStr(obj.name,[ - {maxLen:10,fontSize:6}, - {maxLen:20,fontSize:5}, + {maxLen:5,fontSize:10}, + {maxLen:10,fontSize:9}, + {maxLen:15,fontSize:6}, + {maxLen:20,fontSize:6}, {maxLen:20,fontSize:4}, {maxLen:1000,fontSize:3} ]); - LODOP.ADD_PRINT_TEXT("1mm",childXToParentX(cfg,indexInColumn,1),"40mm","3mm", obj.name); + LODOP.ADD_PRINT_TEXT("1mm",childXToParentX(cfg,indexInColumn,1),"40mm","4.5mm", obj.name); setFontSizeBold(fontSize,1);// 设置字体 setAlignment('center');// 对齐 +// LODOP.SET_PRINT_STYLEA(0,'LineSpacing', 0); var sterilizationDate = "灭菌日期:"+obj.sterilizationDate+' ['+obj.virtualBasketSeqNum+']'; - LODOP.ADD_PRINT_TEXT("4mm",childXToParentX(cfg,indexInColumn,1),"60mm","3mm", sterilizationDate); + LODOP.ADD_PRINT_TEXT("5.5mm",childXToParentX(cfg,indexInColumn,1),"60mm","3mm", sterilizationDate); setFontSizeBold(9,0);// 设置字体 - LODOP.ADD_PRINT_TEXT("7mm",childXToParentX(cfg,indexInColumn,1),"60mm","3mm", "失效日期:"+obj.validDate); + LODOP.ADD_PRINT_TEXT("8.5mm",childXToParentX(cfg,indexInColumn,1),"60mm","3mm", "失效日期:"+obj.validDate); setFontSizeBold(9,0);// 设置字体 var line4 = "制作:"+obj.operator+' 核对:'+obj.reviewer; - LODOP.ADD_PRINT_TEXT("10mm",childXToParentX(cfg,indexInColumn,1),"60mm","3mm", line4); + LODOP.ADD_PRINT_TEXT("11.5mm",childXToParentX(cfg,indexInColumn,1),"60mm","3mm", line4); setFontSizeBold(9,0);// 设置字体 - LODOP.ADD_PRINT_BARCODE("13.5mm",childXToParentX(cfg,indexInColumn,5),"30mm","5mm","128Auto", obj.barcode);// 条码1 + LODOP.ADD_PRINT_BARCODE("15mm",childXToParentX(cfg,indexInColumn,1),"30mm","5mm","128Auto", obj.barcode);// 条码1 LODOP.SET_PRINT_STYLEA(0,'ShowBarText', false); - LODOP.ADD_PRINT_TEXT("18.5mm",childXToParentX(cfg,indexInColumn,5),"30mm","1.5mm", obj.barcode); - setFontSizeBold(4,0);// 设置字体 + LODOP.ADD_PRINT_TEXT("16.5mm",childXToParentX(cfg,indexInColumn,27),"30mm","1.5mm", obj.barcode); + setFontSizeBold(7,0);// 设置字体 } var middleLable2Config = { table : {