Index: ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js
===================================================================
diff -u -r13313 -r13347
--- ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js (.../printConfig.js) (revision 13313)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js (.../printConfig.js) (revision 13347)
@@ -792,17 +792,17 @@
else if (rows >= 10){
fontSize = 10;
}else if (rows >= 8){
- fontSize = 10;
+ fontSize = 11;
}else if (rows >= 6){
- fontSize = 10;
+ fontSize = 12;
}else if (rows >= 4){
- fontSize = 10;
+ fontSize = 13;
}
// alert(fontSize)
- materialStr += "
名称 | ";
- materialStr += "数量 | ";
- materialStr += "名称 | ";
- materialStr += "数量 | ";
+ materialStr += "名称 | ";
+ materialStr += "数量 | ";
+ materialStr += "名称 | ";
+ materialStr += "数量 | ";
materialStr += "#;";
for (var i=0;i" + temp + "";
- materialStr += "" + material.count + " | ";
+ materialStr += "" + temp + " | ";
+ materialStr += "" + material.count + " | ";
}
if (materialsAmount % 2 != 0) {
for (var i = 0; i < (2 - materialsAmount % 2); i++) {
@@ -850,19 +850,23 @@
LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true);
LODOP.ADD_PRINT_TEXT("0mm","1mm","90mm","60px", obj.name);
- setFontSizeBold(11,1);// 设置字体
+ setFontSizeBold(14,1);// 设置字体
setAlignment('center');// 对齐
//LODOP.ADD_PRINT_TEXT((base + 15) + "mm","5mm","27mm","10px", "操作员:"+obj.operator);
//LODOP.ADD_PRINT_TEXT((base + 19) + "mm","5mm","27mm","10px", "炉号/炉次:"+obj.frequency);
- LODOP.ADD_PRINT_TEXT("5mm","5mm","27mm","10px", "灭菌日期:"+obj.sterilizationDate);
- LODOP.ADD_PRINT_TEXT("8mm","5mm","27mm","10px", "失效日期:"+obj.validDate);
- LODOP.ADD_PRINT_TEXT("11mm","5mm","27mm","10px", "包装:"+obj.operator);
- LODOP.ADD_PRINT_TEXT("14mm","5mm","27mm","10px", "核对:"+obj.reviewer);
+ LODOP.ADD_PRINT_TEXT("10mm","1mm","38mm","10px", "灭菌日期:"+obj.sterilizationDate);
+ setFontSizeBold(9,1);// 设置字体
+ LODOP.ADD_PRINT_TEXT("15mm","1mm","38mm","10px", "失效日期:"+obj.validDate);
+ setFontSizeBold(9,1);// 设置字体
+ LODOP.ADD_PRINT_TEXT("20mm","1mm","38mm","10px", "包装:"+obj.operator);
+ setFontSizeBold(9,1);// 设置字体
+ LODOP.ADD_PRINT_TEXT("25mm","1mm","38mm","10px", "核对:"+obj.reviewer);
+ setFontSizeBold(9,1);// 设置字体
// 打印表格
var tableStr = getMaterialsTabHtml_largeLabel(obj);
- addPrintTable(tableStr,"5mm","40mm","RightMargin:1mm","70mm");
+ addPrintTable(tableStr,"5mm","40mm","RightMargin:1mm","65mm");
setAlignment('center');// 居中对齐
// LODOP.ADD_PRINT_TEXT("19mm","0mm","43mm","3mm", "灭菌程序:"+obj.sterilingType);
@@ -875,7 +879,7 @@
// setFontSizeBold(7,1);// 设置字体
// setAlignment('center');// 居中对齐
- LODOP.ADD_PRINT_BARCODE("22mm","1mm","40mm","8mm","128Auto", obj.barcode);// 条码1
+ LODOP.ADD_PRINT_BARCODE("32mm","1mm","40mm","8mm","128Auto", obj.barcode);// 条码1
// LODOP.ADD_PRINT_BARCODE("35mm","1mm","40mm","8mm","128Auto", obj.barcode);// 条码2
// LODOP.ADD_PRINT_BARCODE("48mm","1mm","40mm","8mm","128Auto", obj.barcode);// 条码3
}