Index: ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js =================================================================== diff -u -r27074 -r28382 --- ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js (.../printConfig.js) (revision 27074) +++ ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js (.../printConfig.js) (revision 28382) @@ -1054,7 +1054,7 @@ colsPerRow = 3;//大于30个材料分三列 } var materialStr = ""; - var fontSize = 8; + var fontSize = 12; var rows = (materialsAmount+1) / colsPerRow ; if(rows > 20){ fontSize = 2; @@ -1068,7 +1068,11 @@ fontSize = 6; }else if(rows > 8){ fontSize = 7; - }//小于等于8行就用字体8 + }else if (rows > 4){ + fontSize = 8; + }else if (rows > 3){ + fontSize = 9; + }//小于等于3行就用字体12 for (var i=0;i", afterStr: ""}, //{label : "", dataIndex : 'sterilingType', position : ["32mm","1mm","26mm","3mm"], type: 'html', beforeStr: "
", afterStr: "
"}, // 器械包名称,水平居中 - {label : "", dataIndex : 'name', position : ["0mm","14mm","RightMargin:0mm","5mm"], type: 'html', beforeStr: "
", afterStr: "
"}, + {label : "", dataIndex : 'name', position : ["0mm","10mm","RightMargin:0mm","10mm"], type: 'html', beforeStr: "
", afterStr: "
"}, {label : "装配员:", dataIndex : 'operator', fontSize : 6, bold: 1, position : ["38mm","25mm","19mm","3mm"]}, {label : "审核员:", dataIndex : 'reviewer', fontSize : 6, bold: 1, position : ["41mm","25mm","19mm","3mm"]}, {label : "灭菌期:", dataIndex : 'sterilizationDate', fontSize : 6, bold: 1, position : ["38mm","1mm","26mm","3mm"]}, {label : "失效期:", dataIndex : 'validDate', fontSize : 6, bold: 1, position : ["41mm","1mm","26mm","3mm"]}, - {label : "", dataIndex : 'materials',LODOPFun:'ADD_PRINT_IMAGE',formatter:getMaterialsTabHtmlForMiddleLableConfig_zd5y, position : ["5mm","15mm","60mm","27mm"], type: 'html', beforeStr: "
", afterStr: "
"}, - {label : "器械总数:", dataIndex : 'materialAmount', fontSize : 6, bold: 1, position : ["32mm","45mm","30mm","3mm"]} + {label : "", dataIndex : 'materials',LODOPFun:'ADD_PRINT_IMAGE',formatter:getMaterialsTabHtmlForMiddleLableConfig_zd5y, position : ["10mm","10mm","65mm","24mm"], type: 'html', beforeStr: "
", afterStr: "
"}, + {label : "器械总数:", dataIndex : 'materialAmount', fontSize : 6, bold: 1, position : ["35mm","45mm","30mm","3mm"]} // {label : "", dataIndex : 'name', position : ["87mm","0mm","RightMargin:50mm","BottomMargin:0mm"], type: 'html', beforeStr: "
", afterStr: "
"}, // {label : "", dataIndex : 'name', position : ["87mm","50mm","RightMargin:0mm","BottomMargin:0mm"], type: 'html', beforeStr: "
", afterStr: "
"} ], barcodes : [ - {codeType : "128Auto", dataIndex : 'barcode', position : ["35mm","43mm","32mm","10mm"], + {codeType : "128Auto", dataIndex : 'barcode', position : ["38mm","43mm","32mm","8mm"], styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true}, {itemNameID: 0, styleName: 'FontSize', styleValue: 6}, {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true}