Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js =================================================================== diff -u -r12387 -r12512 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 12387) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 12512) @@ -829,7 +829,7 @@ // 供应室打印参数 var config = printConfig.invoicePlan; formTypeOfPrinted = "invoicePlan"; - // 临床科室打印参数 + // 临床科室打印参数(如果没有打印发货计划的权限,说明是临床科室用户) if (SSTS_PrintApplicationGoods){ config = printConfig.application; formTypeOfPrinted = "application"; @@ -2631,10 +2631,11 @@ if (btn == 'yes') { //通过json stringify和parse克隆js对象 var config = JSON.parse(JSON.stringify(printConfig.invoicePlan)); - // 如果是打印申请单,则无论打印配置是什么,均设置为合并打印一次性物品和器械包 - if (SSTS_PrintApplicationGoods){ - config.isMergePrintTousseAndDisposable = true; - } + config.isPrintTousse = true; + config.isPrintDisinfectGoods = true; + config.isPrintDisposableGoods = true; + config.printApplyInfo = false; + var printParams = getPrintJsonParams("print", ids , config); formTypeOfPrinted = "invoicePlan"; printApplyGoods(printParams,0,SSTS_PrintApplicationGoods,null);