Index: ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js =================================================================== diff -u -r14252 -r14453 --- ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js (.../printConfig.js) (revision 14252) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js (.../printConfig.js) (revision 14453) @@ -638,6 +638,12 @@ function printMiddleLable_gzspyqzyy(obj){ doGetLodop(); + + if(obj.markTousse){ + LODOP.ADD_PRINT_LINE('6mm','0mm','6mm','77mm',0,1); + LODOP.ADD_PRINT_LINE('14.5mm','0mm','14.5mm','77mm',0,1); + } + // 设置默认字体 setDefaultFontNameSizeBold('宋体',12,1); // 默认条码属性 @@ -646,7 +652,7 @@ LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true); var fontSize = getFontSizeByStr(obj.name,[ - {maxLen:10,fontSize:15}, + {maxLen:10,fontSize:14}, {maxLen:20,fontSize:11}, {maxLen:30,fontSize:8}, {maxLen:1000,fontSize:8} @@ -665,7 +671,7 @@ setFontSizeBold(11,0);// 设置字体 var tableStr = getMaterialsTabHtml_middleLabel(obj); - addPrintTable(tableStr,"14mm","2mm","RightMargin:1mm","40mm"); + addPrintTable(tableStr,"15mm","2mm","RightMargin:1mm","40mm"); setAlignment('center');// 居中对齐 LODOP.ADD_PRINT_TEXT("41mm","2mm","40mm","5mm", "灭菌炉:" + obj.sterilizer); @@ -679,6 +685,11 @@ // 消毒物品的打印 function printMiddleLable_gzspyqzyy_disinfect(obj){ doGetLodop(); + + if(obj.markTousse){ + LODOP.ADD_PRINT_LINE('6mm','0mm','6mm','77mm',0,1); + LODOP.ADD_PRINT_LINE('15.5mm','0mm','15.5mm','77mm',0,1); + } // 设置默认字体 setDefaultFontNameSizeBold('宋体',12,1); // 默认条码属性 @@ -687,7 +698,7 @@ LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true); var fontSize = getFontSizeByStr(obj.name,[ - {maxLen:10,fontSize:10}, + {maxLen:10,fontSize:14}, {maxLen:20,fontSize:8}, {maxLen:30,fontSize:8}, {maxLen:1000,fontSize:8} @@ -697,15 +708,15 @@ setFontSizeBold(fontSize,1);// 设置字体 setAlignment('center');// 对齐 - LODOP.ADD_PRINT_TEXT("5mm","5mm","44mm","6mm", "消毒时间:"+obj.sterilizationDate); - setFontSizeBold(9,0);// 设置字体 - LODOP.ADD_PRINT_TEXT("5mm","43mm","30mm","6mm", "清洗员:"+obj.washOperator); - setFontSizeBold(9,0);// 设置字体 - LODOP.ADD_PRINT_TEXT("8mm","5mm","44mm","6mm", "装配员:"+obj.operator); - setFontSizeBold(9,0);// 设置字体 + LODOP.ADD_PRINT_TEXT("7mm","43mm","30mm","6mm", "清洗员:"+obj.washOperator); + setFontSizeBold(11,0);// 设置字体 + LODOP.ADD_PRINT_TEXT("7mm","5mm","44mm","6mm", "装配员:"+obj.operator); + setFontSizeBold(11,0);// 设置字体 + LODOP.ADD_PRINT_TEXT("11mm","5mm","44mm","6mm", "消毒时间:"+obj.sterilizationDate); + setFontSizeBold(11,0);// 设置字体 var tableStr = getMaterialsTabHtml_largeLabel(obj); - addPrintTable(tableStr,"11mm","2mm","RightMargin:1mm","40mm"); + addPrintTable(tableStr,"16mm","2mm","RightMargin:1mm","40mm"); setAlignment('center');// 居中对齐 LODOP.ADD_PRINT_BARCODE("40mm","40mm","30mm","8mm","128Auto", obj.barcode);// 条码1 @@ -925,6 +936,10 @@ function printLargeLabel(obj){ doGetLodop(); + if(obj.markTousse){ + LODOP.ADD_PRINT_LINE('6.5mm','0mm','6.5mm','100mm',0,1); + LODOP.ADD_PRINT_LINE('15mm','0mm','15mm','100mm',0,1); + } // 设置默认字体 setDefaultFontNameSizeBold('宋体',10,1); // 默认条码属性