diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowProvider.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowProvider.java index 1b42970..36f8fdf 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowProvider.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowProvider.java @@ -91,7 +91,7 @@ public class FlowProvider extends AbstractCompProvider { public List findCurTask(long billId) { return doGetData("ac_" + billId, () -> { EntityDao bdao = DbEngine.getInstance().findDao(Task.class); - List list = bdao.queryWhere("bill_id = ? and statu list = bdao.queryWhere(" tsk_pri_id = ? and tsk_statu(); return list; }); diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl index 2c84e42..4f3d180 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl @@ -65,62 +65,115 @@ "paddingRight": 20 }, "children": [ + { + "id": "${newId()}", + "type": "fx-button-group", + "props": { + "menus": [], + "textAlign": "" + }, + "slots": { + "default": [ + { + "id": "${newId()}", + "type": "fx-button", + "props": { + "name": "button:return", + "label": "返回", + "type": "success", + "size": "default", + "action": "button:backList", + "leftIcon": "list-top" + }, + "events": {}, + "vars": { + "$ref": "$ref" + } + }, { + "type": "fx-button", + "props": { + "name": "button:delete", + "label": "删除", + "leftIcon": "delete", + "action": "button:delCard" + }, "id": "${newId()}", - "type": "fx-button-group", + "vars": { + "$ref": "$ref" + } + }, + { + "id": "${newId()}", + "type": "fx-button", "props": { - "menus": [], - "textAlign": "right" + "name": "button:new", + "label": "新增", + "type": "primary", + "leftIcon": "plus", + "action": "button:addCard" }, - "slots": { - "default": [ - { - "type": "fx-button", - "props": { - "name": "button:delete", - "label": "删除", - "leftIcon": "delete", - "action": "button:delCard" - }, - "id": "${newId()}", - "vars": { - "$ref": "$ref" - } - }, - { - "id": "${newId()}", - "type": "fx-button", - "props": { - "name": "button:new", - "label": "新增", - "type": "primary", - "leftIcon": "plus", - "action": "button:addCard" - }, - "vars": { - "$ref": "$ref" - } - }, - { - "id": "${newId()}", - "type": "fx-button", - "props": { - "name": "button:return", - "label": "返回", - "type": "success", - "size": "default", - "action": "button:backList", - "leftIcon": "list-top" - }, - "events": {}, - "vars": { - "$ref": "$ref" - } - } - ] + "vars": { + "$ref": "$ref" } } - ] + ], + "dropdown": [] + } + } + ] + }, + { + "id": "${newId()}", + "type": "fx-form-panel", + "shape": "panel", + "props": { + "alignY": "center", + "size": "75" + }, + "children": [ + { + "id": "${newId()}", + "type": "fx-title", + "props": { + "label": "单据状态:", + "fontWeight": "bold", + "color": "#F56C6C", + "showPrefix": false + } + } + ] + }, + { + "id": "18306e14164", + "type": "fx-form-panel", + "shape": "panel", + "props": { + "alignY": "center", + "size": "200", + "colNum": 1 + }, + "children": [ + { + "id": "${newId()}", + "type": "fx-select", + "props": { + "name":"flowTaskRef", + "label": "当前任务", + "clearable": true, + "labelWidth": 100, + "affixError": false, + "size": "default", + "hideLabel": true, + "dataset": "flow", + "field": "pri_task_id" + }, + "events": {}, + "vars": { + "$ref": "$ref" + } + } + ] } ] }, @@ -470,7 +523,7 @@ "name": "button:disuse", "label": "作废", "type": "danger", - "action": "button:cancel" + "action": "button:disuse" }, "id": "${newId()}", "vars": {