Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js =================================================================== diff -u -r21620 -r21770 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 21620) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 21770) @@ -99,7 +99,7 @@ var printSelectButtonJson = { text : '打印选中的物品', - hidden : id == "" || (SSTS_PrintApplicationGoods && SSTS_DepartPrintApplicationGoods), + hidden : id == "" || (SSTS_PrintApplicationGoods && SSTS_DepartPrintApplicationGoods) || !sstsConfig.enablePrintSelectedTousseItem, handler : function() { var leftTree = top.Ext4.getCmp('tousseTreeGrid'); var rightTree = top.Ext4.getCmp('diposableTreeGrid'); @@ -119,7 +119,7 @@ showResult("请选择打印的物品"); return; } - printApplicationSelectedItems(tousseItemIds.join(";")); + printApplicationSelectedItems(tousseItemIds.join(";"),type); } } Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js =================================================================== diff -u -r21522 -r21770 --- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 21522) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 21770) @@ -241,5 +241,7 @@ // 扫描标识牌条码之后自定点击装配 autoPackingAfterScanIdCard: true, //科室申领中,是否重复打印当天已经打印的申领物品 - reprintTodayPrintedTousseItem : true + reprintTodayPrintedTousseItem : true, + //科室申领中,是否启用打印选中物品 + enablePrintSelectedTousseItem : true } \ No newline at end of file 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;//器械包