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));