diff --git a/src/components/bpmnProcessDesigner/package/penal/listeners/ProcessListenerDialog.vue b/src/components/bpmnProcessDesigner/package/penal/listeners/ProcessListenerDialog.vue index 01f81242..21088abf 100644 --- a/src/components/bpmnProcessDesigner/package/penal/listeners/ProcessListenerDialog.vue +++ b/src/components/bpmnProcessDesigner/package/penal/listeners/ProcessListenerDialog.vue @@ -43,9 +43,6 @@ import { CommonStatusEnum } from '@/utils/constants' /** BPM 流程 表单 */ defineOptions({ name: 'ProcessListenerDialog' }) -const { t } = useI18n() // 国际化 -const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const loading = ref(true) // 列表的加载中 const list = ref<ProcessListenerVO[]>([]) // 列表的数据 @@ -53,17 +50,23 @@ const total = ref(0) // 列表的总页数 const queryParams = reactive({ pageNo: 1, pageSize: 10, - type: undefined, + type: '', status: CommonStatusEnum.ENABLE }) /** 打开弹窗 */ const open = async (type: string) => { + queryParams.pageNo = 1 + queryParams.type = type + getList() dialogVisible.value = true +} +defineExpose({ open }) // 提供 open 方法,用于打开弹窗 + +/** 查询列表 */ +const getList = async () => { loading.value = true try { - queryParams.pageNo = 1 - queryParams.type = type const data = await ProcessListenerApi.getProcessListenerPage(queryParams) list.value = data.list total.value = data.total @@ -71,7 +74,6 @@ const open = async (type: string) => { loading.value = false } } -defineExpose({ open }) // 提供 open 方法,用于打开弹窗 /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ProcessExpressionDialog.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ProcessExpressionDialog.vue index b478bb2f..a038e69b 100644 --- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ProcessExpressionDialog.vue +++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ProcessExpressionDialog.vue @@ -28,9 +28,6 @@ import { ProcessExpressionApi, ProcessExpressionVO } from '@/api/bpm/processExpr /** BPM 流程 表单 */ defineOptions({ name: 'ProcessExpressionDialog' }) -const { t } = useI18n() // 国际化 -const message = useMessage() // 消息弹窗 - const dialogVisible = ref(false) // 弹窗的是否展示 const loading = ref(true) // 列表的加载中 const list = ref<ProcessExpressionVO[]>([]) // 列表的数据 @@ -38,17 +35,23 @@ const total = ref(0) // 列表的总页数 const queryParams = reactive({ pageNo: 1, pageSize: 10, - type: undefined, + type: '', status: CommonStatusEnum.ENABLE }) /** 打开弹窗 */ -const open = async (type: string) => { +const open = (type: string) => { + queryParams.pageNo = 1 + queryParams.type = type + getList() dialogVisible.value = true +} +defineExpose({ open }) // 提供 open 方法,用于打开弹窗 + +/** 查询列表 */ +const getList = async () => { loading.value = true try { - queryParams.pageNo = 1 - queryParams.type = type const data = await ProcessExpressionApi.getProcessExpressionPage(queryParams) list.value = data.list total.value = data.total @@ -56,7 +59,6 @@ const open = async (type: string) => { loading.value = false } } -defineExpose({ open }) // 提供 open 方法,用于打开弹窗 /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue index 0dffeb0f..f404ef74 100644 --- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue +++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue @@ -135,6 +135,7 @@ import * as PostApi from '@/api/system/post' import * as UserApi from '@/api/system/user' import * as UserGroupApi from '@/api/bpm/userGroup' import ProcessExpressionDialog from './ProcessExpressionDialog.vue' +import { ProcessExpressionVO } from '@/api/bpm/processExpression' defineOptions({ name: 'UserTask' }) const props = defineProps({ @@ -197,8 +198,9 @@ const processExpressionDialogRef = ref() const openProcessExpressionDialog = async () => { processExpressionDialogRef.value.open() } -const selectProcessExpression = (expression) => { +const selectProcessExpression = (expression: ProcessExpressionVO) => { userTaskForm.value.candidateParam = [expression.expression] + updateElementTask() } watch(