From 8f51f79928ccaa23a2ba03ad2378825f7166b6f3 Mon Sep 17 00:00:00 2001 From: Austin Kho Date: Sat, 20 Apr 2024 15:22:18 +0900 Subject: [PATCH] issue form update ing --- .../src/views/_Work/Manages/Issues/Index.vue | 7 +++--- .../Manages/Issues/components/IssueView.vue | 23 +++++++++++++++++++ .../Projects/components/Issues/Index.vue | 3 ++- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/app/vue/src/views/_Work/Manages/Issues/Index.vue b/app/vue/src/views/_Work/Manages/Issues/Index.vue index d466f3db13..514b13c21e 100644 --- a/app/vue/src/views/_Work/Manages/Issues/Index.vue +++ b/app/vue/src/views/_Work/Manages/Issues/Index.vue @@ -2,7 +2,7 @@ import { computed, type ComputedRef, inject, onBeforeMount, ref } from 'vue' import { navMenu2 as navMenu } from '@/views/_Work/_menu/headermixin1' import type { Company } from '@/store/types/settings' -import { useRouter } from 'vue-router' +import { useRoute, useRouter } from 'vue-router' import { useWork } from '@/store/pinia/work' import type { IssueFilter } from '@/store/types/work' import Header from '@/views/_Work/components/Header/Index.vue' @@ -26,7 +26,7 @@ const activityList = computed(() => workStore.activityList) const priorityList = computed(() => workStore.priorityList) const getIssues = computed(() => workStore.getIssues) -const router = useRouter() +const [route, router] = [useRoute(), useRouter()] const onSubmit = (payload: any) => { const { pk, ...getData } = payload @@ -41,7 +41,8 @@ const onSubmit = (payload: any) => { if (pk) workStore.updateIssue(form) else { workStore.createIssue(form) - router.replace({ name: '(업무)' }) + if (route.params.projId) router.replace({ name: '(업무)' }) + else router.replace({ name: '업무' }) } } diff --git a/app/vue/src/views/_Work/Manages/Issues/components/IssueView.vue b/app/vue/src/views/_Work/Manages/Issues/components/IssueView.vue index 574b3e8b5d..d38b5be925 100644 --- a/app/vue/src/views/_Work/Manages/Issues/components/IssueView.vue +++ b/app/vue/src/views/_Work/Manages/Issues/components/IssueView.vue @@ -253,6 +253,29 @@ onBeforeMount(async () => await workStore.fetchIssueLogList({ issue: props.issue + + + + 파일 + + + + + + + {{ file.file.split('/')[file.file.split('/').length - 1] }} + + + + + 댓글달기 + + + + + + + 하위 일감 diff --git a/app/vue/src/views/_Work/Manages/Projects/components/Issues/Index.vue b/app/vue/src/views/_Work/Manages/Projects/components/Issues/Index.vue index 1865692a87..5dd5496894 100644 --- a/app/vue/src/views/_Work/Manages/Projects/components/Issues/Index.vue +++ b/app/vue/src/views/_Work/Manages/Projects/components/Issues/Index.vue @@ -38,7 +38,8 @@ const onSubmit = (payload: any) => { if (pk) workStore.updateIssue(form) else { workStore.createIssue(form) - router.replace({ name: '(업무)' }) + if (route.params.projId) router.replace({ name: '(업무)' }) + else router.replace({ name: '업무' }) } }