Index: ssts-web/src/main/webapp/disinfectsystem/config/zsly/print/printConfig.js =================================================================== diff -u -r35465 -r36074 --- ssts-web/src/main/webapp/disinfectsystem/config/zsly/print/printConfig.js (.../printConfig.js) (revision 35465) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsly/print/printConfig.js (.../printConfig.js) (revision 36074) @@ -584,8 +584,8 @@ pagePrice += totalPrice; } for(var i = 0;i < length2 ; i++){ - var materialTotalPrice = result.disinfectGoods[i].materialTotalPrice; - pagePrice += materialTotalPrice; + var totalPrice = result.disinfectGoods[i].totalPrice; + pagePrice += totalPrice; } for(var i = 0;i < length3 ; i++){ var totalPrice = result.diposableGoods[i].diposableGoodsTotalPrice;//灭菌炉 @@ -621,16 +621,16 @@ var materialName = result.disinfectGoods[i].materialName; var materialAmount = result.disinfectGoods[i].materialAmount; var materialPrice = result.disinfectGoods[i].materialPrice;//灭菌日期 - var materialTotalPrice = result.disinfectGoods[i].materialTotalPrice;//灭菌炉 + var totalPrice = result.disinfectGoods[i].totalPrice;//灭菌炉 var batchNumber = "-";//炉次 var sterilizerName = ""; var frequency= ""; var operationTime = result.disinfectGoods[i].operationTime;//单价 var validUntil = result.disinfectGoods[i].validUntil;//单价 if (goods == null) { - goods = materialName + "#&" + materialAmount + "#&" + materialPrice + "#&" + materialTotalPrice + "#&" + batchNumber +"#&" + sterilizerName + "#&" + frequency +"#&" + operationTime +"#&" +validUntil ; + goods = materialName + "#&" + materialAmount + "#&" + materialPrice + "#&" + totalPrice + "#&" + batchNumber +"#&" + sterilizerName + "#&" + frequency +"#&" + operationTime +"#&" +validUntil ; } else { - goods += "#@" + materialName + "#&" + materialAmount + "#&" + materialPrice + "#&" + materialTotalPrice + "#&" + batchNumber +"#&" + sterilizerName + "#&" + frequency +"#&" + operationTime +"#&" +validUntil ; + goods += "#@" + materialName + "#&" + materialAmount + "#&" + materialPrice + "#&" + totalPrice + "#&" + batchNumber +"#&" + sterilizerName + "#&" + frequency +"#&" + operationTime +"#&" +validUntil ; } } type = "消毒物品申请单";