From d65d46e856017a42801b1f277ef272304b8722e0 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Tue, 11 Feb 2025 10:34:59 +0900
Subject: [PATCH 01/26] =?UTF-8?q?:rocket:=20[cicd]=20:=20CD=EC=9B=8C?=
 =?UTF-8?q?=ED=81=AC=ED=94=8C=EB=A1=9C=EC=9A=B0=20=EB=A6=B4=EB=A6=AC?=
 =?UTF-8?q?=EC=A6=88=20V=EB=8C=80=EB=AC=B8=EC=9E=90=20=EB=AC=B8=EC=A0=9C?=
 =?UTF-8?q?=EC=9D=B8=EC=A7=80=20=EA=B2=80=EC=A6=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/CD.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index a3fb3932..079ac822 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -4,6 +4,9 @@ name: CD for front using github actions
 on:
   release:
     types: [created, edited, published, released, prereleased]
+  push:
+    branches:
+      - "CLAP-234"
 
 
 permissions:

From 1729b9a842131a4d3facd2542d63f4d16185c6da Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Tue, 11 Feb 2025 10:37:02 +0900
Subject: [PATCH 02/26] =?UTF-8?q?:rocket:=20[cicd]=20:=20CD=EC=9B=8C?=
 =?UTF-8?q?=ED=81=AC=ED=94=8C=EB=A1=9C=EC=9A=B0=20=EB=A6=B4=EB=A6=AC?=
 =?UTF-8?q?=EC=A6=88=20=EB=B2=84=EC=A0=84=20=EC=B6=9C=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/CD.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index 079ac822..e307c41e 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -31,7 +31,9 @@ jobs:
 
       - name: Extract release version
         id: version
-        run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+        run: |
+          echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+          echo "VERSION=${{ steps.version.outputs.VERSION }}"
 
       - name: Install Dependencies
         run: npm install

From e29813178c0fca970f265531cad8ce0d1bb0b6d8 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Tue, 11 Feb 2025 10:39:10 +0900
Subject: [PATCH 03/26] =?UTF-8?q?:rocket:=20[cicd]=20:=20CD=EC=9B=8C?=
 =?UTF-8?q?=ED=81=AC=ED=94=8C=EB=A1=9C=EC=9A=B0=20=EB=A6=B4=EB=A6=AC?=
 =?UTF-8?q?=EC=A6=88=20=EB=B2=84=EC=A0=84=20=EC=B6=9C=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/CD.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index e307c41e..40ccd18c 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -33,7 +33,8 @@ jobs:
         id: version
         run: |
           echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
-          echo "VERSION=${{ steps.version.outputs.VERSION }}"
+          echo ${{ steps.version.outputs.VERSION }}
+          echo $GITHUB_OUTPUT
 
       - name: Install Dependencies
         run: npm install

From 3315afcce32e9705da401bc470f2cd945978fae9 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Tue, 11 Feb 2025 10:43:24 +0900
Subject: [PATCH 04/26] =?UTF-8?q?:rocket:=20[cicd]=20:=20CD=EC=9B=8C?=
 =?UTF-8?q?=ED=81=AC=ED=94=8C=EB=A1=9C=EC=9A=B0=20=EB=A6=B4=EB=A6=AC?=
 =?UTF-8?q?=EC=A6=88=20=EB=B2=84=EC=A0=84=20=EB=A7=8C=EB=93=A4=EC=96=B4?=
 =?UTF-8?q?=EC=A7=80=EB=8A=94=EC=A7=80=20=ED=99=95=EC=9D=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/CD.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index 40ccd18c..ea5b8fe2 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -34,7 +34,9 @@ jobs:
         run: |
           echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
           echo ${{ steps.version.outputs.VERSION }}
-          echo $GITHUB_OUTPUT
+          echo ${{GITHUB_OUTPUT}}
+          echo ${GITHUB_REF#refs/tags/}
+          echo ${GITHUB_OUTPUT}
 
       - name: Install Dependencies
         run: npm install

From 912504a7dd0ffddf23018683e04a597100ead395 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Tue, 11 Feb 2025 10:45:08 +0900
Subject: [PATCH 05/26] =?UTF-8?q?:rocket:=20[cicd]=20:=20CD=EC=9B=8C?=
 =?UTF-8?q?=ED=81=AC=ED=94=8C=EB=A1=9C=EC=9A=B0=20=EB=A6=B4=EB=A6=AC?=
 =?UTF-8?q?=EC=A6=88=20=EB=B2=84=EC=A0=84=20=EB=A7=8C=EB=93=A4=EC=96=B4?=
 =?UTF-8?q?=EC=A7=80=EB=8A=94=EC=A7=80=20=ED=99=95=EC=9D=B82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/CD.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index ea5b8fe2..ed51070e 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -36,7 +36,6 @@ jobs:
           echo ${{ steps.version.outputs.VERSION }}
           echo ${{GITHUB_OUTPUT}}
           echo ${GITHUB_REF#refs/tags/}
-          echo ${GITHUB_OUTPUT}
 
       - name: Install Dependencies
         run: npm install

From f4a1352226348cc9c4f5d9db21059f6d13034655 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Tue, 11 Feb 2025 10:46:56 +0900
Subject: [PATCH 06/26] =?UTF-8?q?:rocket:=20[cicd]=20:=20CD=EC=9B=8C?=
 =?UTF-8?q?=ED=81=AC=ED=94=8C=EB=A1=9C=EC=9A=B0=20=EB=A6=B4=EB=A6=AC?=
 =?UTF-8?q?=EC=A6=88=20=EB=B2=84=EC=A0=84=20=ED=99=95=EC=9D=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/CD.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index ed51070e..079ac822 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -31,11 +31,7 @@ jobs:
 
       - name: Extract release version
         id: version
-        run: |
-          echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
-          echo ${{ steps.version.outputs.VERSION }}
-          echo ${{GITHUB_OUTPUT}}
-          echo ${GITHUB_REF#refs/tags/}
+        run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
 
       - name: Install Dependencies
         run: npm install

From 91060d31615100e4c25fac6be1de8d3b5ffb5808 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Tue, 11 Feb 2025 11:09:47 +0900
Subject: [PATCH 07/26] =?UTF-8?q?:rocket:=20[cicd]=20:=20CD=EC=9B=8C?=
 =?UTF-8?q?=ED=81=AC=ED=94=8C=EB=A1=9C=EC=9A=B0=20=EB=A6=B4=EB=A6=AC?=
 =?UTF-8?q?=EC=A6=88=20=EB=B2=84=EC=A0=84=20=ED=99=95=EC=9D=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/CD.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index 079ac822..2ac4b56c 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -4,10 +4,6 @@ name: CD for front using github actions
 on:
   release:
     types: [created, edited, published, released, prereleased]
-  push:
-    branches:
-      - "CLAP-234"
-
 
 permissions:
   contents: read
@@ -51,8 +47,9 @@ jobs:
       - name: Docker build & push
         run: |
           docker login clap.kr-central-2.kcr.dev -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-          docker build -t ${{ secrets.DOCKER_REPO }}:${{ steps.version.outputs.VERSION }} .
+          docker build -t ${{ secrets.DOCKER_REPO }}:${{ steps.version.outputs.VERSION }} -t ${{ secrets.DOCKER_REPO }}:latest .
           docker push ${{ secrets.DOCKER_REPO }}:${{ steps.version.outputs.VERSION }}
+          docker push ${{ secrets.DOCKER_REPO }}:latest
       ## deploy
       - name: Deploy
         uses: appleboy/ssh-action@master

From f238d84d50769d5149af7f30e3355557e1212f3b Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Tue, 11 Feb 2025 11:22:32 +0900
Subject: [PATCH 08/26] =?UTF-8?q?:rocket:=20[cicd]=20:=20CD=EC=9B=8C?=
 =?UTF-8?q?=ED=81=AC=ED=94=8C=EB=A1=9C=EC=9A=B0=20=EB=A6=B4=EB=A6=AC?=
 =?UTF-8?q?=EC=A6=88=20=ED=83=80=EC=9E=85=20=EC=9B=90=EC=83=81=EB=B3=B5?=
 =?UTF-8?q?=EA=B5=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/CD.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index 2ac4b56c..5c10b051 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -3,7 +3,7 @@ name: CD for front using github actions
 
 on:
   release:
-    types: [created, edited, published, released, prereleased]
+    types: [created]
 
 permissions:
   contents: read

From bbd0436de7ff40581fc6b09059ea0da013d09465 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Tue, 11 Feb 2025 11:28:11 +0900
Subject: [PATCH 09/26] =?UTF-8?q?:rocket:=20[cicd]=20:=20CD=EC=9B=8C?=
 =?UTF-8?q?=ED=81=AC=ED=94=8C=EB=A1=9C=EC=9A=B0=20=EB=A6=B4=EB=A6=AC?=
 =?UTF-8?q?=EC=A6=88=20=EB=8F=84=EC=BB=A4=EB=B9=8C=EB=93=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/CD.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index 5c10b051..67b193f2 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -47,8 +47,8 @@ jobs:
       - name: Docker build & push
         run: |
           docker login clap.kr-central-2.kcr.dev -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-          docker build -t ${{ secrets.DOCKER_REPO }}:${{ steps.version.outputs.VERSION }} -t ${{ secrets.DOCKER_REPO }}:latest .
-          docker push ${{ secrets.DOCKER_REPO }}:${{ steps.version.outputs.VERSION }}
+          docker build -t ${{ secrets.DOCKER_REPO }}${{ steps.version.outputs.VERSION }} -t ${{ secrets.DOCKER_REPO }}:latest .
+          docker push ${{ secrets.DOCKER_REPO }}${{ steps.version.outputs.VERSION }}
           docker push ${{ secrets.DOCKER_REPO }}:latest
       ## deploy
       - name: Deploy

From 8afd67c6c80b9b79a64ac93f55e8ce3b84aef645 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Tue, 11 Feb 2025 11:37:11 +0900
Subject: [PATCH 10/26] =?UTF-8?q?:rocket:=20[cicd]=20:=20CD=EC=9B=8C?=
 =?UTF-8?q?=ED=81=AC=ED=94=8C=EB=A1=9C=EC=9A=B0=20=EB=A6=B4=EB=A6=AC?=
 =?UTF-8?q?=EC=A6=88=20=EB=8F=84=EC=BB=A4=EB=B9=8C=EB=93=9C=20latest=20?=
 =?UTF-8?q?=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/CD.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index 67b193f2..736047c3 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -47,9 +47,8 @@ jobs:
       - name: Docker build & push
         run: |
           docker login clap.kr-central-2.kcr.dev -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-          docker build -t ${{ secrets.DOCKER_REPO }}${{ steps.version.outputs.VERSION }} -t ${{ secrets.DOCKER_REPO }}:latest .
+          docker build -t ${{ secrets.DOCKER_REPO }}${{ steps.version.outputs.VERSION }} .
           docker push ${{ secrets.DOCKER_REPO }}${{ steps.version.outputs.VERSION }}
-          docker push ${{ secrets.DOCKER_REPO }}:latest
       ## deploy
       - name: Deploy
         uses: appleboy/ssh-action@master

From a468a2ac299742b2edc84b3f06945b907c30a4dd Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Tue, 11 Feb 2025 11:50:51 +0900
Subject: [PATCH 11/26] =?UTF-8?q?:rocket:=20[cicd]=20:=20CD=EC=9B=8C?=
 =?UTF-8?q?=ED=81=AC=ED=94=8C=EB=A1=9C=EC=9A=B0=20=EB=A6=B4=EB=A6=AC?=
 =?UTF-8?q?=EC=A6=88=20=EB=8F=84=EC=BB=A4=ED=91=B8=EC=89=AC=20=ED=83=9C?=
 =?UTF-8?q?=EA=B7=B8=20:=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/CD.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index 736047c3..6d20c956 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -48,7 +48,7 @@ jobs:
         run: |
           docker login clap.kr-central-2.kcr.dev -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
           docker build -t ${{ secrets.DOCKER_REPO }}${{ steps.version.outputs.VERSION }} .
-          docker push ${{ secrets.DOCKER_REPO }}${{ steps.version.outputs.VERSION }}
+          docker push ${{ secrets.DOCKER_REPO }}:${{ steps.version.outputs.VERSION }}
       ## deploy
       - name: Deploy
         uses: appleboy/ssh-action@master

From 22c85f15bb91924565fb7237b509be670e700bc5 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Tue, 11 Feb 2025 14:24:40 +0900
Subject: [PATCH 12/26] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=8B=9C?=
 =?UTF-8?q?=EA=B0=84=ED=91=9C=ED=98=84=20=EC=B6=95=EC=95=BD=20+=20?=
 =?UTF-8?q?=EC=98=A4=EC=A0=84,=20=EC=98=A4=ED=9B=84=20=ED=91=9C=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/date.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/utils/date.ts b/src/utils/date.ts
index b52a8b5e..08acb4aa 100644
--- a/src/utils/date.ts
+++ b/src/utils/date.ts
@@ -119,3 +119,12 @@ export const formatOnlyTime = (timeString: string) => {
 
   return `${period} ${formattedHours}시 ${String(minutes).padStart(2, '0')}분`
 }
+
+export const formatTimeShort = (timeString: string) => {
+  const [hours, minutes] = timeString.split(':').map(Number)
+
+  const period = hours < 12 ? '오전' : '오후'
+  const formattedHours = hours % 12 || 12
+
+  return `${period} ${formattedHours}:${String(minutes).padStart(2, '0')}`
+}

From f577b92c5c0a129cf2bd464719b22e8c1d54c6ab Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Tue, 11 Feb 2025 14:25:24 +0900
Subject: [PATCH 13/26] =?UTF-8?q?:recycle:=20[refactor]=20:=20=ED=9E=88?=
 =?UTF-8?q?=EC=8A=A4=ED=86=A0=EB=A6=AC=20=EC=96=91=EC=B8=A1=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=EC=9E=90=20=EC=8B=A0=EB=B6=84=EA=B3=BC=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1=EC=9E=90=EC=9D=98=20=EC=A0=95=EB=B3=B4=20=EB=8C=80?=
 =?UTF-8?q?=EC=A1=B0=EB=A1=9C=20=EA=B5=AC=EB=B6=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task-detail/TaskDetailHistory.vue         |  4 +--
 .../task-detail/TaskDetailHistoryChat.vue     | 26 ++++++++-------
 .../task-detail/TaskDetailHistoryFile.vue     | 32 +++++++++++--------
 3 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/src/components/task-detail/TaskDetailHistory.vue b/src/components/task-detail/TaskDetailHistory.vue
index 4c4fd9ee..99d2e4a9 100644
--- a/src/components/task-detail/TaskDetailHistory.vue
+++ b/src/components/task-detail/TaskDetailHistory.vue
@@ -19,7 +19,7 @@
           <div
             v-if="item.taskHistoryType !== 'COMMENT' && item.taskHistoryType !== 'COMMENT_FILE'"
             class="text-xs font-bold text-body">
-            {{ formatOnlyTime(item.time) }}
+            {{ formatTimeShort(item.time) }}
           </div>
           <div class="flex w-full gap-1 justify-center text-body text-sm">
             <p>{{ HistoryMessageBefore[item.taskHistoryType] }}</p>
@@ -59,7 +59,7 @@
 <script setup lang="ts">
 import { HistoryMessageAfter, HistoryMessageBefore } from '@/constants/user'
 import type { TaskDetailHistoryProps } from '@/types/common'
-import { formatDateWithDay, formatOnlyTime } from '@/utils/date'
+import { formatDateWithDay, formatTimeShort } from '@/utils/date'
 import { watch } from 'vue'
 import TaskDetailHistoryChat from './TaskDetailHistoryChat.vue'
 import TaskDetailHistoryFile from './TaskDetailHistoryFile.vue'
diff --git a/src/components/task-detail/TaskDetailHistoryChat.vue b/src/components/task-detail/TaskDetailHistoryChat.vue
index c6b1945f..ac8bdff1 100644
--- a/src/components/task-detail/TaskDetailHistoryChat.vue
+++ b/src/components/task-detail/TaskDetailHistoryChat.vue
@@ -1,9 +1,9 @@
 <template>
-  <div :class="['flex w-full', isProcessor ? 'justify-end' : 'justify-start']">
+  <div :class="['flex w-full', isRequestor ? 'justify-start' : 'justify-end']">
     <div
       :class="[
         'flex justify-center items-center w-10 h-10 shrink-0 rounded-full overflow-hidden mt-1.5',
-        isProcessor ? 'order-3' : 'order-1'
+        isRequestor ? 'order-1' : 'order-3'
       ]">
       <ImageContainer
         :url="history.details.commentDetails?.profileImageUrl"
@@ -12,21 +12,21 @@
     <div
       :class="[
         'flex flex-col gap-2 order-2 font-bold',
-        isProcessor ? 'items-end pr-4 pl-2' : 'items-start pl-4 pr-2'
+        isRequestor ? 'items-start pl-4 pr-2' : 'items-end pr-4 pl-2'
       ]">
       <p class="text-xs text-body">{{ history.details.commentDetails?.nickName }}</p>
-      <div :class="['flex gap-2', isProcessor ? 'flex-row-reverse' : 'flex-row']">
+      <div :class="['flex gap-2', isRequestor ? 'flex-row' : 'flex-row-reverse']">
         <p
           :class="[
             'flex max-w-[400px] flex-wrap px-4 py-3 text-base rounded-lg font-normal',
-            isProcessor ? 'bg-primary2' : 'bg-background-2'
+            isRequestor ? 'bg-background-2' : 'bg-primary2'
           ]">
           {{ history.details.commentDetails?.comment }}
         </p>
         <div
           :class="[
             'flex flex-col justify-end self-end text-xs font-bold text-body gap-1 relative',
-            isProcessor ? 'order-1 items-end' : 'order-3 items-start'
+            isRequestor ? 'order-3 items-start' : 'order-1 items-end'
           ]">
           <div
             v-if="history.details.commentDetails?.nickName === info.nickname"
@@ -39,13 +39,13 @@
               @click="handleModal"
               :class="[
                 'absolute shadow-custom bottom-0 w-20 h-7 flex items-center justify-center text-xs text-red-1 bg-white hover:bg-background-1 rounded',
-                isProcessor ? 'right-6' : 'left-6'
+                isRequestor ? 'left-6' : 'right-6'
               ]">
               삭제
             </div>
           </div>
           <div class="flex flex-col gap-1 h-full justify-end font-bold">
-            {{ formatOnlyTime(history.time) }}
+            {{ formatTimeShort(history.time) }}
           </div>
         </div>
       </div>
@@ -65,7 +65,7 @@ import { deleteComment } from '@/api/user'
 import { menuDotIcon } from '@/constants/iconPath'
 import { useMemberStore } from '@/stores/member'
 import type { TaskDetailHistoryChatProps } from '@/types/common'
-import { formatOnlyTime } from '@/utils/date'
+import { formatTimeShort } from '@/utils/date'
 import { useQueryClient } from '@tanstack/vue-query'
 import { storeToRefs } from 'pinia'
 import { computed, defineProps, ref } from 'vue'
@@ -76,9 +76,13 @@ import ModalView from '../common/ModalView.vue'
 const memberStore = useMemberStore()
 const { info } = storeToRefs(memberStore)
 const isClicked = ref(false)
-const isProcessor = computed(() => history.details.commentDetails?.nickName !== requestorName)
-const queryClient = useQueryClient()
 const isModalOpen = ref(false)
+const isRequestor = computed(
+  () =>
+    history.details.commentDetails?.nickName === requestorName ||
+    history.details.commentFileDetails?.nickName === requestorName
+)
+const queryClient = useQueryClient()
 const { taskId, history, requestorName } = defineProps<TaskDetailHistoryChatProps>()
 
 const clickMenuDot = async () => {
diff --git a/src/components/task-detail/TaskDetailHistoryFile.vue b/src/components/task-detail/TaskDetailHistoryFile.vue
index 4b8b6dc0..d9bebfa0 100644
--- a/src/components/task-detail/TaskDetailHistoryFile.vue
+++ b/src/components/task-detail/TaskDetailHistoryFile.vue
@@ -1,6 +1,6 @@
 <template>
-  <div :class="['flex w-full', isProcessor ? 'justify-end' : 'justify-start']">
-    <div :class="['w-10 h-10 rounded-full pt-1.5', isProcessor ? 'order-3' : 'order-1']">
+  <div :class="['flex w-full', isRequestor ? 'justify-start' : 'justify-end']">
+    <div :class="['w-10 h-10 rounded-full pt-1.5', isRequestor ? 'order-1' : 'order-3']">
       <ImageContainer
         :size="40"
         :url="history.details.commentFileDetails?.profileImageUrl" />
@@ -8,23 +8,23 @@
     <div
       :class="[
         'flex flex-col gap-2 pl-4 pr-2 order-2',
-        isProcessor ? 'items-end pr-4 pl-2' : 'items-start pl-4 pr-2'
+        isRequestor ? 'items-start pr-4 pl-2' : 'items-end pl-2 pr-4'
       ]">
       <p class="text-xs text-body">{{ history.details.commentFileDetails?.nickName }}</p>
-      <div :class="['flex gap-2', isProcessor ? 'flex-row-reverse' : 'flex-row']">
+      <div :class="['flex gap-2', isRequestor ? 'flex-row' : 'flex-row-reverse']">
         <div
-          :class="[
-            'flex max-w-[400px] flex-wrap px-4 py-3 gap-4 items-center rounded-lg',
-            isProcessor ? 'bg-primary2' : 'bg-background-2'
-          ]">
+          class="flex max-w-[400px] px-4 py-3 gap-4 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"
             :href="history.details.commentFileDetails?.url"
             download>
             <CommonIcons :name="fileIcon" />
           </a>
-          <div class="flex flex-col gap-2">
-            <p class="font-normal">{{ history.details.commentFileDetails?.fileName }}</p>
+          <div class="flex flex-col gap-2 flex-1 min-w-0">
+            <p class="font-normal w-full overflow-hidden whitespace-nowrap text-ellipsis">
+              {{ history.details.commentFileDetails?.fileName }}
+            </p>
             <p class="text-xs font-bold text-body">
               용량 : {{ history.details.commentFileDetails?.size }}
             </p>
@@ -33,7 +33,7 @@
         <div
           :class="[
             'flex flex-col justify-end self-end gap-1 text-xs font-bold text-body',
-            isProcessor ? 'order-1 items-end' : 'order-3'
+            isRequestor ? 'order-3' : ' items-end order-1'
           ]">
           <div
             v-if="history.details.commentFileDetails?.nickName === info.nickname"
@@ -46,7 +46,7 @@
               @click="handleModal"
               :class="[
                 'absolute shadow-custom bottom-0 w-20 h-[27px] rounded flex items-center justify-center text-xs text-red-1 bg-white hover:bg-background-1',
-                isProcessor ? 'right-6' : 'left-6'
+                isRequestor ? 'left-6' : 'right-6'
               ]">
               삭제
             </div>
@@ -87,6 +87,12 @@ const { info } = storeToRefs(memberStore)
 const isClicked = ref(false)
 const isModalOpen = ref(false)
 const queryClient = useQueryClient()
+const isRequestor = computed(
+  () =>
+    history.details.commentDetails?.nickName === requestorName ||
+    history.details.commentFileDetails?.nickName === requestorName
+)
+
 const clickMenuDot = async () => {
   isClicked.value = !isClicked.value
 }
@@ -104,6 +110,4 @@ const deleteCommentFile = async () => {
   }
   queryClient.invalidateQueries({ queryKey: ['historyData', taskId] })
 }
-
-const isProcessor = computed(() => info.value.nickname !== requestorName)
 </script>

From 3b761516ead483c26229d79053e659c32750c885 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Tue, 11 Feb 2025 14:46:09 +0900
Subject: [PATCH 14/26] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EA=B1=B0?=
 =?UTF-8?q?=EB=B6=80=EB=A5=BC=20=EB=B0=98=EB=A0=A4=EB=A1=9C=20=EC=9B=8C?=
 =?UTF-8?q?=EB=94=A9=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/requested/RequestedListCard.vue | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/components/requested/RequestedListCard.vue b/src/components/requested/RequestedListCard.vue
index d525a442..0774c2f8 100644
--- a/src/components/requested/RequestedListCard.vue
+++ b/src/components/requested/RequestedListCard.vue
@@ -40,20 +40,19 @@
     :is-approved="true"
     :selected-id="selectedID"
     :close-task-detail="() => handleModal(null)" />
-
   <ModalView
     :is-open="isModalVisible.reject"
     @update:model-value="value => (rejectReason = value || '')"
     type="inputType"
     @close="closeModal"
     @click="rejectRequest">
-    <template #header>거부 사유를 입력해주세요</template>
+    <template #header>반려 사유를 입력해주세요</template>
   </ModalView>
   <ModalView
     :is-open="isModalVisible.success"
     type="successType"
     @close="closeModal">
-    <template #header>거부가 완료되었습니다</template>
+    <template #header>반려가 완료되었습니다</template>
   </ModalView>
   <ModalView
     :is-open="isModalVisible.fail"
@@ -64,6 +63,7 @@
 </template>
 
 <script setup lang="ts">
+import { useMemberStore } from '@/stores/member'
 import type { ListCardProps } from '@/types/common'
 import type { RequestedListData } from '@/types/manager'
 import { axiosInstance } from '@/utils/axios'
@@ -71,10 +71,9 @@ import { formatDate } from '@/utils/date'
 import { useQueryClient } from '@tanstack/vue-query'
 import { ref } from 'vue'
 import { useRouter } from 'vue-router'
+import ModalView from '../common/ModalView.vue'
 import ListCardTab from '../lists/ListCardTab.vue'
 import TaskDetail from '../task-detail/TaskDetail.vue'
-import { useMemberStore } from '@/stores/member'
-import ModalView from '../common/ModalView.vue'
 
 const { info } = defineProps<{ info: RequestedListData }>()
 const requestedTabList: ListCardProps[] = [
@@ -118,7 +117,7 @@ const closeModal = () => {
 const rejectRequest = async () => {
   if (rejectReason.value.length === 0) {
     toggleModal('fail')
-    modalError.value = '거부 사유를 입력해주세요'
+    modalError.value = '반려 사유를 입력해주세요'
     return
   }
   try {
@@ -126,7 +125,7 @@ const rejectRequest = async () => {
     toggleModal('success')
   } catch {
     toggleModal('fail')
-    modalError.value = '작업 거부에 실패했습니다'
+    modalError.value = '작업 반려에 실패했습니다'
   }
 }
 

From 2a2f7e44e8d02bf76184afb866c9ac64836d2338 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Tue, 11 Feb 2025 14:48:15 +0900
Subject: [PATCH 15/26] =?UTF-8?q?:recycle:=20[refactor]=20:=201=EC=B0=A8?=
 =?UTF-8?q?=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=82=AD=EC=A0=9C=20?=
 =?UTF-8?q?=ED=9B=84=20=EC=B5=9C=EC=8B=A0=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-management/CategoryLine.vue    | 3 +++
 src/components/task-management/CategoryLineSub.vue | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/task-management/CategoryLine.vue b/src/components/task-management/CategoryLine.vue
index a4b52b47..74f2ee8c 100644
--- a/src/components/task-management/CategoryLine.vue
+++ b/src/components/task-management/CategoryLine.vue
@@ -52,9 +52,11 @@ import type { CategoryAllData } from '@/types/admin'
 import { defineProps, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import ModalView from '../common/ModalView.vue'
+import { useQueryClient } from '@tanstack/vue-query'
 
 const { categories } = defineProps<CategoryAllData>()
 const router = useRouter()
+const queryClient = useQueryClient()
 
 const isModalVisible = ref(false)
 const selectedCategoryId = ref<number | null>(null)
@@ -71,6 +73,7 @@ const openModal = (id: number) => {
 const handleDelete = async (id: number | null) => {
   if (id !== null) {
     await deleteCategoryAdmin(id)
+    queryClient.invalidateQueries({ queryKey: ['category'] })
     handleModal()
   }
 }
diff --git a/src/components/task-management/CategoryLineSub.vue b/src/components/task-management/CategoryLineSub.vue
index bfd9f850..975f5935 100644
--- a/src/components/task-management/CategoryLineSub.vue
+++ b/src/components/task-management/CategoryLineSub.vue
@@ -59,10 +59,10 @@ import ModalView from '../common/ModalView.vue'
 
 const { categories } = defineProps<CategoryAllData>()
 const router = useRouter()
+const queryClient = useQueryClient()
 
 const isModalVisible = ref(false)
 const selectedId = ref<number | null>(null)
-const queryClient = useQueryClient()
 
 const openModal = (id: number) => {
   selectedId.value = id

From 492b5ebd34568e6c0d1fca872b32a2f4ffe7ee46 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Tue, 11 Feb 2025 15:49:57 +0900
Subject: [PATCH 16/26] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=A4=91=EB=B3=B5=EC=95=88=EB=90=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EB=B0=A9=EC=A7=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue   | 30 ++++++++++++++-----
 .../request-task/RequestTaskFileInput.vue     |  2 +-
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 208a84f7..3b20bddc 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -30,11 +30,18 @@
       cancelText="취소"
       submitText="요청" />
     <ModalView
-      :isOpen="isModalVisible"
+      :isOpen="isModalVisible === 'success'"
       :type="'successType'"
       @close="handleCancel">
       <template #header>작업이 요청되었습니다</template>
     </ModalView>
+    <ModalView
+      :isOpen="isModalVisible === 'fail'"
+      :type="'failType'"
+      @close="handleCancel">
+      <template #header>작업요청을 실패했습니다</template>
+      <template #body>잠시후 시도해주세요</template>
+    </ModalView>
   </div>
 </template>
 
@@ -58,7 +65,7 @@ const title = ref('')
 const description = ref('')
 const file = ref(null as File[] | null)
 const isInvalidate = ref('')
-const isModalVisible = ref(false)
+const isModalVisible = ref('')
 
 const mainCategoryArr = ref<Category[]>([])
 const subCategoryArr = ref<SubCategory[]>([])
@@ -92,10 +99,15 @@ const handleCancel = () => {
   title.value = ''
   description.value = ''
   file.value = []
+  isModalVisible.value = ''
   router.back()
 }
 
+const isSubmitting = ref(false)
+
 const handleSubmit = async () => {
+  if (isSubmitting.value || isModalVisible.value) return
+
   if (!category1.value || !category2.value) {
     isInvalidate.value = 'category'
     return
@@ -109,16 +121,17 @@ const handleSubmit = async () => {
     isInvalidate.value = 'description'
     return
   }
+
+  isSubmitting.value = true
+
   const formData = new FormData()
   const taskInfo = {
     categoryId: category2.value.id,
     title: title.value,
     description: description.value
   }
-
   const jsonTaskInfo = JSON.stringify(taskInfo)
   const newBlob = new Blob([jsonTaskInfo], { type: 'application/json' })
-
   formData.append('taskInfo', newBlob)
 
   if (file.value && file.value.length > 0) {
@@ -126,9 +139,12 @@ const handleSubmit = async () => {
   }
   try {
     await postTaskRequest(formData)
-    isModalVisible.value = true
-  } catch (error) {
-    console.error('요청 실패:', error)
+    isModalVisible.value = 'success'
+  } catch (e) {
+    console.error(e)
+    isModalVisible.value = 'fail'
+  } finally {
+    isSubmitting.value = false
   }
 }
 </script>
diff --git a/src/components/request-task/RequestTaskFileInput.vue b/src/components/request-task/RequestTaskFileInput.vue
index f5a4afa6..13a7e871 100644
--- a/src/components/request-task/RequestTaskFileInput.vue
+++ b/src/components/request-task/RequestTaskFileInput.vue
@@ -38,7 +38,7 @@
       type="failType"
       @close="handleModal">
       <template #header>파일추가를 실패했습니다</template>
-      <template #body>최대 5개, 각 5mb까지 가능합니다.</template>
+      <template #body>최대 5개, 각 5mb까지 가능합니다</template>
     </ModalView>
   </div>
 </template>

From 8807fef9f35bc712478bd8593dba7b4d155166a4 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Tue, 11 Feb 2025 16:26:28 +0900
Subject: [PATCH 17/26] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=83=81?=
 =?UTF-8?q?=ED=83=9C=20=EB=B3=80=EA=B2=BD=EC=8B=9C=20=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=84=B0=20=EC=B5=9C=EC=8B=A0=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-detail/TaskDetail.vue     | 4 +---
 src/components/task-detail/TaskStatusList.vue | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/task-detail/TaskDetail.vue b/src/components/task-detail/TaskDetail.vue
index 226175f3..222f91f7 100644
--- a/src/components/task-detail/TaskDetail.vue
+++ b/src/components/task-detail/TaskDetail.vue
@@ -51,9 +51,7 @@ const { data } = useQuery<TaskDetailDatas>({
   queryFn:
     info.value.role === 'ROLE_USER'
       ? () => getTaskDetailUser(selectedId)
-      : () => getTaskDetailManager(selectedId),
-  refetchOnWindowFocus: false,
-  staleTime: 1000 * 60 * 5
+      : () => getTaskDetailManager(selectedId)
 })
 
 const { data: historyData } = useQuery<TaskDetailHistoryData>({
diff --git a/src/components/task-detail/TaskStatusList.vue b/src/components/task-detail/TaskStatusList.vue
index 86b3ce88..d870a4c8 100644
--- a/src/components/task-detail/TaskStatusList.vue
+++ b/src/components/task-detail/TaskStatusList.vue
@@ -100,6 +100,7 @@ const rejectRequest = async () => {
     toggleModal('success')
     emit('update:status', 'TERMINATED')
     currentStatus.value = 'TERMINATED'
+    queryClient.invalidateQueries({ queryKey: ['taskDetailUser', taskId] })
     queryClient.invalidateQueries({ queryKey: ['historyData', taskId] })
   } catch {
     toggleModal('fail')
@@ -119,6 +120,7 @@ const changeStatus = async (newStatus: Status) => {
     try {
       currentStatus.value = newStatus
       await patchChangeStatus(taskId || 0, newStatus)
+      queryClient.invalidateQueries({ queryKey: ['taskDetailUser', taskId] })
       queryClient.invalidateQueries({ queryKey: ['historyData', taskId] })
     } catch (error) {
       console.error('Failed to update status:', error)

From 3b5a3ff3a711740ddfd465caeec249c8dfccc00c Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Tue, 11 Feb 2025 17:19:15 +0900
Subject: [PATCH 18/26] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EA=B3=A0?=
 =?UTF-8?q?=EC=9C=A0=EC=BD=94=EB=93=9C=20=EC=9E=91=EC=97=85=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTaskInput.vue      | 2 +-
 src/components/task-detail/TaskDetailRight.vue        | 2 +-
 src/components/task-management/CategoryAdd.vue        | 4 ++--
 src/components/task-management/CategoryManagement.vue | 4 ++--
 src/constants/manager.ts                              | 4 ++--
 src/constants/user.ts                                 | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/request-task/RequestTaskInput.vue b/src/components/request-task/RequestTaskInput.vue
index aa08c8cf..5d675614 100644
--- a/src/components/request-task/RequestTaskInput.vue
+++ b/src/components/request-task/RequestTaskInput.vue
@@ -18,7 +18,7 @@
     <p
       v-if="isInvalidateState === 'code'"
       class="text-red-1 text-xs absolute top-[calc(100%+4px)]">
-      사용할 수 없는 고유코드입니다.
+      사용할 수 없는 작업코드입니다.
     </p>
   </div>
 </template>
diff --git a/src/components/task-detail/TaskDetailRight.vue b/src/components/task-detail/TaskDetailRight.vue
index 8007e443..72fee564 100644
--- a/src/components/task-detail/TaskDetailRight.vue
+++ b/src/components/task-detail/TaskDetailRight.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="sticky top-0 w-[280px] shrink-0 flex flex-col gap-y-6 overflow-y-auto p-6">
     <div>
-      <p class="task-detail">고유코드</p>
+      <p class="task-detail">작업코드</p>
       <p class="text-sm">{{ data.taskCode || '-' }}</p>
     </div>
     <div>
diff --git a/src/components/task-management/CategoryAdd.vue b/src/components/task-management/CategoryAdd.vue
index 2148749f..5a9bbd38 100644
--- a/src/components/task-management/CategoryAdd.vue
+++ b/src/components/task-management/CategoryAdd.vue
@@ -33,8 +33,8 @@
       :label-name="`${categoryStep}차 카테고리명`" />
     <RequestTaskInput
       v-model="categoryForm.code"
-      placeholder-text="카테고리의 고유코드를 입력해주세요"
-      label-name="고유코드 (대문자 영어 2글자까지)"
+      placeholder-text="카테고리의 작업코드를 입력해주세요"
+      label-name="작업코드 (대문자 영어 2글자까지)"
       :is-invalidate="isCodeInvalidate" />
 
     <div
diff --git a/src/components/task-management/CategoryManagement.vue b/src/components/task-management/CategoryManagement.vue
index 936db2f9..232fce7e 100644
--- a/src/components/task-management/CategoryManagement.vue
+++ b/src/components/task-management/CategoryManagement.vue
@@ -3,12 +3,12 @@
     class="flex flex-col w-full h-[480px] border border-border-1 rounded-lg bg-background-1 overflow-hidden">
     <div class="flex w-full">
       <div class="task-management-title rounded-tl-lg">
-        <p>고유코드</p>
+        <p>작업코드</p>
         <p>1차 카테고리</p>
       </div>
       <div class="w-0.5 bg-border-1"></div>
       <div class="task-management-title rounded-tr-lg">
-        <p>고유코드</p>
+        <p>작업코드</p>
         <p>2차 카테고리</p>
       </div>
     </div>
diff --git a/src/constants/manager.ts b/src/constants/manager.ts
index 9ca7cd74..ed9b0779 100644
--- a/src/constants/manager.ts
+++ b/src/constants/manager.ts
@@ -11,7 +11,7 @@ export const REQUESTED_LIST_BAR_TAB: ListBarTabProps[] = [
 ]
 
 export const REQUEST_HISTORY_LIST_BAR_TAB: ListBarTabProps[] = [
-  { content: '고유코드', width: 120 },
+  { content: '작업코드', width: 120 },
   { content: '요청일', width: 80, sortBy: 'REQUESTED_AT' },
   { content: '1차 카테고리', width: 80 },
   { content: '2차 카테고리', width: 80 },
@@ -23,7 +23,7 @@ export const REQUEST_HISTORY_LIST_BAR_TAB: ListBarTabProps[] = [
 ]
 
 export const MY_TASK_LIST_BAR_TAB: ListBarTabProps[] = [
-  { content: '고유코드', width: 120 },
+  { content: '작업코드', width: 120 },
   { content: '요청일', width: 80, sortBy: 'REQUESTED_AT' },
   { content: '1차 카테고리', width: 80 },
   { content: '2차 카테고리', width: 80 },
diff --git a/src/constants/user.ts b/src/constants/user.ts
index 1ed926b8..499f4434 100644
--- a/src/constants/user.ts
+++ b/src/constants/user.ts
@@ -2,7 +2,7 @@ import type { ListBarTabProps } from '@/types/common'
 import type { TaskHistoryType } from '@/types/user'
 
 export const MY_REQUEST_LIST_BAR_TAB: ListBarTabProps[] = [
-  { content: '고유코드', width: 120 },
+  { content: '작업코드', width: 120 },
   { content: '요청일', width: 80, sortBy: 'REQUESTED_AT' },
   { content: '1차 카테고리', width: 80 },
   { content: '2차 카테고리', width: 80 },

From ad50fe81280ec48cc983d3154c7150f393a4829a Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Tue, 11 Feb 2025 21:47:33 +0900
Subject: [PATCH 19/26] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EB=B3=80=EA=B2=BD=EC=97=90=20=EB=94=B0?=
 =?UTF-8?q?=EB=A5=B8=20=EC=9A=B0=EC=B8=A1=20=EC=84=B8=EB=B6=80=EC=82=AC?=
 =?UTF-8?q?=ED=95=AD=20=EC=B5=9C=EC=8B=A0=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-detail/TaskDetailRight.vue | 1 +
 src/components/task-detail/TaskStatusList.vue  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/task-detail/TaskDetailRight.vue b/src/components/task-detail/TaskDetailRight.vue
index 72fee564..9af15318 100644
--- a/src/components/task-detail/TaskDetailRight.vue
+++ b/src/components/task-detail/TaskDetailRight.vue
@@ -117,6 +117,7 @@ watch(newManager, async newValue => {
       await changeProcessor(data.taskId, newValue.memberId)
       selectedManager.value = newValue
       queryClient.invalidateQueries({ queryKey: ['historyData', data.taskId] })
+      queryClient.invalidateQueries({ queryKey: ['taskDetailUser', data.taskId] })
     } catch (error) {
       console.error('Error updating processor', error)
     }
diff --git a/src/components/task-detail/TaskStatusList.vue b/src/components/task-detail/TaskStatusList.vue
index d870a4c8..620e81e9 100644
--- a/src/components/task-detail/TaskStatusList.vue
+++ b/src/components/task-detail/TaskStatusList.vue
@@ -91,7 +91,6 @@ const bgColor = (taskStatus: Status) => {
 const rejectRequest = async () => {
   if (rejectReason.value.length === 0) {
     toggleModal('fail')
-
     modalError.value = '종료 사유를 입력해주세요'
     return
   }

From 9ee3144932af2674e6afb7e4e172b9beeb2f84f9 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Tue, 11 Feb 2025 21:47:56 +0900
Subject: [PATCH 20/26] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=83=81?=
 =?UTF-8?q?=EC=84=B8=EC=A1=B0=ED=9A=8C=20=EB=B3=80=EA=B2=BD=EC=97=90=20?=
 =?UTF-8?q?=EB=94=B0=EB=A5=B8=20=EC=A0=84=EC=B2=B4=20=EC=9A=94=EC=B2=AD=20?=
 =?UTF-8?q?=EA=B8=B0=EB=A1=9D=20=EC=B5=9C=EC=8B=A0=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request-history/RequestHistoryList.vue     | 18 +++++++++---------
 .../request-history/RequestHistoryListCard.vue | 15 +++++++++++++--
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/components/request-history/RequestHistoryList.vue b/src/components/request-history/RequestHistoryList.vue
index 8a000fed..dd898844 100644
--- a/src/components/request-history/RequestHistoryList.vue
+++ b/src/components/request-history/RequestHistoryList.vue
@@ -7,7 +7,7 @@
     <template #listCards>
       <RequestHistoryListCard
         v-for="info in data?.content"
-        :key="info.taskId"
+        :key="info.taskStatus + info.processorName + info.taskId"
         :info="info" />
       <NoContent v-if="data?.content.length === 0" />
     </template>
@@ -22,19 +22,19 @@
 </template>
 
 <script setup lang="ts">
-import ListPagination from '../lists/ListPagination.vue'
-import ListContainer from '../lists/ListContainer.vue'
+import { useParseParams } from '@/hooks/useParseParams'
+import { useMemberStore } from '@/stores/member'
 import { useRequestParamsStore } from '@/stores/params'
-import RequestHistoryListBar from './RequestHistoryListBar.vue'
-import RequestHistoryListCard from './RequestHistoryListCard.vue'
+import type { RequestHistoryResponse } from '@/types/manager'
 import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
+import { storeToRefs } from 'pinia'
 import { computed } from 'vue'
-import type { RequestHistoryResponse } from '@/types/manager'
+import ListContainer from '../lists/ListContainer.vue'
+import ListPagination from '../lists/ListPagination.vue'
 import NoContent from '../lists/NoContent.vue'
-import { useMemberStore } from '@/stores/member'
-import { storeToRefs } from 'pinia'
-import { useParseParams } from '@/hooks/useParseParams'
+import RequestHistoryListBar from './RequestHistoryListBar.vue'
+import RequestHistoryListCard from './RequestHistoryListCard.vue'
 
 const { params } = useRequestParamsStore()
 const onPageChange = (value: number) => {
diff --git a/src/components/request-history/RequestHistoryListCard.vue b/src/components/request-history/RequestHistoryListCard.vue
index 000b85c9..a896181d 100644
--- a/src/components/request-history/RequestHistoryListCard.vue
+++ b/src/components/request-history/RequestHistoryListCard.vue
@@ -19,19 +19,30 @@
 </template>
 
 <script setup lang="ts">
+import { useRequestParamsStore } from '@/stores/params'
 import type { ListCardProps } from '@/types/common'
 import type { RequestHistoryListData } from '@/types/manager'
 import { formatDate } from '@/utils/date'
+import { useQueryClient } from '@tanstack/vue-query'
 import { ref } from 'vue'
 import ListCardTab from '../lists/ListCardTab.vue'
 import TaskDetail from '../task-detail/TaskDetail.vue'
 
 const { info } = defineProps<{ info: RequestHistoryListData }>()
 const selectedID = ref<number | null>(null)
+const { params } = useRequestParamsStore()
+const queryClient = useQueryClient()
 
 const handleModal = (id: number | null) => {
-  if (id) document.body.style.overflow = 'hidden'
-  else document.body.style.overflow = ''
+  if (id) {
+    document.body.style.overflow = 'hidden'
+  } else {
+    queryClient.invalidateQueries({
+      queryKey: ['requestHistory', params],
+      refetchType: 'all'
+    })
+    document.body.style.overflow = ''
+  }
   selectedID.value = id
 }
 const myRequestTabList: ListCardProps[] = [

From 06646f5319b05860bb87df5d3f370e6a631fbcf4 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Tue, 11 Feb 2025 22:07:57 +0900
Subject: [PATCH 21/26] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=83=81?=
 =?UTF-8?q?=EC=84=B8=EC=A1=B0=ED=9A=8C=20=EB=B3=80=EA=B2=BD=EC=97=90=20?=
 =?UTF-8?q?=EB=94=B0=EB=A5=B8=20=EB=82=B4=20=EC=9A=94=EC=B2=AD=20=EC=B5=9C?=
 =?UTF-8?q?=EC=8B=A0=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/my-request/MyRequestList.vue          |  8 ++++----
 src/components/my-request/MyRequestListCard.vue      | 12 +++++++++++-
 .../request-history/RequestHistoryListCard.vue       |  3 +--
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/components/my-request/MyRequestList.vue b/src/components/my-request/MyRequestList.vue
index f025fd73..e8b4f0ea 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.taskId"
+        :key="info.taskStatus + info.processorName + info.taskId"
         :info="info" />
       <NoContent v-if="data?.content.length === 0" />
     </template>
@@ -22,19 +22,19 @@
 </template>
 
 <script setup lang="ts">
+import { useParseParams } from '@/hooks/useParseParams'
+import { useMemberStore } from '@/stores/member'
 import { useRequestParamsStore } from '@/stores/params'
 import type { MyRequestResponse } from '@/types/user'
 import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
+import { storeToRefs } from 'pinia'
 import { computed } from 'vue'
 import ListContainer from '../lists/ListContainer.vue'
 import ListPagination from '../lists/ListPagination.vue'
 import NoContent from '../lists/NoContent.vue'
 import MyRequestListBar from './MyRequestListBar.vue'
 import MyRequestListCard from './MyRequestListCard.vue'
-import { useMemberStore } from '@/stores/member'
-import { storeToRefs } from 'pinia'
-import { useParseParams } from '@/hooks/useParseParams'
 
 const { params } = useRequestParamsStore()
 const onPageChange = (value: number) => {
diff --git a/src/components/my-request/MyRequestListCard.vue b/src/components/my-request/MyRequestListCard.vue
index 390a61a5..4b2de12d 100644
--- a/src/components/my-request/MyRequestListCard.vue
+++ b/src/components/my-request/MyRequestListCard.vue
@@ -19,19 +19,29 @@
 </template>
 
 <script setup lang="ts">
+import { useRequestParamsStore } from '@/stores/params'
 import type { ListCardProps } from '@/types/common'
 import type { MyRequestListData } from '@/types/user'
 import { formatDate } from '@/utils/date'
+import { useQueryClient } from '@tanstack/vue-query'
 import { ref } from 'vue'
 import ListCardTab from '../lists/ListCardTab.vue'
 import TaskDetail from '../task-detail/TaskDetail.vue'
 
 const { info } = defineProps<{ info: MyRequestListData }>()
 const selectedID = ref<number | null>(null)
+const { params } = useRequestParamsStore()
+const queryClient = useQueryClient()
 
 const handleModal = (id: number | null) => {
   if (id) document.body.style.overflow = 'hidden'
-  else document.body.style.overflow = ''
+  else {
+    queryClient.invalidateQueries({
+      queryKey: ['myRequest', params]
+    })
+    document.body.style.overflow = ''
+  }
+
   selectedID.value = id
 }
 
diff --git a/src/components/request-history/RequestHistoryListCard.vue b/src/components/request-history/RequestHistoryListCard.vue
index a896181d..4645499a 100644
--- a/src/components/request-history/RequestHistoryListCard.vue
+++ b/src/components/request-history/RequestHistoryListCard.vue
@@ -38,8 +38,7 @@ const handleModal = (id: number | null) => {
     document.body.style.overflow = 'hidden'
   } else {
     queryClient.invalidateQueries({
-      queryKey: ['requestHistory', params],
-      refetchType: 'all'
+      queryKey: ['requestHistory', params]
     })
     document.body.style.overflow = ''
   }

From 6d16246851e74d63e9f620679159fc9e6641bc83 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Tue, 11 Feb 2025 22:13:21 +0900
Subject: [PATCH 22/26] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=83=81?=
 =?UTF-8?q?=EC=84=B8=EC=A1=B0=ED=9A=8C=20=EA=B5=AC=EB=B6=84=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=20=EC=8B=9C=20=EB=94=94=ED=85=8C=EC=9D=BC=20=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=B5=9C=EC=8B=A0=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-detail/TaskDetailLabelDropdown.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/task-detail/TaskDetailLabelDropdown.vue b/src/components/task-detail/TaskDetailLabelDropdown.vue
index 57999b18..bcb0d892 100644
--- a/src/components/task-detail/TaskDetailLabelDropdown.vue
+++ b/src/components/task-detail/TaskDetailLabelDropdown.vue
@@ -35,6 +35,7 @@ import { dropdownIcon } from '@/constants/iconPath'
 import { useOutsideClick } from '@/hooks/useOutsideClick'
 import type { LabelDataTypes } from '@/types/common'
 import type { LabelDropdownProps } from '@/types/user'
+import { useQueryClient } from '@tanstack/vue-query'
 import { onMounted, ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 
@@ -43,6 +44,7 @@ const emit = defineEmits(['update:modelValue'])
 const dropdownOpen = ref(false)
 
 const labelArr = ref<LabelDataTypes[]>([])
+const queryClient = useQueryClient()
 
 onMounted(async () => {
   labelArr.value = await getLabelsManager()
@@ -54,6 +56,7 @@ const toggleDropdown = () => {
 const selectOption = async (option: LabelDataTypes) => {
   emit('update:modelValue', option)
   await changeLabel(taskId || 0, option.labelId || 0)
+  queryClient.invalidateQueries({ queryKey: ['taskDetailUser', taskId] })
   dropdownOpen.value = false
 }
 

From 89ca2af43d04b75bd7e2942a94a1afe5743c087b Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Tue, 11 Feb 2025 23:05:11 +0900
Subject: [PATCH 23/26] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=83=81?=
 =?UTF-8?q?=EC=84=B8=EC=A1=B0=ED=9A=8C=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EC=8B=9C=20=EC=9E=91=EC=97=85=EB=B3=B4?=
 =?UTF-8?q?=EB=93=9C=20=ED=98=84=ED=99=A9=20=EC=B5=9C=EC=8B=A0=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/TaskCard.vue      | 18 +++++++++++++++---
 src/components/team-board/TeamBoard.vue | 14 +++++++-------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/components/common/TaskCard.vue b/src/components/common/TaskCard.vue
index c7484113..25e9b23d 100644
--- a/src/components/common/TaskCard.vue
+++ b/src/components/common/TaskCard.vue
@@ -42,18 +42,22 @@
 
 <script setup lang="ts">
 import { bentoIcon } from '@/constants/iconPath'
+import { useTeamBoardParamsStore } from '@/stores/params'
 import type { Status } from '@/types/common'
 import type { TaskCardProps } from '@/types/manager'
 import { statusAsColor } from '@/utils/statusAsColor'
+import { useQueryClient } from '@tanstack/vue-query'
 import { computed, ref } from 'vue'
+import TaskDetail from '../task-detail/TaskDetail.vue'
 import CommonIcons from './CommonIcons.vue'
-import TaskLabel from './TaskLabel.vue'
 import ImageContainer from './ImageContainer.vue'
-import TaskDetail from '../task-detail/TaskDetail.vue'
+import TaskLabel from './TaskLabel.vue'
 
 const { data } = defineProps<{ data: TaskCardProps; draggable?: boolean }>()
 const emit = defineEmits(['toggleModal'])
 const selectedID = ref<number | null>(null)
+const queryClient = useQueryClient()
+const { params } = useTeamBoardParamsStore()
 
 const borderLeft = computed(() => {
   return `border-${statusAsColor(data.taskStatus as Status)}-1`
@@ -61,7 +65,15 @@ const borderLeft = computed(() => {
 
 const handleModal = (id: number | null) => {
   if (id) document.body.style.overflow = 'hidden'
-  else document.body.style.overflow = ''
+  else {
+    queryClient.invalidateQueries({
+      queryKey: ['taskBoard']
+    })
+    queryClient.invalidateQueries({
+      queryKey: ['teamStatus', params]
+    })
+    document.body.style.overflow = ''
+  }
   emit('toggleModal')
   selectedID.value = id
 }
diff --git a/src/components/team-board/TeamBoard.vue b/src/components/team-board/TeamBoard.vue
index 5a02088d..816b52bb 100644
--- a/src/components/team-board/TeamBoard.vue
+++ b/src/components/team-board/TeamBoard.vue
@@ -16,17 +16,17 @@
 </template>
 
 <script setup lang="ts">
-import TeamBoardCard from './TeamBoardCard.vue'
-import CurrentTaskRatio from './CurrentTaskRatio.vue'
-import { axiosInstance } from '@/utils/axios'
+import { useParseParams } from '@/hooks/useParseParams'
+import { useMemberStore } from '@/stores/member'
 import { useTeamBoardParamsStore } from '@/stores/params'
-import { useQuery } from '@tanstack/vue-query'
 import type { TeamBoardResponse } from '@/types/manager'
+import { axiosInstance } from '@/utils/axios'
+import { useQuery } from '@tanstack/vue-query'
+import { storeToRefs } from 'pinia'
 import { computed } from 'vue'
 import NoContent from '../lists/NoContent.vue'
-import { useMemberStore } from '@/stores/member'
-import { storeToRefs } from 'pinia'
-import { useParseParams } from '@/hooks/useParseParams'
+import CurrentTaskRatio from './CurrentTaskRatio.vue'
+import TeamBoardCard from './TeamBoardCard.vue'
 
 const { params } = useTeamBoardParamsStore()
 

From 5190fb9562e8ea3628cdb83ad5b165320d21a211 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Tue, 11 Feb 2025 23:17:11 +0900
Subject: [PATCH 24/26] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=83=81?=
 =?UTF-8?q?=EC=84=B8=EC=A1=B0=ED=9A=8C=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EC=8B=9C=20=EB=82=B4=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=B5=9C=EC=8B=A0=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/my-task/MyTaskList.vue     |  2 +-
 src/components/my-task/MyTaskListCard.vue | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/components/my-task/MyTaskList.vue b/src/components/my-task/MyTaskList.vue
index ff31a896..d2cf8f18 100644
--- a/src/components/my-task/MyTaskList.vue
+++ b/src/components/my-task/MyTaskList.vue
@@ -7,7 +7,7 @@
     <template #listCards>
       <MyTaskListCard
         v-for="info in data?.content"
-        :key="info.taskId"
+        :key="info.taskStatus + info.taskId"
         :info="info" />
       <NoContent v-if="data?.content.length === 0" />
     </template>
diff --git a/src/components/my-task/MyTaskListCard.vue b/src/components/my-task/MyTaskListCard.vue
index d9d24c9c..e03c5455 100644
--- a/src/components/my-task/MyTaskListCard.vue
+++ b/src/components/my-task/MyTaskListCard.vue
@@ -19,19 +19,28 @@
 </template>
 
 <script setup lang="ts">
+import { useRequestParamsStore } from '@/stores/params'
 import type { ListCardProps } from '@/types/common'
 import type { MyTaskListData } from '@/types/manager'
 import { formatDate } from '@/utils/date'
+import { useQueryClient } from '@tanstack/vue-query'
 import { ref } from 'vue'
 import ListCardTab from '../lists/ListCardTab.vue'
 import TaskDetail from '../task-detail/TaskDetail.vue'
 
 const { info } = defineProps<{ info: MyTaskListData }>()
 const selectedID = ref<number | null>(null)
+const queryClient = useQueryClient()
+const { params } = useRequestParamsStore()
 
 const handleModal = (id: number | null) => {
   if (id) document.body.style.overflow = 'hidden'
-  else document.body.style.overflow = ''
+  else {
+    queryClient.invalidateQueries({
+      queryKey: ['myTask', params]
+    })
+    document.body.style.overflow = ''
+  }
   selectedID.value = id
 }
 const myRequestTabList: ListCardProps[] = [

From 78299c5f543224c6d677d5258331ab4f86e1866a Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Wed, 12 Feb 2025 02:06:12 +0900
Subject: [PATCH 25/26] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=9E=AC?=
 =?UTF-8?q?=EC=9A=94=EC=B2=AD,=20=EC=9A=94=EC=B2=AD=EC=88=98=EC=A0=95?=
 =?UTF-8?q?=EC=8B=9C=20=EC=9A=94=EC=B2=AD=20=EC=A4=91=EB=B3=B5=EB=90=98?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EA=B2=8C=20=EB=B0=A9=EC=A7=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/ReRequestTask.vue | 22 ++++++++++++++-----
 src/components/request-task/RequestTask.vue   |  2 +-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/components/request-task/ReRequestTask.vue b/src/components/request-task/ReRequestTask.vue
index a55e3536..65c8f804 100644
--- a/src/components/request-task/ReRequestTask.vue
+++ b/src/components/request-task/ReRequestTask.vue
@@ -30,11 +30,18 @@
       cancelText="취소"
       submitText="수정" />
     <ModalView
-      :isOpen="isModalVisible"
+      :isOpen="isModalVisible === 'success'"
       :type="'successType'"
       @close="handleCancel">
       <template #header>작업이 수정되었습니다</template>
     </ModalView>
+    <ModalView
+      :isOpen="isModalVisible === 'fail'"
+      :type="'failType'"
+      @close="handleCancel">
+      <template #header>작업요청을 실패했습니다</template>
+      <template #body>잠시후 시도해주세요</template>
+    </ModalView>
   </div>
 </template>
 
@@ -59,7 +66,8 @@ const title = ref('')
 const description = ref('')
 const file = ref(null as File[] | null)
 const isInvalidate = ref('')
-const isModalVisible = ref(false)
+const isModalVisible = ref('')
+const isSubmitting = ref(false)
 
 const mainCategoryArr = ref<Category[]>([])
 const subCategoryArr = ref<SubCategory[]>([])
@@ -105,6 +113,7 @@ watch(category1, async newValue => {
 })
 
 const handleSubmit = async () => {
+  if (isSubmitting.value || isModalVisible.value) return
   if (!category2.value) {
     isInvalidate.value = 'category'
     return
@@ -158,9 +167,12 @@ const handleSubmit = async () => {
     } else {
       await patchTaskRequest(id, formData)
     }
-    isModalVisible.value = true
-  } catch (error) {
-    console.error('요청 실패:', error)
+    isModalVisible.value = 'success'
+  } catch (e) {
+    isModalVisible.value = 'fail'
+    console.error('요청 실패:', e)
+  } finally {
+    isSubmitting.value = false
   }
 }
 </script>
diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 3b20bddc..8019679a 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -66,6 +66,7 @@ const description = ref('')
 const file = ref(null as File[] | null)
 const isInvalidate = ref('')
 const isModalVisible = ref('')
+const isSubmitting = ref(false)
 
 const mainCategoryArr = ref<Category[]>([])
 const subCategoryArr = ref<SubCategory[]>([])
@@ -103,7 +104,6 @@ const handleCancel = () => {
   router.back()
 }
 
-const isSubmitting = ref(false)
 
 const handleSubmit = async () => {
   if (isSubmitting.value || isModalVisible.value) return

From 0cd7e136eedb4448865370fbc022cc3fde56b804 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Wed, 12 Feb 2025 02:30:58 +0900
Subject: [PATCH 26/26] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=9E=91?=
 =?UTF-8?q?=EC=97=85=EC=88=98=EC=A0=95=EC=97=90=EC=84=9C=20=EC=97=90?=
 =?UTF-8?q?=EB=9F=AC=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=9E=85=EB=A0=A5?=
 =?UTF-8?q?=EB=9E=80=20=EA=B2=BD=EA=B3=A0=ED=91=9C=EC=8B=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue   |  1 -
 .../user-manage/UserRegistration.vue          |  1 +
 src/components/user-manage/UserUpdate.vue     | 41 +++++++++++++------
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index a290c8dd..9be1863f 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -104,7 +104,6 @@ const handleCancel = () => {
   router.back()
 }
 
-
 const handleSubmit = async () => {
   if (isSubmitting.value || isModalVisible.value) return
 
diff --git a/src/components/user-manage/UserRegistration.vue b/src/components/user-manage/UserRegistration.vue
index 7286f464..9c58796e 100644
--- a/src/components/user-manage/UserRegistration.vue
+++ b/src/components/user-manage/UserRegistration.vue
@@ -69,6 +69,7 @@ import RequestTaskInput from '../request-task/RequestTaskInput.vue'
 import DepartmentDropDown from './DepartmentDropDown.vue'
 
 const router = useRouter()
+
 const isModalVisible = ref(false)
 const userRegistrationForm = ref(INITIAL_USER_REGISTRATION)
 const isInvalidate = ref('')
diff --git a/src/components/user-manage/UserUpdate.vue b/src/components/user-manage/UserUpdate.vue
index 5a40dab1..48d96f3a 100644
--- a/src/components/user-manage/UserUpdate.vue
+++ b/src/components/user-manage/UserUpdate.vue
@@ -14,6 +14,7 @@
       v-model="userRegistrationForm.nickname"
       :placeholderText="'회원의 아이디를 입력해주세요'"
       :isEdit="true"
+      :is-invalidate="isInvalidate"
       :labelName="'아이디'" />
     <div class="flex w-full gap-2">
       <RequestTaskInput
@@ -28,10 +29,14 @@
         :is-edit="true"
         :is-not-required="false" />
     </div>
+    <DepartmentDropDown
+      v-model="userRegistrationForm.departmentId"
+      :is-invalidate="isInvalidate" />
     <RequestTaskDropdown
       v-model="userRegistrationForm.role"
       :options="RoleKeys"
       :label-name="'역할'"
+      :is-invalidate="isInvalidate"
       :placeholderText="'회원의 역할을 선택해주세요'" />
     <FormCheckbox
       v-if="isManager"
@@ -40,7 +45,6 @@
       :checkButtonName="'허용'"
       :isDisabled="!isManager"
       :isChecked="userRegistrationForm.isReviewer" />
-    <DepartmentDropDown v-model="userRegistrationForm.departmentId" />
     <RequestTaskInput
       v-model="userRegistrationForm.departmentRole"
       :placeholderText="'회원의 직무를 입력해주세요'"
@@ -67,19 +71,22 @@ import { computed, onMounted, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
 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 DepartmentDropDown from './DepartmentDropDown.vue'
-import ModalView from '../common/ModalView.vue'
 
 const route = useRoute()
 const router = useRouter()
 
 const userRegistrationForm = ref(INITIAL_USER_REGISTRATION)
-const isManager = computed(() => userRegistrationForm.value.role === '담당자')
+const isInvalidate = ref('')
 const userId = ref(route.query.id)
 const userData = ref<UserRegistrationProps | null>(null)
 const isModalVisible = ref(false)
+const isError = ref(false)
+
+const isManager = computed(() => userRegistrationForm.value.role === '담당자')
 
 watch(
   () => router.currentRoute.value.query.id,
@@ -108,16 +115,26 @@ const handleCancel = async () => {
 }
 
 const handleSubmit = async () => {
-  if (typeof userId.value === 'string') {
-    const userData = {
-      role: RoleTypeMapping[userRegistrationForm.value.role],
-      name: userRegistrationForm.value.name,
-      isReviewer: isManager.value ? userRegistrationForm.value.isReviewer : false,
-      departmentId: userRegistrationForm.value.departmentId,
-      departmentRole: userRegistrationForm.value.departmentRole
+  try {
+    if (typeof userId.value === 'string') {
+      const userData = {
+        role: RoleTypeMapping[userRegistrationForm.value.role],
+        name: userRegistrationForm.value.name,
+        isReviewer: isManager.value ? userRegistrationForm.value.isReviewer : false,
+        departmentId: userRegistrationForm.value.departmentId,
+        departmentRole: userRegistrationForm.value.departmentRole
+      }
+      await updateMemberAdmin(userId.value, userData)
+      isModalVisible.value = true
+    }
+  } catch (error) {
+    if (error instanceof Error && error.message === 'MEMBER_DUPLICATED') {
+      isInvalidate.value = 'duplicate'
+    } else if (error instanceof Error && error.message === 'MEMBER_REVIEWER') {
+      isInvalidate.value = 'reviewer'
+    } else {
+      isError.value = true
     }
-    await updateMemberAdmin(userId.value, userData)
-    isModalVisible.value = true
   }
 }
 </script>