Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r21483 -r21526 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 21483) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 21526) @@ -1202,6 +1202,31 @@ printApplyGoods(printParams,printMode,SSTS_PrintApplicationGoods,applicationWindow); } +/** + * 打印申请单中选中的物品 + */ +function printApplicationSelectedItems(tousseItemIds){ + // 供应室打印参数 + var config = printConfig.invoicePlan; + formTypeOfPrinted = "invoicePlan"; + // 临床科室打印参数 + if (SSTS_PrintApplicationGoods){ + config = printConfig.application; + formTypeOfPrinted = "application"; + } + var printParams = getPrintJsonParams("printSelected", tousseItemIds , config); + + printParams.printScope.printTousse = true;//器械包 + printParams.printScope.printDressing = true;//敷料包 + printParams.printScope.printDisinfectGoods = true;//消毒物品 + printParams.printScope.printDiposable = true;//一次性物品 + + printParams.printScope.printForeignTousse = true; + printParams.printScope.printApplyInfo = true; // 仅打印申请信息 + printParams.printScope.printByOriginalApplications = true; + + printApplyGoods(printParams,0,SSTS_PrintApplicationGoods,applicationWindow); +} /** * 获取某个treeStore已申请的物品数据(用于重新请求模板时,获取已经申请的物品). Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r21435 -r21526 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 21435) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 21526) @@ -1080,6 +1080,16 @@ recyclingApplicationManager.getPrintObjectByApplicationIds( printScope, applicationIds, printUser, printSummaryList); + }else if("printSelected".equalsIgnoreCase(action)){ + //科室申领打印选中物品 + String tousseItemIds = jsonObject.optString("ids",""); + + JSONObject printScope = jsonObject.optJSONObject("printScope"); + + String printUser = AcegiHelper.getLoginUserFullName(); + + recyclingApplicationManager.getPrintObjectByTousseItemId( + printScope, tousseItemIds, printUser, printSummaryList); } // 打印回收清单 else if ("printRecyclingItems".equalsIgnoreCase(action)){ Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js =================================================================== diff -u -r21518 -r21526 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 21518) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 21526) @@ -96,6 +96,32 @@ text : '打印', hidden:(id == "" || (SSTS_PrintApplicationGoods && SSTS_DepartPrintApplicationGoods)) }; + + var printSelectButtonJson = { + text : '打印选中的物品', + hidden : id == "" || (SSTS_PrintApplicationGoods && SSTS_DepartPrintApplicationGoods), + handler : function() { + var leftTree = top.Ext4.getCmp('tousseTreeGrid'); + var rightTree = top.Ext4.getCmp('diposableTreeGrid'); + var tousseItemIds = []; + if (leftTree) { + Ext4.Array.each(leftTree.getView().getChecked(), function(rec){ + tousseItemIds.push(rec.get('id')); + }); + } + if (rightTree) { + Ext4.Array.each(rightTree.getView().getChecked(), function(rec){ + tousseItemIds.push(rec.get('id')); + }); + } + + if(tousseItemIds.length == 0){ + showResult("请选择打印的物品"); + return; + } + printApplicationSelectedItems(tousseItemIds.join(";")); + } + } if(applicationPrintButtonConfigJsonArray && applicationPrintButtonConfigJsonArray.length > 0){ if(applicationPrintButtonConfigJsonArray.length > 1){ @@ -152,7 +178,7 @@ } //申请表单的按钮 - var bbars = [printViewButtonJson,printButtonJson,{ + var bbars = [printSelectButtonJson,printViewButtonJson,printButtonJson,{ id : 'commitBtn', text : '提交', hidden : hiddenCommitButton && !isInterveneAmount, Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r21515 -r21526 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 21515) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 21526) @@ -1597,6 +1597,15 @@ summaryList); } } + @Override + public void getPrintObjectByTousseItemId(JSONObject printScope, + String tousseItemIds, String printUser, List summaryList) { + if (StringUtils.isNotBlank(tousseItemIds)){ + Collection allTousseItems = tousseItemManager.getCollection(tousseItemIds, ";"); + populatePrintSummaryVoList(printScope, printUser,allTousseItems, + summaryList); + } + } // 选择多张申请单进行批量打印 @Override Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java =================================================================== diff -u -r21435 -r21526 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 21435) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 21526) @@ -137,6 +137,15 @@ public void getPrintObjectByApplicationIds(JSONObject printScope, String applicationIds, String printUser, List summaryList); + /** + * 打印选中的申请项 + * @param printScope + * @param tousseItemIds + * @param printUser + * @param summaryList + */ + public void getPrintObjectByTousseItemId(JSONObject printScope, + String tousseItemIds, String printUser, List summaryList); public JSONObject getPrintObjectByTimePeriod(JSONObject printScope, String fromTime, String toTime, String printUser);