diff --git a/src/pages-bpm/processInstance/detail/audit/index.vue b/src/pages-bpm/processInstance/detail/audit/index.vue index a18261f..21d7923 100644 --- a/src/pages-bpm/processInstance/detail/audit/index.vue +++ b/src/pages-bpm/processInstance/detail/audit/index.vue @@ -10,21 +10,21 @@ - - - - 审批意见 - + + + - - + + @@ -43,14 +43,16 @@ diff --git a/src/pages-bpm/processInstance/detail/components/operation-button.vue b/src/pages-bpm/processInstance/detail/components/operation-button.vue index bbf68cf..0b07220 100644 --- a/src/pages-bpm/processInstance/detail/components/operation-button.vue +++ b/src/pages-bpm/processInstance/detail/components/operation-button.vue @@ -52,7 +52,6 @@ import type { Action } from 'wot-design-uni/components/wd-action-sheet/types' import type { ButtonType } from 'wot-design-uni/components/wd-button/types' import type { ProcessInstance } from '@/api/bpm/processInstance' import type { Task } from '@/api/bpm/task' -import { useToast } from 'wot-design-uni' import { useUserStore } from '@/store' import { BpmProcessInstanceStatus, @@ -198,10 +197,10 @@ function init(theProcessInstance: ProcessInstance, task: Task) { function handleOperation(operationType: number) { switch (operationType) { case BpmTaskOperationButtonTypeEnum.APPROVE: - uni.navigateTo({ url: `/pages-bpm/processInstance/detail/audit/index?id=${runningTask.value.id}&pass=true` }) + uni.navigateTo({ url: `/pages-bpm/processInstance/detail/audit/index?processInstanceId=${processInstance.value.id}&taskId=${runningTask.value?.id}&pass=true` }) break case BpmTaskOperationButtonTypeEnum.REJECT: - uni.navigateTo({ url: `/pages-bpm/processInstance/detail/audit/index?id=${runningTask.value.id}&pass=false` }) + uni.navigateTo({ url: `/pages-bpm/processInstance/detail/audit/index?processInstanceId=${processInstance.value.id}&taskId=${runningTask.value?.id}&pass=false` }) break case BpmTaskOperationButtonTypeEnum.DELEGATE: uni.navigateTo({ diff --git a/src/pages/bpm/components/todo-list.vue b/src/pages/bpm/components/todo-list.vue index 3c49bfd..fc560b1 100644 --- a/src/pages/bpm/components/todo-list.vue +++ b/src/pages/bpm/components/todo-list.vue @@ -123,12 +123,12 @@ function handleDetail(item: Task) { /** 同意 */ function handleApprove(item: Task) { - uni.navigateTo({ url: `/pages-bpm/processInstance/detail/audit/index?id=${item.id}&pass=true` }) + uni.navigateTo({ url: `/pages-bpm/processInstance/detail/audit/index?processInstanceId=${item.processInstance.id}&taskId=${item.id}&pass=true` }) } /** 拒绝 */ function handleReject(item: Task) { - uni.navigateTo({ url: `/pages-bpm/processInstance/detail/audit/index?id=${item.id}&pass=false` }) + uni.navigateTo({ url: `/pages-bpm/processInstance/detail/audit/index?processInstanceId=${item.processInstance.id}&taskId=${item.id}&pass=false` }) } /** 触底加载更多 */