Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r37925 -r38074
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 37925)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 38074)
@@ -602,8 +602,9 @@
var dataIndex = itemFirst.dataIndex;
var align = itemFirst.align;
var height = itemFirst.height;
+ var fontSize = myObj.goodsTable.fontSize || 14;
tableHtml += "
";
- tableHtml += "" + printObj[dataIndex] + " | ";
+ tableHtml += "" + printObj[dataIndex] + " | ";
tableHtml += "
";
for (var i = 1; i < myObj.goodsTable.columns.length - 1; i = i + 2) {
tableHtml += "";
@@ -615,15 +616,17 @@
var height = item.height;
if (dataIndex !== '') {
var value = printObj[dataIndex] || '';
- tableHtml += "" + itemHeader + ":" + value + " | ";
+ var newItemHeader = (itemHeader == '') ? '' : (itemHeader + ':');
+ tableHtml += "" + newItemHeader + value + " | ";
} else {
- tableHtml += "" + itemHeader + " | ";
+ tableHtml += "" + itemHeader + " | ";
}
if (dataIndex !== '') {
var nextValue = printObj[nextItem.dataIndex] || '';
- tableHtml += "" + nextItem.header + ":" + nextValue + " | ";
+ var newItemHeader = (nextItem.header == '') ? '' : (nextItem.header + ':');
+ tableHtml += "" + newItemHeader + nextValue + " | ";
} else {
- tableHtml += "" + nextItem.header + " | ";
+ tableHtml += "" + nextItem.header + " | ";
}
tableHtml += "
";
}
@@ -632,7 +635,7 @@
var align = itemLast.align;
var height = itemLast.height;
tableHtml += "";
- tableHtml += "" + header + " | ";
+ tableHtml += "" + header + " | ";
tableHtml += "
";
tableHtml += "";
tableHtml += "";