Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r26061 -r26068
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 26061)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 26068)
@@ -508,7 +508,6 @@
tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight , myObj.goodsTable.fontSize);
var style = getTableTdStyle(myObj.goodsTable,0);
tableHtml += "
合计 | ";
-
for (var i=1;i= 0 || indexName == "amount"){
value = printSummaryObj.totalGoodsAmount;
- if(sstsConfig && sstsConfig.alignForTotalAndAmountWithPrint == true && isPrintForGoodsWithBtn == true){
+ if(sstsConfig && sstsConfig.alignForTotalAndAmountWithPrint == true && typeof(isPrintForGoodsWithBtn) != "undefined" && isPrintForGoodsWithBtn == true){
//江门中心市医院要求金额和数量右对齐
tableHtml += "'right'" + " style=" + "'BORDER: #000000 1px solid; padding-right:0px;'>" ;
tableHtml += value;
@@ -539,7 +538,7 @@
}
else if(indexName == "rowPrice" || indexName == "totalPrice"){
value = formatMoney(printSummaryObj.totalPrice);
- if(sstsConfig && sstsConfig.alignForTotalAndAmountWithPrint == true && isPrintForGoodsWithBtn == true){
+ if(sstsConfig && sstsConfig.alignForTotalAndAmountWithPrint == true && typeof(isPrintForGoodsWithBtn) != "undefined" && isPrintForGoodsWithBtn == true){
//江门中心市医院要求金额和数量右对齐
tableHtml += "'right'" + " style=" + "'BORDER: #000000 1px solid; padding-right:0px;'>" ;
tableHtml += value;
@@ -564,7 +563,10 @@
LODOP.ADD_PRINT_TABLE(myObj.goodsTable.position[0], myObj.goodsTable.position[1], myObj.goodsTable.position[2], myObj.goodsTable.position[3],tableHtml);
}
//江门中心市医院要求金额和数量右对齐的参数
- isPrintForGoodsWithBtn = false;
+ if(typeof(isPrintForGoodsWithBtn) != "undefined"){
+ isPrintForGoodsWithBtn = false;
+ }
+
}
/**