Index: ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js =================================================================== diff -u -r18053 -r18747 --- ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js (.../printConfig.js) (revision 18053) +++ ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js (.../printConfig.js) (revision 18747) @@ -1050,18 +1050,25 @@ // alert(colsPerRow) var materialsAmount = materialsJsonArr.length; if(materialsJsonArr != null && materialsAmount > 0){ + if(materialsAmount > 30){ + colsPerRow = 3;//大于30个材料分三列 + } var materialStr = ""; var fontSize = 8; var rows = (materialsAmount+1) / colsPerRow ; - if ( rows > 14){ + if(rows > 20){ + fontSize = 2; + }else if(rows > 15){ + fontSize = 3; + }else if ( rows > 14){ + fontSize = 4; + }else if (rows > 13){ fontSize = 5; - } - else if (rows >= 12){ + }else if (rows > 10){ fontSize = 6; - } - else if (rows >= 10){ - - } + }else if(rows > 8){ + fontSize = 7; + }//小于等于8行就用字体8 for (var i=0;i