Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js =================================================================== diff -u -r14510 -r16027 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js (.../invoicePrint.js) (revision 14510) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js (.../invoicePrint.js) (revision 16027) @@ -501,8 +501,16 @@ } totalAmount += invoicesInfo.goods[i].amount; } + var totalRecyclingAmount = 0; + for( var i = 0; i < invoicesInfo.goods.length; i++){ + if(invoicesInfo.goods[i].name == '合计'){ + continue; + } + totalRecyclingAmount += invoicesInfo.goods[i].recyclingAmount; + } invoicesInfo.totalPrice = totalPrice; invoicesInfo.totalGoodsAmount = totalAmount; + invoicesInfo.totalRecyclingAmount = totalRecyclingAmount; // var totalInfo = {'name': '合计','数量': totalAmount,'金额': totalPrice}; // invoicesInfo.goods.push(totalInfo);