diff --git a/components.d.ts b/components.d.ts index 3b65693..06ebe68 100644 --- a/components.d.ts +++ b/components.d.ts @@ -21,8 +21,10 @@ declare module 'vue' { NDialogProvider: typeof import('naive-ui')['NDialogProvider'] NDivider: typeof import('naive-ui')['NDivider'] NDropdown: typeof import('naive-ui')['NDropdown'] + NEmpty: typeof import('naive-ui')['NEmpty'] NForm: typeof import('naive-ui')['NForm'] NFormItem: typeof import('naive-ui')['NFormItem'] + NGi: typeof import('naive-ui')['NGi'] NGrid: typeof import('naive-ui')['NGrid'] NGridItem: typeof import('naive-ui')['NGridItem'] NImage: typeof import('naive-ui')['NImage'] @@ -39,7 +41,11 @@ declare module 'vue' { NSpace: typeof import('naive-ui')['NSpace'] NSpin: typeof import('naive-ui')['NSpin'] NSwitch: typeof import('naive-ui')['NSwitch'] + NTabPane: typeof import('naive-ui')['NTabPane'] + NTabs: typeof import('naive-ui')['NTabs'] NTag: typeof import('naive-ui')['NTag'] + NTimeline: typeof import('naive-ui')['NTimeline'] + NTimelineItem: typeof import('naive-ui')['NTimelineItem'] NTooltip: typeof import('naive-ui')['NTooltip'] NUpload: typeof import('naive-ui')['NUpload'] NUploadDragger: typeof import('naive-ui')['NUploadDragger'] diff --git a/src/assets/icons/arrow-left.svg b/src/assets/icons/arrow-left.svg index c8ff9b4..7c214a0 100644 --- a/src/assets/icons/arrow-left.svg +++ b/src/assets/icons/arrow-left.svg @@ -1,25 +1 @@ - - - 切换_左 - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/arrow-right.svg b/src/assets/icons/arrow-right.svg index 4a48884..786d3b8 100644 --- a/src/assets/icons/arrow-right.svg +++ b/src/assets/icons/arrow-right.svg @@ -1,25 +1 @@ - - - 切换_右 - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/batch.svg b/src/assets/icons/batch.svg new file mode 100644 index 0000000..cb0f150 --- /dev/null +++ b/src/assets/icons/batch.svg @@ -0,0 +1,36 @@ + + + 批量审批 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/p1.svg b/src/assets/icons/p1.svg deleted file mode 100644 index f3d9207..0000000 --- a/src/assets/icons/p1.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - 不通过 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/icons/p2.svg b/src/assets/icons/p2.svg deleted file mode 100644 index 64aa666..0000000 --- a/src/assets/icons/p2.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - 通过 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/images/not_pass.png b/src/assets/images/not_pass.png new file mode 100644 index 0000000..dc49771 Binary files /dev/null and b/src/assets/images/not_pass.png differ diff --git a/src/assets/images/pass.png b/src/assets/images/pass.png new file mode 100644 index 0000000..2e25663 Binary files /dev/null and b/src/assets/images/pass.png differ diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue index 5733124..9f6086b 100644 --- a/src/views/task/content/Content.vue +++ b/src/views/task/content/Content.vue @@ -78,10 +78,22 @@ const imageRef = ref() let processItems: any[] = [] onMounted(() => { + window.addEventListener('keydown', handleKeydown) if (route.query.id) getDetail(route.query.id, route.query.packageid) }) +// 键盘左右箭头快捷切换 +function handleKeydown(event) { + console.log(event) + if (event.key === 'ArrowLeft') + backHandler() + // 在这里执行左箭头的逻辑 + else if (event.key === 'ArrowRight') + forwardHandler() + // 在这里执行右箭头的逻辑 +} + // 从任务终审列表跳转过来的 async function getDetail(taskId, packageid) { taskDetailInfo.value = await getTaskDetailInfo(taskId, packageid) @@ -320,9 +332,10 @@ watch( }, ) +// 从store里面获取任务id const currentTaskId = computed(() => { const index = taskStore.getCurrentIndex - return taskStore.getApprovalList[index]?.formid || '' + return taskStore.getApprovalList[index]?.id || '' }) function overTaskHandle() { @@ -347,6 +360,7 @@ function showActionsModal() { onUnmounted(() => { taskStore.reset() + window.removeEventListener('keydown', handleKeydown) }) const mark = computed(() => { @@ -401,7 +415,7 @@ function getPercent(pictureid: string) { @click="setBatch(true)" >
- + 批量审批
- - + +