From 3037ba45792ace6952fb41f97c33044b7c1e579c Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Tue, 18 Feb 2025 09:36:02 +0900
Subject: [PATCH] =?UTF-8?q?:ambulance:=20[hotfix]=20:=20=EB=A7=88=EA=B0=90?=
 =?UTF-8?q?=EA=B8=B0=ED=95=9C=EC=9D=B4=20=EC=A0=84=EC=86=A1=EB=90=98?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EC=98=A4=EB=A5=98=20=ED=95=B4?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-approve/RequestApprove.vue | 9 +++++----
 src/components/task-detail/TaskDetailRight.vue    | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

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<Category | null>(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 @@
       <p class="task-detail">마감기한</p>
       <div v-if="data.dueDate">
         <div class="w-full flex justify-between items-center">
-          <p class="text-sm">{{ formatDueDate(data.dueDate) || '-' }}</p>
+          <p class="text-sm">{{ formatDueDate(data.dueDate)  }}</p>
         </div>
         <p class="text-red-1 text-xs font-semibold">{{ formatDaysBefore(data.dueDate) }}</p>
       </div>