From 55c6a10319e693f9eb4d2dccf62cf46743b62e64 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sat, 15 Feb 2025 17:02:32 +0900
Subject: [PATCH 01/18] =?UTF-8?q?:bug:=20[fix]=20:=20=EC=9A=94=EC=B2=AD=20?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=EC=A1=B0=ED=9A=8C=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EB=B0=98=EB=A0=A4=EC=8B=9C=EC=97=90=EB=8F=84=20=EB=AA=A8?=
 =?UTF-8?q?=EB=8B=AC=20=EA=B0=99=EA=B2=8C=20=EB=9C=A8=EB=8F=84=EB=A1=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user.ts                               |  5 +
 .../task-detail/TaskDetailHistory.vue         |  1 -
 .../task-detail/TaskDetailTopBar.vue          | 92 +++++++++++++++----
 src/components/task-detail/TaskStatusList.vue |  3 -
 4 files changed, 79 insertions(+), 22 deletions(-)

diff --git a/src/api/user.ts b/src/api/user.ts
index bb7ee1de..45907061 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -90,3 +90,8 @@ export const getSubCategoryDetail = async (categoryId: number) => {
   const response = await axiosInstance.get(`/api/sub-categories/${categoryId}`)
   return response.data
 }
+
+export const terminateTaskUser = async (taskId: number, reason: string) => {
+  const response = await axiosInstance.patch(`/api/tasks/${taskId}/terminate`, { reason })
+  return response.data
+}
diff --git a/src/components/task-detail/TaskDetailHistory.vue b/src/components/task-detail/TaskDetailHistory.vue
index 842095f1..cc3ca58e 100644
--- a/src/components/task-detail/TaskDetailHistory.vue
+++ b/src/components/task-detail/TaskDetailHistory.vue
@@ -5,7 +5,6 @@
       :history="historyData"
       :taskId="taskId"
       :requestor-name="requestorName" />
-
     <div class="flex flex-col w-full items-center mt-8 gap-[22px]">
       <div
         class="flex w-full flex-col items-center gap-[22px]"
diff --git a/src/components/task-detail/TaskDetailTopBar.vue b/src/components/task-detail/TaskDetailTopBar.vue
index 73fa3683..67385233 100644
--- a/src/components/task-detail/TaskDetailTopBar.vue
+++ b/src/components/task-detail/TaskDetailTopBar.vue
@@ -15,6 +15,13 @@
         <CommonIcons :name="modificationIcon" />
         <p class="text-primary1">요청 수정</p>
       </div>
+      <div
+        @click="toggleModal('cancel')"
+        v-if="!isApproved && isRequestor"
+        class="flex gap-1 items-center cursor-pointer p-1 hover:bg-background-2 rounded">
+        <CommonIcons :name="cancelIcon" />
+        <p class="text-red-1">요청 취소</p>
+      </div>
       <div
         @click="onButtonClick(`/request-approve?requestId=${id}`)"
         v-if="isReviewer && !isApproved"
@@ -23,11 +30,13 @@
         <p class="text-primary1">요청 승인</p>
       </div>
       <div
-        @click="toggleModal('cancel')"
-        v-if="!isApproved && isRequestor"
+        @click="toggleModal('reject')"
+        v-if="!isApproved && isReviewer"
         class="flex gap-1 items-center cursor-pointer p-1 hover:bg-background-2 rounded">
-        <CommonIcons :name="cancelIcon" />
-        <p class="text-red-1">요청 취소</p>
+        <CommonIcons
+          :name="reRequestIcon"
+          :style="{ fill: '#dc2626' }" />
+        <p class="text-red-1">요청 반려</p>
       </div>
     </div>
     <button
@@ -47,14 +56,28 @@
     <ModalView
       :is-open="isModalOpen.success"
       type="successType"
-      @close="finishCancel">
-      <template #header>요청이 취소되었습니다</template>
+      @close="closeAllModal">
+      <template #header>{{ modalSuccessMessage }}</template>
+    </ModalView>
+    <ModalView
+      :is-open="isModalOpen.reject"
+      @update:model-value="value => (rejectReason = value || '')"
+      type="inputType"
+      @close="closeAllModal"
+      @click="rejectRequest">
+      <template #header>반려 사유를 입력해주세요</template>
+    </ModalView>
+    <ModalView
+      :is-open="isModalOpen.fail"
+      type="failType"
+      @close="closeErrorModal">
+      <template #header>{{ modalError }}</template>
     </ModalView>
   </div>
 </template>
 
 <script setup lang="ts">
-import { cancelTaskUser } from '@/api/user'
+import { cancelTaskUser, terminateTaskUser } from '@/api/user'
 import {
   approveIcon,
   cancelIcon,
@@ -63,44 +86,77 @@ import {
   reRequestIcon
 } from '@/constants/iconPath'
 import type { TaskDetailTopBarProps } from '@/types/manager'
+import { useQueryClient } from '@tanstack/vue-query'
 import { ref } from 'vue'
 import { useRouter } from 'vue-router'
 import CommonIcons from '../common/CommonIcons.vue'
+import ModalView from '../common/ModalView.vue'
 
 const router = useRouter()
 const { isApproved, closeTaskDetail, id, isReviewer, isRequestor } =
   defineProps<TaskDetailTopBarProps>()
 
-import { useQueryClient } from '@tanstack/vue-query'
-import ModalView from '../common/ModalView.vue'
-
 const queryClient = useQueryClient()
-
+const backModal = ref(false)
+const modalSuccessMessage = ref('')
+const modalError = ref('')
+const rejectReason = ref('')
 const isModalOpen = ref({
   cancel: false,
-  success: false
+  success: false,
+  reject: false,
+  fail: false
 })
 
 const toggleModal = (key: keyof typeof isModalOpen.value) => {
-  isModalOpen.value[key] = !isModalOpen.value[key]
+  isModalOpen.value = Object.fromEntries(
+    Object.keys(isModalOpen.value).map(k => [k, k === key])
+  ) as typeof isModalOpen.value
 }
 
 const closeCancelModal = () => {
   isModalOpen.value.cancel = false
 }
 
+const closeErrorModal = () => {
+  isModalOpen.value = {
+    reject: backModal.value ? true : false,
+    fail: false,
+    success: false,
+    cancel: false
+  }
+}
+
+const closeAllModal = async () => {
+  const prevSuccess = isModalOpen.value.success
+  isModalOpen.value = { reject: false, cancel: false, success: false, fail: false }
+  await queryClient.refetchQueries({
+    queryKey: ['myRequest']
+  })
+  if (prevSuccess) queryClient.invalidateQueries({ queryKey: ['requested'] })
+}
+
 const cancelTask = async () => {
   await cancelTaskUser(id)
+  modalSuccessMessage.value = '요청이 취소되었습니다'
   toggleModal('cancel')
   toggleModal('success')
 }
 
-const finishCancel = async () => {
-  await queryClient.refetchQueries({
-    queryKey: ['myRequest']
-  })
+const rejectRequest = async () => {
+  rejectReason.value = rejectReason.value.trim()
+  if (rejectReason.value.length === 0) {
+    toggleModal('fail')
+    modalError.value = '반려 사유를 입력해주세요'
+    backModal.value = true
+    return
+  }
+  backModal.value = false
+  await terminateTaskUser(id, rejectReason.value)
+  modalSuccessMessage.value = '요청이 반려되었습니다'
   toggleModal('success')
-  closeTaskDetail()
+  queryClient.invalidateQueries({ queryKey: ['taskDetailUser', id] })
+  queryClient.invalidateQueries({ queryKey: ['historyData', id] })
 }
 
 const onButtonClick = (url: string) => {
diff --git a/src/components/task-detail/TaskStatusList.vue b/src/components/task-detail/TaskStatusList.vue
index ab1d50ac..5bfec216 100644
--- a/src/components/task-detail/TaskStatusList.vue
+++ b/src/components/task-detail/TaskStatusList.vue
@@ -74,9 +74,7 @@ const toggleModal = (key: keyof typeof isModalVisible.value) => {
 }
 
 const closeModal = () => {
-  const prevSuccess = isModalVisible.value.success
   isModalVisible.value = { reject: backModal.value ? true : false, fail: false, success: false }
-  if (prevSuccess) queryClient.invalidateQueries({ queryKey: ['requested'] })
 }
 
 const closeAllModal = () => {
@@ -102,7 +100,6 @@ const rejectRequest = async () => {
     backModal.value = true
     return
   }
-
   backModal.value = false
   await axiosInstance.patch(`/api/tasks/${taskId}/terminate`, { reason: rejectReason.value })
   toggleModal('success')

From 3a20bf62a399f12470498e6a44cf5ce4e1e0d6a0 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sat, 15 Feb 2025 17:11:03 +0900
Subject: [PATCH 02/18] =?UTF-8?q?:bug:=20[fix]=20:=20=EC=8A=B9=EC=9D=B8=20?=
 =?UTF-8?q?=EB=8C=80=EA=B8=B0=EC=A4=91=20=EC=9A=94=EC=B2=AD=20=EB=B0=98?=
 =?UTF-8?q?=EB=A0=A4=20=EB=AF=B8=EC=9E=85=EB=A0=A5=EC=8B=9C=20=EB=8B=A4?=
 =?UTF-8?q?=EC=8B=9C=20=EB=9D=84=EC=9B=8C=EC=A3=BC=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../requested/RequestedListCard.vue           | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/components/requested/RequestedListCard.vue b/src/components/requested/RequestedListCard.vue
index 6790483f..4b49e8a6 100644
--- a/src/components/requested/RequestedListCard.vue
+++ b/src/components/requested/RequestedListCard.vue
@@ -35,14 +35,14 @@
     :is-open="isModalVisible.reject"
     @update:model-value="value => (rejectReason = value || '')"
     type="inputType"
-    @close="closeModal"
+    @close="closeAllModal"
     @click="rejectRequest">
     <template #header>반려 사유를 입력해주세요</template>
   </ModalView>
   <ModalView
     :is-open="isModalVisible.success"
     type="successType"
-    @close="closeModal">
+    @close="closeAllModal">
     <template #header>반려가 완료되었습니다</template>
   </ModalView>
   <ModalView
@@ -74,13 +74,6 @@ const requestedTabList: ListCardProps[] = [
   { content: info.title },
   { content: info.requesterName, width: 120, profileImg: info.requesterImg }
 ]
-
-const selectedID = ref<number | null>(null)
-
-const handleModal = (id: number | null) => {
-  selectedID.value = id
-}
-
 const router = useRouter()
 const queryClient = useQueryClient()
 
@@ -89,24 +82,38 @@ const isModalVisible = ref({
   fail: false,
   success: false
 })
+const backModal = ref(false)
 const modalError = ref('')
 const rejectReason = ref('')
+const selectedID = ref<number | null>(null)
+
+const handleModal = (id: number | null) => {
+  selectedID.value = id
+}
+
 const toggleModal = (key: keyof typeof isModalVisible.value) => {
   isModalVisible.value = Object.fromEntries(
     Object.keys(isModalVisible.value).map(k => [k, k === key])
   ) as typeof isModalVisible.value
 }
 const closeModal = () => {
+  isModalVisible.value = { reject: backModal.value ? true : false, fail: false, success: false }
+}
+
+const closeAllModal = () => {
   const prevSuccess = isModalVisible.value.success
   isModalVisible.value = { reject: false, fail: false, success: false }
   if (prevSuccess) queryClient.invalidateQueries({ queryKey: ['requested'] })
 }
+
 const rejectRequest = async () => {
   if (rejectReason.value.length === 0) {
     toggleModal('fail')
     modalError.value = '반려 사유를 입력해주세요'
+    backModal.value = true
     return
   }
+  backModal.value = false
   await axiosInstance.patch(`/api/tasks/${info.taskId}/terminate`, { reason: rejectReason.value })
   toggleModal('success')
 }

From 5217df2ec3ae1dfd696e77e9122310747dbbd1ba Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sat, 15 Feb 2025 17:20:22 +0900
Subject: [PATCH 03/18] =?UTF-8?q?:bug:=20[fix]=20:=20=EC=9A=94=EC=B2=AD=20?=
 =?UTF-8?q?=EC=8B=A4=ED=8C=A8=EC=8B=9C=20=EB=A1=9C=EB=94=A9=20=EB=AA=A8?=
 =?UTF-8?q?=EB=8B=AC=20=EB=A9=88=EC=B6=94=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index aa6fea44..890f021f 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -79,8 +79,11 @@ const afterSubCategoryArr = ref<SubCategory[]>([])
 
 onMounted(async () => {
   mainCategoryArr.value = await getMainCategory()
+  console.log(mainCategoryArr.value)
+
   subCategoryArr.value = await getSubCategory()
   afterSubCategoryArr.value = await getSubCategory()
+  console.log(subCategoryArr.value)
 })
 
 watch(category1, async newValue => {
@@ -146,9 +149,14 @@ const handleSubmit = async () => {
   if (file.value && file.value.length > 0) {
     file.value.forEach(f => formData.append('attachment', f))
   }
-  await postTaskRequest(formData)
-  isModalVisible.value = 'success'
-  isSubmitting.value = false
-  isUploading.value = false
+
+  try {
+    await postTaskRequest(formData)
+    isModalVisible.value = 'success'
+  } finally {
+    isModalVisible.value = ''
+    isSubmitting.value = false
+    isUploading.value = false
+  }
 }
 </script>

From 5c2a83ae032b83536342071ead17e6d91f0640b9 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sat, 15 Feb 2025 17:22:58 +0900
Subject: [PATCH 04/18] =?UTF-8?q?:bug:=20[fix]=20:=20=EC=9A=94=EC=B2=AD=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=EC=97=90=EC=84=9C=20=EC=8B=A4=ED=8C=A8?=
 =?UTF-8?q?=EC=8B=9C=20=EB=A1=9C=EB=94=A9=20=EB=AA=A8=EB=8B=AC=20=EB=A9=88?=
 =?UTF-8?q?=EC=B6=94=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/ReRequestTask.vue | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/components/request-task/ReRequestTask.vue b/src/components/request-task/ReRequestTask.vue
index 86c827de..35a99345 100644
--- a/src/components/request-task/ReRequestTask.vue
+++ b/src/components/request-task/ReRequestTask.vue
@@ -46,6 +46,12 @@
       <template #header>작업{{ statusText }}을 실패했습니다</template>
       <template #body>잠시후 시도해주세요</template>
     </ModalView>
+    <ModalView
+      :isOpen="isModalVisible === 'loading'"
+      type="loadingType">
+      <template #header>작업을 요청 중입니다...</template>
+      <template #body>잠시만 기다려주세요</template>
+    </ModalView>
   </div>
 </template>
 
@@ -139,11 +145,9 @@ const handleSubmit = async () => {
     return
   }
 
-  isSubmitting.value = true
-
   const formData = new FormData()
-
   isSubmitting.value = true
+  isModalVisible.value = 'loading'
 
   const attachmentsToDelete = initFileArr.value
     .filter(initFile => !file.value?.some(f => f.name === initFile.fileName))
@@ -176,13 +180,16 @@ const handleSubmit = async () => {
       formData.append('attachment', f)
     })
   }
-
-  if (reqType === 're') {
-    await postTaskRequest(formData)
-  } else {
-    await patchTaskRequest(id, formData)
+  try {
+    if (reqType === 're') {
+      await postTaskRequest(formData)
+    } else {
+      await patchTaskRequest(id, formData)
+    }
+    isModalVisible.value = 'success'
+  } finally {
+    isModalVisible.value = ''
+    isSubmitting.value = false
   }
-  isModalVisible.value = 'success'
-  isSubmitting.value = false
 }
 </script>

From d381fabc8f6836b17564d1d3b593ce473ea21026 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 16 Feb 2025 13:39:02 +0900
Subject: [PATCH 05/18] =?UTF-8?q?:bug:=20[fix]=20:=20=EC=88=98=EC=A0=95?=
 =?UTF-8?q?=EC=8B=9C=20=EB=82=B4=20=EC=9A=94=EC=B2=AD=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EC=B5=9C=EC=8B=A0=ED=99=94,=20=EC=9E=AC=EC=9A=94=EC=B2=AD=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/my-request/MyRequestList.vue   | 2 +-
 src/components/request-task/ReRequestTask.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/my-request/MyRequestList.vue b/src/components/my-request/MyRequestList.vue
index e8b4f0ea..a15365a3 100644
--- a/src/components/my-request/MyRequestList.vue
+++ b/src/components/my-request/MyRequestList.vue
@@ -7,7 +7,7 @@
     <template #listCards>
       <MyRequestListCard
         v-for="info in data?.content"
-        :key="info.taskStatus + info.processorName + info.taskId"
+        :key="info.taskStatus + info.processorName + info.taskId + info.title + info.categoryName"
         :info="info" />
       <NoContent v-if="data?.content.length === 0" />
     </template>
diff --git a/src/components/request-task/ReRequestTask.vue b/src/components/request-task/ReRequestTask.vue
index 35a99345..20616017 100644
--- a/src/components/request-task/ReRequestTask.vue
+++ b/src/components/request-task/ReRequestTask.vue
@@ -164,7 +164,7 @@ const handleSubmit = async () => {
     attachmentsToDelete: attachmentsToDelete
   }
 
-  const jsonTaskInfo = JSON.stringify(taskInfoEdit)
+  const jsonTaskInfo = JSON.stringify(reqType === 'edit' ? taskInfoEdit : taskInfo)
   const newBlob = new Blob([jsonTaskInfo], { type: 'application/json' })
   formData.append('taskInfo', newBlob)
 
@@ -182,13 +182,13 @@ const handleSubmit = async () => {
   }
   try {
     if (reqType === 're') {
+      console.log(formData)
       await postTaskRequest(formData)
     } else {
       await patchTaskRequest(id, formData)
     }
     isModalVisible.value = 'success'
   } finally {
-    isModalVisible.value = ''
     isSubmitting.value = false
   }
 }

From 21fb9de6339b9848f5faf42663694bbc23cd885f Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 16 Feb 2025 13:48:39 +0900
Subject: [PATCH 06/18] =?UTF-8?q?:bug:=20[fix]=20:=20=EB=82=B4=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD,=20=EC=88=98=EC=A0=95=EC=97=90=EC=84=9C=20=EB=AC=B4?=
 =?UTF-8?q?=ED=95=9C=20=EB=A1=9C=EB=94=A9=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-task/ReRequestTask.vue | 1 +
 src/components/request-task/RequestTask.vue   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/request-task/ReRequestTask.vue b/src/components/request-task/ReRequestTask.vue
index 20616017..03d8d6dc 100644
--- a/src/components/request-task/ReRequestTask.vue
+++ b/src/components/request-task/ReRequestTask.vue
@@ -190,6 +190,7 @@ const handleSubmit = async () => {
     isModalVisible.value = 'success'
   } finally {
     isSubmitting.value = false
+    if (isModalVisible.value !== 'success') isModalVisible.value = ''
   }
 }
 </script>
diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 890f021f..6353ffb7 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -154,7 +154,7 @@ const handleSubmit = async () => {
     await postTaskRequest(formData)
     isModalVisible.value = 'success'
   } finally {
-    isModalVisible.value = ''
+    if (isModalVisible.value !== 'success') isModalVisible.value = ''
     isSubmitting.value = false
     isUploading.value = false
   }

From 6b944499bbecf83b0637889d995d6634dd255983 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 16 Feb 2025 14:21:13 +0900
Subject: [PATCH 07/18] =?UTF-8?q?:bug:=20[fix]=20:=202=EC=B0=A8=20?=
 =?UTF-8?q?=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=A1=B4=EC=9E=AC?=
 =?UTF-8?q?=ED=95=98=EB=8A=94=201=EC=B0=A8=20=EC=B9=B4=ED=85=8C=EA=B3=A0?=
 =?UTF-8?q?=EB=A6=AC=EB=A7=8C=20=EB=B3=B4=EC=97=AC=EC=A3=BC=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/ReRequestTask.vue |  1 -
 src/components/request-task/RequestTask.vue   | 11 +++++++----
 src/utils/possibleCategory.ts                 | 17 +++++++++++++++++
 3 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 src/utils/possibleCategory.ts

diff --git a/src/components/request-task/ReRequestTask.vue b/src/components/request-task/ReRequestTask.vue
index 03d8d6dc..d197ca1a 100644
--- a/src/components/request-task/ReRequestTask.vue
+++ b/src/components/request-task/ReRequestTask.vue
@@ -182,7 +182,6 @@ const handleSubmit = async () => {
   }
   try {
     if (reqType === 're') {
-      console.log(formData)
       await postTaskRequest(formData)
     } else {
       await patchTaskRequest(id, formData)
diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 6353ffb7..0ee6093e 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -52,6 +52,7 @@
 import { getMainCategory, getSubCategory } from '@/api/common'
 import { getSubCategoryDetail, postTaskRequest } from '@/api/user'
 import type { Category, SubCategory } from '@/types/common'
+import getPossibleCategory from '@/utils/possibleCategory'
 import { onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
@@ -78,12 +79,14 @@ const subCategoryArr = ref<SubCategory[]>([])
 const afterSubCategoryArr = ref<SubCategory[]>([])
 
 onMounted(async () => {
-  mainCategoryArr.value = await getMainCategory()
-  console.log(mainCategoryArr.value)
-
+  const mainCategory = await getMainCategory()
+  const mainIds = await getPossibleCategory()
+  const filteredMainCategory = mainCategory.filter((category: Category) =>
+    mainIds.includes(category.mainCategoryId)
+  )
+  mainCategoryArr.value = filteredMainCategory
   subCategoryArr.value = await getSubCategory()
   afterSubCategoryArr.value = await getSubCategory()
-  console.log(subCategoryArr.value)
 })
 
 watch(category1, async newValue => {
diff --git a/src/utils/possibleCategory.ts b/src/utils/possibleCategory.ts
new file mode 100644
index 00000000..1c9d72af
--- /dev/null
+++ b/src/utils/possibleCategory.ts
@@ -0,0 +1,17 @@
+import { getCategory } from '@/api/common'
+import type { Category } from '@/types/common'
+import { ref } from 'vue'
+
+const getPossibleCategory = async (): Promise<number[]> => {
+  const categories = ref<Category[]>([])
+  const possibleCategory = await getCategory()
+  categories.value = possibleCategory
+
+  const mainCategoryIds = categories.value
+    .filter(category => category.subCategory && category.subCategory.length > 0)
+    .map(category => category.mainCategoryId)
+
+  return mainCategoryIds
+}
+
+export default getPossibleCategory

From 8c74e716d6860e8fbd9021c71170e1eac077b201 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 16 Feb 2025 14:27:53 +0900
Subject: [PATCH 08/18] =?UTF-8?q?:bug:=20[fix]=20:=20=EC=9A=94=EC=B2=AD=20?=
 =?UTF-8?q?=EC=8A=B9=EC=9D=B8=20=EB=B0=8F=20=EC=88=98=EC=A0=95=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=EB=8F=84=20=EC=84=9C=EB=B8=8C=20=EC=B9=B4=ED=85=8C?=
 =?UTF-8?q?=EA=B3=A0=EB=A6=AC=20=EC=A1=B4=EC=9E=AC=EC=97=90=20=EB=94=B0?=
 =?UTF-8?q?=EB=A5=B8=201=EC=B0=A8=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC?=
 =?UTF-8?q?=20=EB=A0=8C=EB=8D=94=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-approve/RequestApprove.vue | 8 +++++++-
 src/components/request-task/ReRequestTask.vue     | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/components/request-approve/RequestApprove.vue b/src/components/request-approve/RequestApprove.vue
index 89fd9b43..392fd09d 100644
--- a/src/components/request-approve/RequestApprove.vue
+++ b/src/components/request-approve/RequestApprove.vue
@@ -75,6 +75,7 @@ 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)
@@ -119,7 +120,12 @@ onMounted(async () => {
     setError('존재하지 않는 요청입니다', '', () => redirectToLogin('/requested'))
     return
   }
-  mainCategoryArr.value = await getMainCategory()
+  const mainCategory = await getMainCategory()
+  const mainIds = await getPossibleCategory()
+  const filteredMainCategory = mainCategory.filter((category: Category) =>
+    mainIds.includes(category.mainCategoryId)
+  )
+  mainCategoryArr.value = filteredMainCategory
   subCategoryArr.value = await getSubCategory()
   const data = await getTaskDetailUser(requestId)
   const selected = mainCategoryArr.value.find(ct => ct.name === data.mainCategoryName) || null
diff --git a/src/components/request-task/ReRequestTask.vue b/src/components/request-task/ReRequestTask.vue
index d197ca1a..859458d7 100644
--- a/src/components/request-task/ReRequestTask.vue
+++ b/src/components/request-task/ReRequestTask.vue
@@ -60,6 +60,7 @@ import { getMainCategory, getSubCategory } from '@/api/common'
 import { getTaskDetailUser, patchTaskRequest, postTaskRequest } from '@/api/user'
 import type { Category, SubCategory } from '@/types/common'
 import type { AttachmentResponse } from '@/types/user'
+import getPossibleCategory from '@/utils/possibleCategory'
 import { computed, onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
@@ -96,7 +97,12 @@ const handleCancel = () => {
 }
 
 onMounted(async () => {
-  mainCategoryArr.value = await getMainCategory()
+  const mainCategory = await getMainCategory()
+  const mainIds = await getPossibleCategory()
+  const filteredMainCategory = mainCategory.filter((category: Category) =>
+    mainIds.includes(category.mainCategoryId)
+  )
+  mainCategoryArr.value = filteredMainCategory
   subCategoryArr.value = await getSubCategory()
   afterSubCategoryArr.value = await getSubCategory()
   const data = await getTaskDetailUser(Number(id))

From 2f93412d179ae029897a45b901be9525f84287c1 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 16 Feb 2025 17:27:59 +0900
Subject: [PATCH 09/18] =?UTF-8?q?:bug:=20[fix]=20:=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EC=8B=9C=EC=97=90=20=ED=8C=8C=EC=9D=BC=20=ED=81=AC=EA=B8=B0?=
 =?UTF-8?q?=EC=97=90=20=EB=8C=80=ED=95=9C=20=ED=91=9C=EC=8B=9C=20=EC=A0=95?=
 =?UTF-8?q?=EC=83=81=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/ReRequestTask.vue         |  2 ++
 src/components/request-task/RequestTaskFileInput.vue  |  7 +++++--
 .../request-task/RequestTaskFileInputAfter.vue        | 11 +++++++++--
 src/types/user.ts                                     |  1 +
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/components/request-task/ReRequestTask.vue b/src/components/request-task/ReRequestTask.vue
index 859458d7..a154d11a 100644
--- a/src/components/request-task/ReRequestTask.vue
+++ b/src/components/request-task/ReRequestTask.vue
@@ -27,6 +27,7 @@
       :limit-length="200" />
     <RequestTaskFileInput
       v-model="file"
+      :initFileArr="initFileArr"
       :isEdit="true" />
     <FormButtonContainer
       :handleCancel="handleCancel"
@@ -114,6 +115,7 @@ onMounted(async () => {
   )
   title.value = data.title
   description.value = data.description
+
   file.value = data.attachmentResponses.map((attachment: AttachmentResponse) => {
     return new File([attachment.fileUrl], attachment.fileName, { type: 'application/pdf' })
   })
diff --git a/src/components/request-task/RequestTaskFileInput.vue b/src/components/request-task/RequestTaskFileInput.vue
index e4d8ac53..1e4dd56f 100644
--- a/src/components/request-task/RequestTaskFileInput.vue
+++ b/src/components/request-task/RequestTaskFileInput.vue
@@ -11,7 +11,8 @@
       <RequestTaskFileInputAfter
         :files="modelValue"
         :isEdit
-        :removeFile="removeFile" />
+        :removeFile="removeFile"
+        :initFileArr="initFileArr" />
     </label>
     <div
       v-else
@@ -45,13 +46,15 @@
 <script lang="ts" setup>
 import CommonIcons from '@/components/common/CommonIcons.vue'
 import { uploadIcon } from '@/constants/iconPath'
+import type { AttachmentResponse } from '@/types/user'
 import { computed, ref } from 'vue'
 import ModalView from '../common/ModalView.vue'
 import RequestTaskFileInputAfter from './RequestTaskFileInputAfter.vue'
 
-const { modelValue } = defineProps<{
+const { modelValue, isEdit, initFileArr } = defineProps<{
   modelValue: File[] | null
   isEdit?: boolean
+  initFileArr?: AttachmentResponse[]
 }>()
 const emit = defineEmits(['update:modelValue'])
 
diff --git a/src/components/request-task/RequestTaskFileInputAfter.vue b/src/components/request-task/RequestTaskFileInputAfter.vue
index 964433c9..8a555902 100644
--- a/src/components/request-task/RequestTaskFileInputAfter.vue
+++ b/src/components/request-task/RequestTaskFileInputAfter.vue
@@ -19,7 +19,9 @@
           class="flex w-full justify-between items-center h-8 text-xs border-b border-b-border-2 px-4 shrink-0">
           <p class="flex truncate mr-3">{{ file.name }}</p>
           <div class="flex gap-6">
-            <p class="w-[60px]">{{ isEdit ? file.size : formatFileSize(file.size) }}</p>
+            <p class="w-[60px]">
+              {{ isEdit ? getFileSizeByName(file.name, file.size) : formatFileSize(file.size) }}
+            </p>
             <p class="w-36">{{ new Date().toLocaleString() }}</p>
             <div class="w-10 flex items-center justify-center cursor-pointer">
               <CommonIcons
@@ -47,5 +49,10 @@ import type { RequestTaskFileInputProps } from '@/types/user'
 import { formatFileSize } from '@/utils/unit'
 import CommonIcons from '../common/CommonIcons.vue'
 
-const { files, removeFile, isEdit } = defineProps<RequestTaskFileInputProps>()
+const { files, removeFile, isEdit, initFileArr } = defineProps<RequestTaskFileInputProps>()
+
+const getFileSizeByName = (fileName: string, size: number): string | number => {
+  const file = initFileArr?.find(file => file.fileName === fileName)
+  return file ? file.fileSize : formatFileSize(size)
+}
 </script>
diff --git a/src/types/user.ts b/src/types/user.ts
index ff25da44..d5c8bd37 100644
--- a/src/types/user.ts
+++ b/src/types/user.ts
@@ -39,6 +39,7 @@ export interface RequestTaskFileInputProps {
   files: File[] | null
   removeFile: (index: number) => void
   isEdit?: boolean
+  initFileArr?: AttachmentResponse[]
 }
 
 export interface RequestTaskTextAreaProps {

From de1745f50a8bf4c4dd5c82eed9e648d7b5b1e04f Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 16 Feb 2025 18:02:45 +0900
Subject: [PATCH 10/18] =?UTF-8?q?:bug:=20[fix]=20:=20=EC=A4=91=EB=B3=B5?=
 =?UTF-8?q?=EB=90=9C=20=ED=8C=8C=EC=9D=BC=EC=97=90=20=EB=8C=80=ED=95=9C=20?=
 =?UTF-8?q?=EA=B2=BD=EA=B3=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request-task/RequestTaskFileInput.vue     | 39 ++++++++++++++-----
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/components/request-task/RequestTaskFileInput.vue b/src/components/request-task/RequestTaskFileInput.vue
index 1e4dd56f..81ba9a88 100644
--- a/src/components/request-task/RequestTaskFileInput.vue
+++ b/src/components/request-task/RequestTaskFileInput.vue
@@ -34,12 +34,18 @@
       </label>
     </div>
     <ModalView
-      :is-open="isModalVisible"
+      :is-open="isModalVisible === 'invalidate'"
       type="failType"
-      @close="handleModal">
+      @close="closeModal">
       <template #header>파일추가를 실패했습니다</template>
       <template #body>최대 5개, 각 5mb까지 가능합니다</template>
     </ModalView>
+    <ModalView
+      :is-open="isModalVisible === 'duplicated'"
+      type="failType"
+      @close="closeModal">
+      <template #header>중복된 파일입니다</template>
+    </ModalView>
   </div>
 </template>
 
@@ -60,10 +66,10 @@ const emit = defineEmits(['update:modelValue'])
 
 const hasFiles = computed(() => modelValue && modelValue.length > 0)
 const isDragging = ref(false)
-const isModalVisible = ref(false)
+const isModalVisible = ref('')
 
-const handleModal = () => {
-  isModalVisible.value = !isModalVisible.value
+const closeModal = () => {
+  isModalVisible.value = ''
 }
 
 const handleFileUpload = (event: Event) => {
@@ -79,12 +85,19 @@ const handleFileUpload = (event: Event) => {
       .filter(file => file !== null) as File[]
 
     if (newFiles.length !== target.files.length) {
-      handleModal()
+      isModalVisible.value = 'invalidate'
+      return
+    }
+
+    const existingFileNames = modelValue ? modelValue.map(file => file.name) : []
+    if (newFiles.some(file => existingFileNames.includes(file.name))) {
+      isModalVisible.value = 'duplicated'
       return
     }
+
     const updatedFiles = modelValue ? [...modelValue, ...newFiles] : newFiles
     if (updatedFiles.length > 5) {
-      handleModal()
+      isModalVisible.value = 'invalidate'
       return
     }
     emit('update:modelValue', updatedFiles.length === 1 ? [updatedFiles[0]] : updatedFiles)
@@ -104,13 +117,21 @@ const handleDrop = (event: DragEvent) => {
         return newFile.size <= 5 * 1024 * 1024 ? newFile : null
       })
       .filter(file => file !== null) as File[]
+
     if (newFiles.length !== files.length) {
-      handleModal()
+      isModalVisible.value = 'invalidate'
+      return
+    }
+
+    const existingFileNames = modelValue ? modelValue.map(file => file.name) : []
+    if (newFiles.some(file => existingFileNames.includes(file.name))) {
+      isModalVisible.value = 'duplicated'
       return
     }
+
     const updatedFiles = modelValue ? [...modelValue, ...newFiles] : newFiles
     if (updatedFiles.length > 5) {
-      handleModal()
+      isModalVisible.value = 'invalidate'
       return
     }
     emit('update:modelValue', updatedFiles.length === 1 ? [updatedFiles[0]] : updatedFiles)

From 4beaa9f577c17ae4fd561f55c771d3c400c80a4f Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 16 Feb 2025 21:16:25 +0900
Subject: [PATCH 11/18] =?UTF-8?q?:bug:=20[fix]=20:=20=ED=9E=88=EC=8A=A4?=
 =?UTF-8?q?=ED=86=A0=EB=A6=AC=20=EC=9E=85=EB=A0=A5=20=EC=8B=9C=20=EC=A4=84?=
 =?UTF-8?q?=EB=B0=94=EA=BF=88=EA=B3=BC=20\n=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-detail/TaskDetailHistoryChat.vue  | 2 +-
 src/components/task-detail/TaskDetailHistoryInput.vue | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/task-detail/TaskDetailHistoryChat.vue b/src/components/task-detail/TaskDetailHistoryChat.vue
index d822386f..178c255d 100644
--- a/src/components/task-detail/TaskDetailHistoryChat.vue
+++ b/src/components/task-detail/TaskDetailHistoryChat.vue
@@ -18,7 +18,7 @@
       <div :class="['flex gap-2', isRequestor ? 'flex-row' : 'flex-row-reverse']">
         <p
           :class="[
-            'flex max-w-[400px] flex-wrap break-all px-4 py-3 text-base rounded-lg font-normal',
+            'flex max-w-[400px] flex-wrap break-all whitespace-pre-wrap px-4 py-3 text-base rounded-lg font-normal',
             isRequestor ? 'bg-background-2' : 'bg-primary2'
           ]">
           {{ history.details.commentDetails?.comment || history.details.taskDetails?.value }}
diff --git a/src/components/task-detail/TaskDetailHistoryInput.vue b/src/components/task-detail/TaskDetailHistoryInput.vue
index 415d02ee..869b48fb 100644
--- a/src/components/task-detail/TaskDetailHistoryInput.vue
+++ b/src/components/task-detail/TaskDetailHistoryInput.vue
@@ -95,6 +95,8 @@ const sendMessage = async () => {
   if (!isPossible.value || !messageText.value.trim()) return
   if (inputLength.value > 200) return
   await postComment(taskId, messageText.value)
+  console.log(messageText.value)
+
   queryClient.invalidateQueries({ queryKey: ['historyData', taskId] })
   messageText.value = ''
 }
@@ -103,8 +105,10 @@ const handleModal = () => {
   isModalVisible.value = !isModalVisible.value
 }
 
-const handleEnterKey = () => {
-  if (!isComposing.value) {
+const handleEnterKey = (event: KeyboardEvent) => {
+  if (event.shiftKey) {
+    messageText.value += '\n'
+  } else if (!isComposing.value) {
     sendMessage()
   }
 }

From c12498d207828665f0d4a8ef3af5d4bf46f77b6d Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 16 Feb 2025 21:19:47 +0900
Subject: [PATCH 12/18] =?UTF-8?q?:bug:=20[fix]=20:=20=EC=9A=94=EC=B2=AD=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=8B=9C=20=ED=85=9C=ED=94=8C=EB=A6=BF=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/ReRequestTask.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/request-task/ReRequestTask.vue b/src/components/request-task/ReRequestTask.vue
index a154d11a..da4ee4c6 100644
--- a/src/components/request-task/ReRequestTask.vue
+++ b/src/components/request-task/ReRequestTask.vue
@@ -58,7 +58,7 @@
 
 <script lang="ts" setup>
 import { getMainCategory, getSubCategory } from '@/api/common'
-import { getTaskDetailUser, patchTaskRequest, postTaskRequest } from '@/api/user'
+import { getSubCategoryDetail, getTaskDetailUser, patchTaskRequest, postTaskRequest } from '@/api/user'
 import type { Category, SubCategory } from '@/types/common'
 import type { AttachmentResponse } from '@/types/user'
 import getPossibleCategory from '@/utils/possibleCategory'
@@ -133,6 +133,13 @@ watch(category1, async newValue => {
   )
 })
 
+watch(category2, async newVal => {
+  if (newVal) {
+    const res = await getSubCategoryDetail(newVal.subCategoryId)
+    description.value = res.descriptionExample
+  }
+})
+
 const handleSubmit = async () => {
   if (isSubmitting.value || isModalVisible.value) return
 

From 4d15b6b6516d32c7a2b608fe03c37866e6792ca5 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 16 Feb 2025 21:56:06 +0900
Subject: [PATCH 13/18] =?UTF-8?q?:bug:=20[fix]=20:=20=ED=8F=AC=EB=A7=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/ReRequestTask.vue         | 7 ++++++-
 src/components/task-detail/TaskDetailHistoryInput.vue | 2 --
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/request-task/ReRequestTask.vue b/src/components/request-task/ReRequestTask.vue
index da4ee4c6..0d2c08df 100644
--- a/src/components/request-task/ReRequestTask.vue
+++ b/src/components/request-task/ReRequestTask.vue
@@ -58,7 +58,12 @@
 
 <script lang="ts" setup>
 import { getMainCategory, getSubCategory } from '@/api/common'
-import { getSubCategoryDetail, getTaskDetailUser, patchTaskRequest, postTaskRequest } from '@/api/user'
+import {
+  getSubCategoryDetail,
+  getTaskDetailUser,
+  patchTaskRequest,
+  postTaskRequest
+} from '@/api/user'
 import type { Category, SubCategory } from '@/types/common'
 import type { AttachmentResponse } from '@/types/user'
 import getPossibleCategory from '@/utils/possibleCategory'
diff --git a/src/components/task-detail/TaskDetailHistoryInput.vue b/src/components/task-detail/TaskDetailHistoryInput.vue
index 869b48fb..134f5d57 100644
--- a/src/components/task-detail/TaskDetailHistoryInput.vue
+++ b/src/components/task-detail/TaskDetailHistoryInput.vue
@@ -95,8 +95,6 @@ const sendMessage = async () => {
   if (!isPossible.value || !messageText.value.trim()) return
   if (inputLength.value > 200) return
   await postComment(taskId, messageText.value)
-  console.log(messageText.value)
-
   queryClient.invalidateQueries({ queryKey: ['historyData', taskId] })
   messageText.value = ''
 }

From 3cf09fbd7f4360a3493429522de3db3c5faee034 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 16 Feb 2025 22:28:34 +0900
Subject: [PATCH 14/18] :recycle: [refactor] : conflict resolved

---
 .../user-manage/\bDisabledInput.vue"          | 19 +++++++
 src/components/user-manage/UserUpdate.vue     | 49 ++++---------------
 2 files changed, 29 insertions(+), 39 deletions(-)
 create mode 100644 "src/components/user-manage/\bDisabledInput.vue"

diff --git "a/src/components/user-manage/\bDisabledInput.vue" "b/src/components/user-manage/\bDisabledInput.vue"
new file mode 100644
index 00000000..2cafacb5
--- /dev/null
+++ "b/src/components/user-manage/\bDisabledInput.vue"
@@ -0,0 +1,19 @@
+<template>
+  <div class="relative w-full">
+    <div class="text-xs flex gap-x-1 mb-2 text-body font-semibold">
+      {{ labelName }}
+      <p class="text-red-1">*</p>
+    </div>
+    <div
+      class="w-full h-11 border px-4 border-border-1 rounded text-gray-1 bg-background-2 flex items-center">
+      {{ value }}
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+defineProps<{
+  labelName: string
+  value: string
+}>()
+</script>
diff --git a/src/components/user-manage/UserUpdate.vue b/src/components/user-manage/UserUpdate.vue
index 667709ed..6c0fed4c 100644
--- a/src/components/user-manage/UserUpdate.vue
+++ b/src/components/user-manage/UserUpdate.vue
@@ -8,30 +8,16 @@
         :limit-length="10"
         :labelName="'이름'" />
     </div>
-    <RequestTaskInput
-      v-model="userRegistrationForm.nickname"
-      :placeholderText="'회원의 아이디를 입력해주세요'"
-      :isEdit="true"
-      :is-invalidate="
-        isInvalidate === 'nicknameEmpty'
-          ? 'empty'
-          : isInvalidate === 'wrongNickname'
-            ? isInvalidate
-            : ''
-      "
-      :labelName="'아이디'" />
+    <DisabledInput
+      :label-name="'아이디'"
+      :value="userRegistrationForm.nickname" />
     <div class="flex w-full gap-2">
-      <RequestTaskInput
-        v-model="userRegistrationForm.nickname"
-        :is-edit="true"
-        :placeholderText="'이메일은 아이디와 동일합니다'"
-        :labelName="'이메일'" />
-      <RequestTaskInput
-        v-model="userRegistrationForm.email"
-        :placeholderText="'@kakao.com'"
+      <DisabledInput
+        :label-name="'이메일'"
+        :value="userRegistrationForm.nickname" />
+      <DisabledInput
         :label-name="'도메인'"
-        :is-edit="true"
-        :is-not-required="false" />
+        :value="userRegistrationForm.email" />
     </div>
     <DepartmentDropDown
       v-model="userRegistrationForm.department"
@@ -83,6 +69,7 @@ import {
   RoleTypeMapping
 } from '@/constants/admin'
 import type { UserRegistrationProps } from '@/types/admin'
+import DOMPurify from 'dompurify'
 import { computed, onMounted, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
@@ -90,15 +77,12 @@ import FormCheckbox from '../common/FormCheckbox.vue'
 import ModalView from '../common/ModalView.vue'
 import RequestTaskDropdown from '../request-task/RequestTaskDropdown.vue'
 import RequestTaskInput from '../request-task/RequestTaskInput.vue'
+import DisabledInput from './\bDisabledInput.vue'
 import DepartmentDropDown from './DepartmentDropDown.vue'
-import DOMPurify from 'dompurify'
 
 const route = useRoute()
 const router = useRouter()
 
-const usernameRegex = /^[a-z]{3,10}\.[a-z]{1,5}$/
-const emailRegex = /^@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)+$/
-
 const userRegistrationForm = ref(INITIAL_USER_REGISTRATION)
 const isInvalidate = ref('')
 const userId = ref(route.query.id)
@@ -159,18 +143,6 @@ const handleSubmit = async () => {
       isInvalidate.value = 'nameEmpty'
       return
     }
-    if (!userRegistrationForm.value.nickname) {
-      isInvalidate.value = 'nicknameEmpty'
-      return
-    }
-    if (!usernameRegex.test(userRegistrationForm.value.nickname)) {
-      isInvalidate.value = 'wrongNickname'
-      return
-    }
-    if (!emailRegex.test(userRegistrationForm.value.email)) {
-      isInvalidate.value = 'wrongEmail'
-      return
-    }
     if (!userRegistrationForm.value.department?.departmentId) {
       isInvalidate.value = 'departmentEmpty'
       return
@@ -191,7 +163,6 @@ const handleSubmit = async () => {
         departmentId: userRegistrationForm.value.department.departmentId,
         departmentRole: userRegistrationForm.value.departmentRole
       }
-
       await updateMemberAdmin(userId.value, formData)
       isModalVisible.value = 'success'
     }

From 0686f72eb199421a54bb8d4cfc931a2db40b1795 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 16 Feb 2025 22:41:06 +0900
Subject: [PATCH 15/18] =?UTF-8?q?:recycle:=20[refactor]=20:=20=ED=9E=88?=
 =?UTF-8?q?=EC=8A=A4=ED=86=A0=EB=A6=AC=20=EB=8C=93=EA=B8=80,=20=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC=20=EA=B8=80=EC=94=A8=ED=81=AC=EA=B8=B0=20=EA=B0=90?=
 =?UTF-8?q?=EC=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-detail/TaskDetailHistoryChat.vue | 2 +-
 src/components/task-detail/TaskDetailHistoryFile.vue | 6 +++---
 "src/components/user-manage/\bDisabledInput.vue"     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/task-detail/TaskDetailHistoryChat.vue b/src/components/task-detail/TaskDetailHistoryChat.vue
index 178c255d..8497cdb4 100644
--- a/src/components/task-detail/TaskDetailHistoryChat.vue
+++ b/src/components/task-detail/TaskDetailHistoryChat.vue
@@ -18,7 +18,7 @@
       <div :class="['flex gap-2', isRequestor ? 'flex-row' : 'flex-row-reverse']">
         <p
           :class="[
-            'flex max-w-[400px] flex-wrap break-all whitespace-pre-wrap px-4 py-3 text-base rounded-lg font-normal',
+            'flex max-w-[400px] flex-wrap break-all whitespace-pre-wrap px-4 py-3 text-sm rounded-lg font-normal',
             isRequestor ? 'bg-background-2' : 'bg-primary2'
           ]">
           {{ history.details.commentDetails?.comment || history.details.taskDetails?.value }}
diff --git a/src/components/task-detail/TaskDetailHistoryFile.vue b/src/components/task-detail/TaskDetailHistoryFile.vue
index 0186509e..0aa02752 100644
--- a/src/components/task-detail/TaskDetailHistoryFile.vue
+++ b/src/components/task-detail/TaskDetailHistoryFile.vue
@@ -13,7 +13,7 @@
       <p class="text-xs text-body">{{ history.details.commentFileDetails?.nickName }}</p>
       <div :class="['flex gap-2', isRequestor ? 'flex-row' : 'flex-row-reverse']">
         <div
-          class="flex max-w-[400px] px-4 py-3 gap-4 items-center rounded-lg"
+          class="flex max-w-[400px] px-4 py-3 gap-3 items-center rounded-lg"
           :class="isRequestor ? 'bg-background-2' : 'bg-primary2'">
           <a
             class="w-10 h-10 flex items-center justify-center bg-white border border-border-2 rounded-lg shrink-0 hover:bg-primary2"
@@ -21,8 +21,8 @@
             download>
             <CommonIcons :name="fileIcon" />
           </a>
-          <div class="flex flex-col gap-2 flex-1 min-w-0">
-            <p class="font-normal w-full overflow-hidden whitespace-nowrap text-ellipsis">
+          <div class="flex flex-col gap-1 flex-1 min-w-0">
+            <p class="font-normal w-full overflow-hidden whitespace-nowrap text-ellipsis text-sm">
               {{ history.details.commentFileDetails?.fileName }}
             </p>
             <p class="text-xs font-semibold text-body">
diff --git "a/src/components/user-manage/\bDisabledInput.vue" "b/src/components/user-manage/\bDisabledInput.vue"
index 2cafacb5..a375eb03 100644
--- "a/src/components/user-manage/\bDisabledInput.vue"
+++ "b/src/components/user-manage/\bDisabledInput.vue"
@@ -5,7 +5,7 @@
       <p class="text-red-1">*</p>
     </div>
     <div
-      class="w-full h-11 border px-4 border-border-1 rounded text-gray-1 bg-background-2 flex items-center">
+      class="w-full h-11 border px-4 border-border-1 rounded text-disabled bg-background-2 flex items-center">
       {{ value }}
     </div>
   </div>

From 2d9ba7830bd468d7c5d27ad101fd8e4a280f3aee Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 16 Feb 2025 23:29:12 +0900
Subject: [PATCH 16/18] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EB=8B=B4?=
 =?UTF-8?q?=EB=8B=B9=EC=9E=90=20=EB=AF=B8=EC=84=A0=ED=83=9D=EC=8B=9C=20?=
 =?UTF-8?q?=EB=93=9C=EB=A1=AD=EB=8B=A4=EC=9A=B4=20placeholder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-detail/TaskDetailHistory.vue         | 4 ++--
 src/components/task-detail/TaskDetailManagerDropdown.vue | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/task-detail/TaskDetailHistory.vue b/src/components/task-detail/TaskDetailHistory.vue
index 8b29ad6c..1954beac 100644
--- a/src/components/task-detail/TaskDetailHistory.vue
+++ b/src/components/task-detail/TaskDetailHistory.vue
@@ -5,9 +5,9 @@
       :history="historyData"
       :taskId="taskId"
       :requestor-name="requestorName" />
-    <div class="flex flex-col w-full items-center mt-8 gap-[22px]">
+    <div class="flex flex-col w-full items-center mt-8 gap-6">
       <div
-        class="flex w-full flex-col items-center gap-[22px]"
+        class="flex w-full flex-col items-center gap-6"
         v-for="(item, i) in historyData"
         :key="item.historyId">
         <div
diff --git a/src/components/task-detail/TaskDetailManagerDropdown.vue b/src/components/task-detail/TaskDetailManagerDropdown.vue
index 5778f170..3af51543 100644
--- a/src/components/task-detail/TaskDetailManagerDropdown.vue
+++ b/src/components/task-detail/TaskDetailManagerDropdown.vue
@@ -9,8 +9,8 @@
         <ImageContainer
           :url="modelValue?.imageUrl"
           :size="20" />
-        <p>
-          {{ modelValue?.nickname }}
+        <p :class="['text-sm', { 'text-disabled': !modelValue?.nickname }]">
+          {{ modelValue?.nickname || '담당자를 선택해주세요' }}
         </p>
       </div>
       <CommonIcons
@@ -25,7 +25,7 @@
         :key="option.memberId"
         class="request-task-dropdown-option justify-between"
         @click="selectOption(option)">
-        <div class="flex gap-2">
+        <div class="flex gap-2 items-center text-sm">
           <ImageContainer
             :url="option.imageUrl"
             :size="20" />
@@ -50,6 +50,7 @@ import ImageContainer from '../common/ImageContainer.vue'
 
 const { modelValue } = defineProps<{ modelValue: ManagerTypes; taskId: number }>()
 const emit = defineEmits(['update:modelValue'])
+console.log(modelValue,'현재 담당자' )
 
 const dropdownOpen = ref(false)
 const managerArr = ref<ManagerTypes[]>([])

From dca43aa6b549cda53bb59052d819222d2534be22 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 16 Feb 2025 23:39:45 +0900
Subject: [PATCH 17/18] =?UTF-8?q?:recycle:=20[refactor]=20:=20=ED=9E=88?=
 =?UTF-8?q?=EC=8A=A4=ED=86=A0=EB=A6=AC=20v-if=20=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EB=B2=97=EC=96=B4=EB=82=9C=20=EB=B9=88=20div=20=EC=A0=9C?=
 =?UTF-8?q?=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-detail/TaskDetailHistory.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/task-detail/TaskDetailHistory.vue b/src/components/task-detail/TaskDetailHistory.vue
index 1954beac..3f0292aa 100644
--- a/src/components/task-detail/TaskDetailHistory.vue
+++ b/src/components/task-detail/TaskDetailHistory.vue
@@ -21,7 +21,13 @@
             class="text-xs font-semibold text-body">
             {{ formatTimeShort(item.time) }}
           </div>
-          <div class="flex w-full gap-1 justify-center text-body text-sm">
+          <div
+            v-if="
+              item.taskHistoryType === 'STATUS_SWITCHED' ||
+              item.taskHistoryType === 'PROCESSOR_CHANGED' ||
+              item.taskHistoryType === 'PROCESSOR_ASSIGNED'
+            "
+            class="flex w-full gap-1 justify-center text-body text-sm">
             <p>{{ HistoryMessageBefore[item.taskHistoryType] }}</p>
             <p
               v-if="item.taskHistoryType === 'STATUS_SWITCHED'"

From 2f77c186f56d3dfdfc2d78c34b5a0c97300541df Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 16 Feb 2025 23:42:01 +0900
Subject: [PATCH 18/18] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=A4=91?=
 =?UTF-8?q?=EC=B2=A9=EB=90=98=EB=8A=94=20v-if=EB=AC=B8=20=ED=86=B5?=
 =?UTF-8?q?=EC=9D=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-detail/TaskDetailHistory.vue | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/components/task-detail/TaskDetailHistory.vue b/src/components/task-detail/TaskDetailHistory.vue
index 3f0292aa..9b31707c 100644
--- a/src/components/task-detail/TaskDetailHistory.vue
+++ b/src/components/task-detail/TaskDetailHistory.vue
@@ -29,17 +29,7 @@
             "
             class="flex w-full gap-1 justify-center text-body text-sm">
             <p>{{ HistoryMessageBefore[item.taskHistoryType] }}</p>
-            <p
-              v-if="item.taskHistoryType === 'STATUS_SWITCHED'"
-              class="text-primary1">
-              {{ item.details.taskDetails?.value }}
-            </p>
-            <p
-              v-else-if="
-                item.taskHistoryType === 'PROCESSOR_CHANGED' ||
-                item.taskHistoryType === 'PROCESSOR_ASSIGNED'
-              "
-              class="text-primary1">
+            <p class="text-primary1">
               {{ item.details.taskDetails?.value }}
             </p>
             <p>{{ HistoryMessageAfter[item.taskHistoryType] }}</p>