From 34290d8cadf70dfbf8674a2bcfb64eef25537f86 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 五月 2024 10:21:35 +0800
Subject: [PATCH] ♥️发布 5.2.0-BETA 公测版本
---
src/views/workflow/task/taskWaiting.vue | 51 +++++++++++++++++----------------------------------
1 files changed, 17 insertions(+), 34 deletions(-)
diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue
index af609cb..dc6546a 100644
--- a/src/views/workflow/task/taskWaiting.vue
+++ b/src/views/workflow/task/taskWaiting.vue
@@ -3,7 +3,7 @@
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
- <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
+ <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="浠诲姟鍚嶇О" prop="name">
<el-input v-model="queryParams.name" placeholder="璇疯緭鍏ヤ换鍔″悕绉�" @keyup.enter="handleQuery" />
</el-form-item>
@@ -30,11 +30,15 @@
<el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column fixed align="center" type="index" label="搴忓彿" width="60"></el-table-column>
- <el-table-column fixed align="center" prop="processDefinitionName" label="娴佺▼瀹氫箟鍚嶇О"></el-table-column>
- <el-table-column fixed align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column>
- <el-table-column fixed align="center" prop="name" label="浠诲姟鍚嶇О"></el-table-column>
- <el-table-column fixed align="center" prop="assigneeName" label="鍔炵悊浜�">
+ <el-table-column align="center" type="index" label="搴忓彿" width="60"></el-table-column>
+ <el-table-column :show-overflow-tooltip="true" align="center" label="娴佺▼瀹氫箟鍚嶇О">
+ <template #default="scope">
+ <span>{{ scope.row.processDefinitionName }}v{{ scope.row.processDefinitionVersion }}.0</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" prop="processDefinitionKey" label="娴佺▼瀹氫箟KEY"></el-table-column>
+ <el-table-column align="center" prop="name" label="浠诲姟鍚嶇О"></el-table-column>
+ <el-table-column align="center" prop="assigneeName" label="鍔炵悊浜�">
<template #default="scope">
<template v-if="scope.row.participantVo && scope.row.assignee === null">
<el-tag v-for="(item, index) in scope.row.participantVo.candidateName" :key="index" type="success">
@@ -48,20 +52,15 @@
</template>
</template>
</el-table-column>
- <el-table-column align="center" prop="businessStatusName" label="娴佺▼鐘舵��" min-width="70">
+ <el-table-column align="center" label="娴佺▼鐘舵��" min-width="70">
<template #default="scope">
- <el-tag type="success">{{ scope.row.businessStatusName }}</el-tag>
+ <dict-tag :options="wf_business_status" :value="scope.row.businessStatus"></dict-tag>
</template>
</el-table-column>
<el-table-column align="center" prop="createTime" label="鍒涘缓鏃堕棿" width="160"></el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="200">
<template #default="scope">
- <el-button v-if="scope.row.participantVo && (scope.row.participantVo.claim === null || scope.row.participantVo.claim === true)"
- type="primary" size="small" icon="Edit" @click="handleOpen(scope.row)">鍔炵悊</el-button>
- <el-button v-if="scope.row.participantVo && scope.row.participantVo.claim === true"
- type="primary" size="small" icon="Document" @click="handleReturnTask(scope.row.id)">褰掕繕</el-button>
- <el-button v-if="scope.row.participantVo && scope.row.participantVo.claim === false"
- type="primary" size="small" icon="Document" @click="handleClaimTask(scope.row.id)">璁ら</el-button>
+ <el-button type="primary" size="small" icon="Edit" @click="handleOpen(scope.row)">鍔炵悊</el-button>
</template>
</el-table-column>
</el-table>
@@ -77,14 +76,14 @@
</template>
<script lang="ts" setup>
-import { getPageByTaskWait, claim, returnTask } from '@/api/workflow/task';
+import { getPageByTaskWait } from '@/api/workflow/task';
import { TaskQuery, TaskVO } from '@/api/workflow/task/types';
import workflowCommon from '@/api/workflow/workflowCommon';
import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
-
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
//鎻愪氦缁勪欢
const queryFormRef = ref<ElFormInstance>();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
// 閬僵灞�
const loading = ref(true);
// 閫変腑鏁扮粍
@@ -145,22 +144,6 @@
taskId: row.id,
type: 'approval'
});
- workflowCommon.routerJump(routerJumpVo,proxy)
-};
-
-/** 璁ら浠诲姟 */
-const handleClaimTask = async (taskId: string) => {
- loading.value = true;
- await claim(taskId).finally(() => (loading.value = false));
- getWaitingList();
- proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
-};
-
-/** 褰掕繕浠诲姟 */
-const handleReturnTask = async (taskId: string) => {
- loading.value = true;
- await returnTask(taskId).finally(() => (loading.value = false));
- getWaitingList();
- proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ workflowCommon.routerJump(routerJumpVo, proxy);
};
</script>
--
Gitblit v1.9.3