diff --git a/apps/web-antd/src/api/workflow/task/model.d.ts b/apps/web-antd/src/api/workflow/task/model.d.ts
index 4ee7a458..88353848 100644
--- a/apps/web-antd/src/api/workflow/task/model.d.ts
+++ b/apps/web-antd/src/api/workflow/task/model.d.ts
@@ -14,14 +14,16 @@ export interface TaskInfo {
permissionList?: any;
userList?: any;
formCustom: string;
- formPath: string;
+ formPath?: any;
flowCode: string;
version: string;
flowStatus: string;
flowStatusName: string;
- transactorNames: string;
+ assigneeIds: string;
+ assigneeNames: string;
processedBy: string;
type: string;
nodeRatio?: any;
- nickName: string;
+ createBy: string;
+ createByName: string;
}
diff --git a/apps/web-antd/src/views/workflow/components/approval-card.vue b/apps/web-antd/src/views/workflow/components/approval-card.vue
index a8f5937b..45921d46 100644
--- a/apps/web-antd/src/views/workflow/components/approval-card.vue
+++ b/apps/web-antd/src/views/workflow/components/approval-card.vue
@@ -48,8 +48,8 @@ function handleClick() {
-
- {{ info.nickName }}
+
+ {{ info.createByName }}
更新时间: 2222-22-22
diff --git a/apps/web-antd/src/views/workflow/components/approval-panel.vue b/apps/web-antd/src/views/workflow/components/approval-panel.vue
new file mode 100644
index 00000000..225b9f17
--- /dev/null
+++ b/apps/web-antd/src/views/workflow/components/approval-panel.vue
@@ -0,0 +1,99 @@
+
+
+
-
{{ item.nodeName }}
+
+
{{ item.nodeName }}
+
+
{{ item.approveName }}
{{ item.updateTime }}
diff --git a/apps/web-antd/src/views/workflow/components/index.ts b/apps/web-antd/src/views/workflow/components/index.ts
index c1694380..26148c11 100644
--- a/apps/web-antd/src/views/workflow/components/index.ts
+++ b/apps/web-antd/src/views/workflow/components/index.ts
@@ -1,2 +1,3 @@
export { default as ApprovalCard } from './approval-card.vue';
+export { default as ApprovalPanel } from './approval-panel.vue';
export { default as ApprovalTimeline } from './approval-timeline.vue';
diff --git a/apps/web-antd/src/views/workflow/task/taskWaiting.vue b/apps/web-antd/src/views/workflow/task/taskWaiting.vue
index 11c370eb..2933d4ee 100644
--- a/apps/web-antd/src/views/workflow/task/taskWaiting.vue
+++ b/apps/web-antd/src/views/workflow/task/taskWaiting.vue
@@ -4,24 +4,15 @@ import type { TaskInfo } from '#/api/workflow/task/model';
import { computed, onMounted, ref } from 'vue';
-import { Fallback, Page, VbenAvatar } from '@vben/common-ui';
+import { Page } from '@vben/common-ui';
-import {
- Card,
- Divider,
- Empty,
- InputSearch,
- Space,
- TabPane,
- Tabs,
- Tag,
-} from 'ant-design-vue';
+import { Empty, InputSearch } from 'ant-design-vue';
import { debounce } from 'lodash-es';
import { flowInfo } from '#/api/workflow/instance';
import { pageByTaskWait } from '#/api/workflow/task';
-import { ApprovalCard, ApprovalTimeline } from '../components';
+import { ApprovalCard, ApprovalPanel } from '../components';
const emptyImage = Empty.PRESENTED_IMAGE_SIMPLE;
@@ -70,12 +61,14 @@ const handleScroll = debounce(async (e: Event) => {
const currentInstance = ref();
const lastSelectId = ref('');
+const currentTask = ref();
async function handleCardClick(item: TaskInfo) {
const { id, businessId } = item;
// 点击的是同一个
if (lastSelectId.value === id) {
return;
}
+ currentTask.value = item;
// 反选状态 & 如果已经点击了 不变 & 保持只能有一个选中
taskList.value.forEach((item) => {
item.active = item.id === id;
@@ -85,25 +78,6 @@ async function handleCardClick(item: TaskInfo) {
const resp = await flowInfo(businessId);
currentInstance.value = resp;
}
-
-const instanceInfo = computed(() => {
- if (!currentInstance.value) {
- return;
- }
- const length = currentInstance.value.list.length;
- if (length === 2) {
- return;
- }
- // 最末尾为申请人
- const info = currentInstance.value.list[length - 1]!;
- return {
- id: info.instanceId,
- createTime: info.createTime,
- approveName: info.approveName,
- flowName: info.flowName ?? '未知流程',
- businessId: '1867081791031750658',
- };
-});
@@ -142,69 +116,7 @@ const instanceInfo = computed(() => {
-