Index: ssts-web/src/main/webapp/disinfectsystem/config/gd2zyy/print/printConfig.js =================================================================== diff -u -r14381 -r16903 --- ssts-web/src/main/webapp/disinfectsystem/config/gd2zyy/print/printConfig.js (.../printConfig.js) (revision 14381) +++ ssts-web/src/main/webapp/disinfectsystem/config/gd2zyy/print/printConfig.js (.../printConfig.js) (revision 16903) @@ -815,17 +815,17 @@ setAlignment('center');// 对齐 LODOP.ADD_PRINT_TEXT("6mm","5mm","50mm","10px", "装配员:"+obj.operator); - setFontSizeBold(9,1);// 设置字体 + setFontSizeBold(11,1);// 设置字体 LODOP.ADD_PRINT_TEXT("6mm","55mm","50mm","10px", "审核员:"+obj.reviewer); - setFontSizeBold(9,1);// 设置字体 - LODOP.ADD_PRINT_TEXT("10mm","5mm","50mm","10px", "灭菌日期:"+obj.sterilizationDate); - setFontSizeBold(9,1);// 设置字体 - LODOP.ADD_PRINT_TEXT("10mm","55mm","50mm","10px", "失效日期:"+obj.validDate); - setFontSizeBold(9,1);// 设置字体 + setFontSizeBold(11,1);// 设置字体 + LODOP.ADD_PRINT_TEXT("11mm","5mm","50mm","10px", "灭菌日期:"+obj.sterilizationDate); + setFontSizeBold(11,1);// 设置字体 + LODOP.ADD_PRINT_TEXT("11mm","55mm","50mm","10px", "失效日期:"+obj.validDate); + setFontSizeBold(11,1);// 设置字体 // 打印表格 var tableStr = getMaterialsTabHtml_largeLabel_gd2zyy(obj); - addPrintTable(tableStr,"14mm","0mm","RightMargin:0mm","42mm"); + addPrintTable(tableStr,"16mm","0mm","RightMargin:0mm","44mm"); setAlignment('center');// 居中对齐 LODOP.ADD_PRINT_TEXT("58mm","0mm","RightMargin:50mm","BottomMargin:0mm", "灭菌程序:"+obj.sterilingType); @@ -844,43 +844,62 @@ } //小标签配置,50x30mm var smallLabelConfig = { - // 可带表格线的table定义 - - table : { - rules : 'rows', - style : 'width: 50mm; height: 30mm', - cellspacing : '0', - cellpadding : '0', - position : [0,"0mm","100%","100%"], - printMode : {mode : 'PRINT_PAGE_PERCENT', value : 'Full-Page'}, - beforeStr: "
", afterStr: "", - rows : [ - // 每个表格行的定义 - {height : "", tds : [ - { label : "", dataIndex : 'name', colspan: 4, styles : [{minLen:0, maxLen:10, style: "font-size:14px;font-weight:bold;text-align:center"},{minLen :10, maxLen:100 ,style : "font-size:10px;text-align:center"}]} - ] - }, - {height : "", tds : [ - { label : "灭菌:", dataIndex : '', style : "font-size:12px; text-align:center;width:10mm"}, - { label : "", dataIndex : 'sterilizationDate', style : "font-size:12px; text-align:center;width:20mm"}, - { label : "装配:", dataIndex : '', style : "font-size:12px; text-align:center;width:10mm"}, - { label : "", dataIndex : 'operator', style : "font-size:12px; text-align:center;width:16mm"} - ] - }, - {height : "", tds : [ - { label : "失效:", dataIndex : '', style : "font-size:12px; text-align:center"}, - { label : "", dataIndex : 'validDate', style : "font-size:12px; text-align:center"}, - { label : "审核:", dataIndex : '', style : "font-size:12px; text-align:center"}, - { label : "", dataIndex : 'reviewer', style : "font-size:12px; text-align:center"} - ] - }, - {height : "", tds : [ - { label : "", dataIndex : 'barcode', colspan: 4, style : "font-size:10px;text-align:center"} - ] - } - ] - } + customPrint:printSmallLabel_gd2zyy, + headerContent : [ + // 器械包名称,水平居中 + {label : "", dataIndex : 'name', position : ["0mm","9mm","37mm","4mm"], type: 'html', beforeStr: "