diff --git a/src/components/request-approve/RequestApprove.vue b/src/components/request-approve/RequestApprove.vue index 392fd09..5b946b9 100644 --- a/src/components/request-approve/RequestApprove.vue +++ b/src/components/request-approve/RequestApprove.vue @@ -66,6 +66,7 @@ import { INITIAL_REQUEST_APPROVE_DATA } from '@/constants/manager' import { useErrorStore } from '@/stores/error' import type { Category, SubCategory } from '@/types/common' import { convertToISO, isAfterNow } from '@/utils/date' +import getPossibleCategory from '@/utils/possibleCategory' import { redirectToLogin } from '@/utils/redirectToLogin' import { computed, onMounted, ref, watch } from 'vue' import { onBeforeRouteLeave, useRouter } from 'vue-router' @@ -75,7 +76,6 @@ import CategoryDropDown from '../request-task/CategoryDropDown.vue' import DueDateInput from './DueDateInput.vue' import LabelDropdown from './LabelDropdown.vue' import ManagerDropdown from './ManagerDropdown.vue' -import getPossibleCategory from '@/utils/possibleCategory' const isModalVisible = ref(false) const category1 = ref(null) @@ -176,9 +176,10 @@ const handleSubmit = async () => { const requestData = { categoryId: category2.value.subCategoryId, processorId: approveData.value.processor.memberId, - dueDate: isTimeFilled.value - ? convertToISO(approveData.value.dueDate, approveData.value.dueTime) - : null, + dueDate: + !isTimeFilled.value && approveData.value.dueDate && approveData.value.dueTime + ? convertToISO(approveData.value.dueDate, approveData.value.dueTime) + : null, labelId: approveData.value.label?.labelId || null } diff --git a/src/components/task-detail/TaskDetailRight.vue b/src/components/task-detail/TaskDetailRight.vue index f352726..e0ac4f7 100644 --- a/src/components/task-detail/TaskDetailRight.vue +++ b/src/components/task-detail/TaskDetailRight.vue @@ -59,7 +59,7 @@

마감기한

-

{{ formatDueDate(data.dueDate) || '-' }}

+

{{ formatDueDate(data.dueDate) }}

{{ formatDaysBefore(data.dueDate) }}