Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r21620 -r21770 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 21620) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 21770) @@ -1205,7 +1205,7 @@ /** * 打印申请单中选中的物品 */ -function printApplicationSelectedItems(tousseItemIds){ +function printApplicationSelectedItems(tousseItemIds,invoicePlanType){ // 供应室打印参数 var config = printConfig.invoicePlan; formTypeOfPrinted = "invoicePlan"; @@ -1214,6 +1214,12 @@ config = printConfig.application; formTypeOfPrinted = "application"; } + //如果是一次性物品申请单,并且配置了一次性物品打印模板,那就按一次性物品打印模板打印 + if(invoicePlanType == diposableGoodsApplicationForm && printConfig.invoicePlan_disposableGoods){ + config = printConfig.invoicePlan_disposableGoods; + formTypeOfPrinted = "invoicePlan_disposableGoods"; + + } var printParams = getPrintJsonParams("printSelected", tousseItemIds , config); printParams.printScope.printTousse = true;//器械包