diff --git a/apps/web-antd/src/views/workflow/components/approval-timeline.vue b/apps/web-antd/src/views/workflow/components/approval-timeline.vue new file mode 100644 index 00000000..68f34f34 --- /dev/null +++ b/apps/web-antd/src/views/workflow/components/approval-timeline.vue @@ -0,0 +1,50 @@ + + + diff --git a/apps/web-antd/src/views/workflow/components/index.ts b/apps/web-antd/src/views/workflow/components/index.ts index d51b16a2..c1694380 100644 --- a/apps/web-antd/src/views/workflow/components/index.ts +++ b/apps/web-antd/src/views/workflow/components/index.ts @@ -1 +1,2 @@ export { default as ApprovalCard } from './approval-card.vue'; +export { default as ApprovalTimeline } from './approval-timeline.vue'; diff --git a/apps/web-antd/src/views/workflow/components/rejection.png b/apps/web-antd/src/views/workflow/components/rejection.png new file mode 100644 index 00000000..7ed92204 Binary files /dev/null and b/apps/web-antd/src/views/workflow/components/rejection.png differ diff --git a/apps/web-antd/src/views/workflow/task/taskWaiting.vue b/apps/web-antd/src/views/workflow/task/taskWaiting.vue index 2a25d982..4884adfa 100644 --- a/apps/web-antd/src/views/workflow/task/taskWaiting.vue +++ b/apps/web-antd/src/views/workflow/task/taskWaiting.vue @@ -16,7 +16,8 @@ import { } from 'ant-design-vue'; import { debounce, uniqueId } from 'lodash-es'; -import { ApprovalCard } from '../components'; +import { ApprovalCard, ApprovalTimeline } from '../components'; +import RejectionPng from '../components/rejection.png'; const handleScroll = debounce((e: Event) => { if (!e.target) { @@ -45,6 +46,14 @@ const data = reactive( })), ); +const timeLine = Array.from({ length: 5 }).map(() => ({ + id: uniqueId(), + name: '张三', + status: '审批中', + remark: '审批任务描述', + time: '2022-01-01', +})); + const lastSelectId = ref(''); function handleCardClick(id: string) { // 点击的是同一个 @@ -90,7 +99,12 @@ function handleCardClick(id: string) { - +
@@ -111,10 +125,18 @@ function handleCardClick(id: string) { 提交于: 2022-01-01 12:00:00
+ +
+ +
- + - +
+ + + +
审批记录 全文评论 @@ -122,7 +144,7 @@ function handleCardClick(id: string) {