diff --git a/flowable-engine-web/src/views/common/form/FormRender.vue b/flowable-engine-web/src/views/common/form/FormRender.vue index e1afb78..e55306b 100644 --- a/flowable-engine-web/src/views/common/form/FormRender.vue +++ b/flowable-engine-web/src/views/common/form/FormRender.vue @@ -78,7 +78,6 @@ export default { if (item.name === 'SpanLayout'){ this.loadFormConfig(item.props.items) }else { - console.log(item,!item.perm) if (!item.perm){ this.$set(item, 'perm', 'E') } diff --git a/flowable-engine-web/src/views/common/process/nodes/ConditionNode.vue b/flowable-engine-web/src/views/common/process/nodes/ConditionNode.vue index 5b2382b..f761e93 100644 --- a/flowable-engine-web/src/views/common/process/nodes/ConditionNode.vue +++ b/flowable-engine-web/src/views/common/process/nodes/ConditionNode.vue @@ -7,7 +7,7 @@
- 优先级{{ level }} + diff --git a/flowable-engine-web/src/views/workspace/DisposalTask.vue b/flowable-engine-web/src/views/workspace/DisposalTask.vue index 91527cc..ed49d4d 100644 --- a/flowable-engine-web/src/views/workspace/DisposalTask.vue +++ b/flowable-engine-web/src/views/workspace/DisposalTask.vue @@ -60,9 +60,8 @@
-
-
+ -
+
{ @@ -153,6 +153,13 @@ export default { let that = this; this.init(); getTaskInfo(taskId).then(res => { + let data=res.data + data.formItems.map(item=>{ + if(item.props.required){ + item.props.required=!item.props.required + } + return item + }) that.taskData = res.data; that.$store.state.design = that.taskData; that.$store.state.userTaskOption = that.taskData.userTaskOption; @@ -296,15 +303,15 @@ export default { } .footer { + width: 100%; + position: absolute; + bottom: 0; + left: 0; display: flex; justify-content: space-between; align-items: center; height: 30px; padding: 15px 0; - position: absolute; - width: 100%; - bottom: 0; - left: 0; z-index: 99; background: #fff; border-top: 1px solid #dcdfe6;