From ca22cdd5550cfa0defb0f430c538698182cdaec1 Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期一, 30 十二月 2024 16:42:49 +0800 Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat-ui-vue3 --- src/views/bpm/task/copy/index.vue | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/views/bpm/task/copy/index.vue b/src/views/bpm/task/copy/index.vue index d576ac7..b64521d 100644 --- a/src/views/bpm/task/copy/index.vue +++ b/src/views/bpm/task/copy/index.vue @@ -1,9 +1,13 @@ +<!-- 工作流 - 抄送我的流程 --> +<template> + <ContentWrap> <!-- 搜索工作栏 --> <el-form ref="queryFormRef" :inline="true" class="-mb-15px" label-width="68px"> <el-form-item label="流程名称" prop="name"> <el-input v-model="queryParams.processInstanceName" + @keyup.enter="handleQuery" class="!w-240px" clearable placeholder="请输入流程名称" @@ -37,7 +41,12 @@ <ContentWrap> <el-table v-loading="loading" :data="list"> <el-table-column align="center" label="流程名" prop="processInstanceName" min-width="180" /> - <el-table-column align="center" label="流程发起人" prop="startUserName" min-width="100" /> + <el-table-column + align="center" + label="流程发起人" + prop="startUser.nickname" + min-width="100" + /> <el-table-column :formatter="dateFormatter" align="center" @@ -45,8 +54,11 @@ prop="processInstanceStartTime" width="180" /> - <el-table-column align="center" label="抄送任务" prop="taskName" min-width="180" /> - <el-table-column align="center" label="抄送人" prop="creatorName" min-width="100" /> + <el-table-column align="center" label="抄送节点" prop="activityName" min-width="180" /> + <el-table-column align="center" label="抄送人" min-width="100"> + <template #default="scope"> {{ scope.row.createUser?.nickname || '系统' }} </template> + </el-table-column> + <el-table-column align="center" label="抄送意见" prop="reason" width="150" /> <el-table-column align="center" label="抄送时间" @@ -103,11 +115,16 @@ /** 处理审批按钮 */ const handleAudit = (row: any) => { + const query = { + id: row.processInstanceId, + activityId: undefined + } + if (row.activityId) { + query.activityId = row.activityId + } push({ name: 'BpmProcessInstanceDetail', - query: { - id: row.processInstanceId - } + query: query }) } -- Gitblit v1.9.3