diff --git a/src/components/BpmTaskAssign/TaskSelectAssigneeForm.vue b/src/components/BpmTaskAssign/TaskSelectAssigneeForm.vue new file mode 100644 index 0000000..ffc454f --- /dev/null +++ b/src/components/BpmTaskAssign/TaskSelectAssigneeForm.vue @@ -0,0 +1,105 @@ + + + + + {{ taskAssignRule?.taskDefinitionName }} + + + + + + + + + diff --git a/src/components/LowDesign/src/shareControl/UserSelect.vue b/src/components/LowDesign/src/shareControl/UserSelect.vue index a42bcc4..5a3a879 100644 --- a/src/components/LowDesign/src/shareControl/UserSelect.vue +++ b/src/components/LowDesign/src/shareControl/UserSelect.vue @@ -217,7 +217,7 @@ defineOptions({ name: 'UserSelect' }) * all_sub 所有下级 */ -interface Column { +export interface Column { label: string findType: 'all' | 'now' | 'sub' | 'all_sub' | 'direct_sub' //查询类型 columnKey: Array<'mobile' | 'email' | 'sex' | 'post' | 'deptName'> //扩展显示列 diff --git a/src/views/bpm/processInstance/detail/TaskCCDialogForm.vue b/src/views/bpm/processInstance/detail/TaskCCDialogForm.vue index a3013ea..e7569c3 100644 --- a/src/views/bpm/processInstance/detail/TaskCCDialogForm.vue +++ b/src/views/bpm/processInstance/detail/TaskCCDialogForm.vue @@ -14,7 +14,7 @@ - + { resetForm() // 2. 再设置表单 if (row != null) { - formData.value.type = undefined as unknown as number + formData.value.type = 30 formData.value.taskName = row.name formData.value.taskId = row.id formData.value.processInstanceName = row.processInstance.name diff --git a/src/views/bpm/processInstance/detail/index.vue b/src/views/bpm/processInstance/detail/index.vue index df2f1e5..47fd27d 100644 --- a/src/views/bpm/processInstance/detail/index.vue +++ b/src/views/bpm/processInstance/detail/index.vue @@ -41,6 +41,7 @@ 不通过 + 回退 diff --git a/src/views/bpm/processInstance/index.vue b/src/views/bpm/processInstance/index.vue index 1f9d89f..db3f7b2 100644 --- a/src/views/bpm/processInstance/index.vue +++ b/src/views/bpm/processInstance/index.vue @@ -16,7 +16,7 @@ @current-change="currentChange" > - + - 发起流程 + + 发起流程 @@ -52,7 +53,7 @@ > 详情 - + diff --git a/src/views/bpm/taskAssignRule/index.vue b/src/views/bpm/taskAssignRule/index.vue index 2806c83..3fbca3d 100644 --- a/src/views/bpm/taskAssignRule/index.vue +++ b/src/views/bpm/taskAssignRule/index.vue @@ -32,22 +32,22 @@