From 94dccde30cd5c2003c028d09115466231865f41b Mon Sep 17 00:00:00 2001 From: zhenggm Date: Mon, 5 Sep 2022 20:02:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=9A=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java index 68841cb..793dc3a 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java @@ -350,19 +350,12 @@ public class FlowInstance { List listTask = adjustTasks(); //可选步骤 List tasks = new ArrayList<>(); - String next_text = procDef.getProcInfo().getActNameById(actInst.getActId()); - int index = 0; + for (Task act : listTask) { SwMap row = new SwMap(); tasks.add(row); row.put("id", act.getId()); - if (act.getId() == actInst.getId() && listTask.size() > 1 && index != 0) { - next_text = "待" + next_text; - } else { - next_text = procDef.getProcInfo().getActNameById(act.getActId()); - } - row.put("label", next_text); - index++; + row.put("label", act.getActName()); } extra.put("tasks", tasks); @@ -423,7 +416,7 @@ public class FlowInstance { boolean canDel = !isFinish && actInst.isMake() && !isNew; buttons.add(createButton(FlowConst.Button.DEL, canDel)); - buttons.add(createButton(FlowConst.Button.DISUSE, !isNew)); + buttons.add(createButton(FlowConst.Button.DISUSE, !isNew && !actInst.isMake())); buttons.add(createButton(FlowConst.Button.LOG, !isNew)); buttons.add(createButton(FlowConst.Button.WORD, !isNew)); buttons.add(createButton(FlowConst.Button.EXCEL, !isNew));