diff --git a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar index cde73594..8540a37a 100644 Binary files a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar and b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar differ diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java index 81d93b57..c292cdcf 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java @@ -2509,6 +2509,13 @@ public class CoEPALController { // @Mapping("COE_PAL_OUTPUTREPORT_OUTPUT_PROCESS_CREATE") @Mapping("com.actionsoft.apps.coe.pal_outputreport_output_process_create") public String COEPALOUTPUTREPORTOutputProcessCreate (UserContext me, String wsId, String teamId, String fileId) { + PALRepositoryModel model = PALRepositoryCache.getCache().get(fileId); + String methodId = model.getMethodId(); + if ("data.form".equals(methodId)) { + return PALRepositoryQueryAPIManager.getInstance().createOutputReportBd(wsId, me.getUID(), teamId, fileId); + } else if ("control.policy".equals(methodId)) { + return PALRepositoryQueryAPIManager.getInstance().createOutputReportZd(wsId, me.getUID(), teamId, fileId); + } return PALRepositoryQueryAPIManager.getInstance().createOutputReportPr(wsId, me.getUID(), teamId, fileId); } diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/OutPutReportWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/OutPutReportWeb.java index fbf93166..70edfa51 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/OutPutReportWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/OutPutReportWeb.java @@ -960,11 +960,15 @@ public class OutPutReportWeb extends ActionWeb { String appId = model.getAppContext().getId(); if ("com.actionsoft.apps.coe.pal.output.pr".equals(appId) && model.getTargetMethodScope().contains(pmodel.getMethodId())) { newList.add(model); + } else if ("com.awspaas.user.apps.coe.pal.output.bd".equals(appId) && model.getTargetMethodScope().contains(pmodel.getMethodId())) { + newList.add(model); + } else if ("com.awspaas.user.apps.coe.pal.output.zd".equals(appId) && model.getTargetMethodScope().contains(pmodel.getMethodId())) { + newList.add(model); } } JSONArray array = new JSONArray(); for (OutputAppProfile model : newList) { - com.alibaba.fastjson.JSONObject object = new com.alibaba.fastjson.JSONObject(); + JSONObject object = new JSONObject(); object.put("id", model.getId()); object.put("groupName", model.getGroupName()); object.put("title", model.getTitle()); diff --git a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm index 44da77f3..fe18421c 100755 --- a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm +++ b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm @@ -365,6 +365,12 @@ } $("#upfile").on('click',openUpFile);//附件上传页面 if(processOutput) { // 导出流程手册菜单控制 + // debugger; + if (methodId == 'data.form') { + $('#export_report').text('导出表单手册'); + } else if (methodId == 'control.policy') { + $('#export_report').text('导出制度手册'); + } outputProcess(); } if (moreShapeButton == '') {// 显示按钮 @@ -1566,7 +1572,7 @@