Index: ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
===================================================================
diff -u -r28382 -r28824
--- ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js (.../printConfig.js) (revision 28382)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js (.../printConfig.js) (revision 28824)
@@ -1054,7 +1054,7 @@
colsPerRow = 3;//大于30个材料分三列
}
var materialStr = "";
- var fontSize = 12;
+ var fontSize = 13;
var rows = (materialsAmount+1) / colsPerRow ;
if(rows > 20){
fontSize = 2;
@@ -1084,7 +1084,7 @@
if (material.specification != null && material.specification != ""){
materialName += "[" + material.specification + "]";
}
- materialStr += "
" + materialName + "x" + material.count + " | ";
+ materialStr += "" + materialName + "x" + material.count + " | ";
}
// 使每行都有colsPerRow个
if (materialsAmount % colsPerRow != 0) {
@@ -1113,7 +1113,7 @@
// {label : "", dataIndex : 'sterilingType', position : ["1mm","0mm","13mm","3mm"], type: 'html', beforeStr: " ", afterStr: " "},
//{label : "", dataIndex : 'sterilingType', position : ["32mm","1mm","26mm","3mm"], type: 'html', beforeStr: "", afterStr: " "},
// 器械包名称,水平居中
- {label : "", dataIndex : 'name', position : ["0mm","10mm","RightMargin:0mm","10mm"], 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"]},
|