From 3fa7eff7d906bb0a3809641e89724fa2d22d5672 Mon Sep 17 00:00:00 2001
From: dyhj625 <dyhj625@local-host.co.kr>
Date: Tue, 11 Mar 2025 15:17:16 +0900
Subject: [PATCH] =?UTF-8?q?=ED=9C=B4=EA=B0=80=20=EC=A0=80=EC=9E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/custom.css                     | 17 ++++-------------
 src/components/modal/VacationModal.vue    | 18 +++++++++++-------
 src/components/vacation/ProfileList.vue   |  2 +-
 src/views/vacation/VacationManagement.vue |  2 ++
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/public/css/custom.css b/public/css/custom.css
index cacca3f..1e39f5a 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -206,24 +206,15 @@ cursor: not-allowed !important;
 .custom-button:hover i {
   color: #ff0800;
 }
+.custom-button:disabled {
+  cursor: not-allowed;
+
+}
 
 /* 휴가 사원프로필 */
 .profile-list {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 15px;
-  padding: 0;
-  list-style: none;
-  justify-content: flex-start;
   cursor: pointer;
 }
-.profile-item {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  cursor: pointer;
-  width: calc(33.33% - 10px);
-}
 
 /* 오전/오후반차,저장버튼 */
 /* 버튼 기본 스타일 */
diff --git a/src/components/modal/VacationModal.vue b/src/components/modal/VacationModal.vue
index 1d2c51c..b8f3439 100644
--- a/src/components/modal/VacationModal.vue
+++ b/src/components/modal/VacationModal.vue
@@ -74,13 +74,17 @@ const usedVacations = computed(() => {
 });
 
 // 받은 휴가
-const receivedVacations = computed(() =>
-    props.receivedVacations.map((v) => ({
-        ...v,
-        category: "received",
-    }))
-);
-
+const receivedVacations = computed(() => {
+    const data = props.receivedVacations.flatMap((v) => {
+        const count = v.received_quota ?? 1;
+        return Array.from({ length: Math.ceil(count) }, (_, i) => ({
+            ...v,
+            category: "received",
+            _expandIndex: globalCounter++,
+        }));
+    });
+    return data;
+});
 // 필터링
 const sortedUsedVacationsAsc = computed(() => {
     return [...usedVacations.value].sort((a, b) => {
diff --git a/src/components/vacation/ProfileList.vue b/src/components/vacation/ProfileList.vue
index 1e5a6e6..5ad55f7 100644
--- a/src/components/vacation/ProfileList.vue
+++ b/src/components/vacation/ProfileList.vue
@@ -10,7 +10,7 @@
             data-bs-placement="top"
             :aria-label="user.MEMBERSEQ"
         >
-                <div class="ratio ratio-1x1 mb-2">
+                <div class="ratio ratio-1x1 mb-2 profile-list">
                     <img
                         class="rounded-circle profile-img"
                         :src="getUserProfileImage(user.MEMBERPRF)"
diff --git a/src/views/vacation/VacationManagement.vue b/src/views/vacation/VacationManagement.vue
index d3d2872..f6e35a2 100644
--- a/src/views/vacation/VacationManagement.vue
+++ b/src/views/vacation/VacationManagement.vue
@@ -383,7 +383,9 @@ async function fetchVacationHistory(year) {
     try {
         const response = await axios.get(`vacation/history?year=${year}`);
         if (response.status === 200 && response.data) {
+            console.log(response.data.data)
             myVacations.value = response.data.data.usedVacations || [];
+            receivedVacations.value = response.data.data.receivedVacations || []
         }
     } catch (error) {
         console.error(`🚨 휴가 데이터 불러오기 실패:`, error);