
--- client/resources/scss/admin/content.scss
+++ client/resources/scss/admin/content.scss
... | ... | @@ -529,7 +529,6 @@ |
529 | 529 |
|
530 | 530 |
.top-content { |
531 | 531 |
display: flex; |
532 |
- justify-content: space-between; |
|
533 | 532 |
gap: 40px; |
534 | 533 |
margin-bottom: 15px; |
535 | 534 |
} |
... | ... | @@ -538,9 +537,10 @@ |
538 | 537 |
// width: 550px; |
539 | 538 |
|
540 | 539 |
.blue-box { |
540 |
+ width: 550px; |
|
541 | 541 |
background-color: #D7DCF1; |
542 | 542 |
border-radius: 10px; |
543 |
- padding: 30px; |
|
543 |
+ padding: 32px; |
|
544 | 544 |
|
545 | 545 |
.box { |
546 | 546 |
background-color: #fff; |
--- client/views/pages/AppRouter.js
+++ client/views/pages/AppRouter.js
... | ... | @@ -20,6 +20,7 @@ |
20 | 20 |
import approvalRequest from '../pages/Manager/approval/approvalRequest.vue'; |
21 | 21 |
import ChuljangPumui from '../pages/Manager/approval/ChuljangPumui.vue'; |
22 | 22 |
import ChuljangBokmyeong from '../pages/Manager/approval/ChuljangBokmyeong.vue'; |
23 |
+import Hyuga from '../pages/Manager/approval/Hyuga.vue'; |
|
23 | 24 |
|
24 | 25 |
//근태관리 |
25 | 26 |
import ChuljangPumuiDetail from '../pages/Manager/attendance/ChuljangPumuiDetail.vue'; |
... | ... | @@ -30,11 +31,12 @@ |
30 | 31 |
import buseoAttendance from '../pages/Manager/attendance/buseoAttendance.vue'; |
31 | 32 |
import AttendanceDetail from '../pages/Manager/attendance/AttendanceDetail.vue'; |
32 | 33 |
import hyugaStatue from '../pages/Manager/attendance/hyugaStatue.vue'; |
33 |
-import HyugaInsert from '../pages/Manager/approval/HyugaInsert.vue'; |
|
34 |
-import HyugaDetail from '../pages/Manager/approval/HyugaDetail.vue'; |
|
34 |
+import HyugaInsert from '../pages/Manager/attendance/HyugaInsert.vue'; |
|
35 |
+import HyugaDetail from '../pages/Manager/attendance/HyugaDetail.vue'; |
|
35 | 36 |
import BokmyeongInsert from '../pages/Manager/attendance/BokmyeongInsert.vue'; |
36 | 37 |
import ChuljangStatue from '../pages/Manager/attendance/ChuljangStatue.vue'; |
37 | 38 |
import ChuljangInsert from '../pages/Manager/attendance/ChuljangInsert.vue'; |
39 |
+//업무관리 |
|
38 | 40 |
import task from '../pages/Manager/task/task.vue'; |
39 | 41 |
import projectStatue from '../pages/Manager/task/projectStatue.vue'; |
40 | 42 |
import projectDetail from '../pages/Manager/task/projectDetail.vue'; |
... | ... | @@ -43,6 +45,7 @@ |
43 | 45 |
import projectInsert from '../pages/Manager/task/projectInsert.vue'; |
44 | 46 |
import projectTuib from '../pages/Manager/task/projectTuib.vue'; |
45 | 47 |
import projectTuibDetail from '../pages/Manager/task/projectTuibDetail.vue'; |
48 |
+//재무관리 |
|
46 | 49 |
import financial from '../pages/Manager/financial/financial.vue'; |
47 | 50 |
import salaryList from '../pages/Manager/financial/salaryList.vue'; |
48 | 51 |
import employeeSalaryList from '../pages/Manager/financial/employeeSalaryList.vue'; |
... | ... | @@ -50,17 +53,20 @@ |
50 | 53 |
import employeeSalaryInsert from '../pages/Manager/financial/employeeSalaryInsert.vue'; |
51 | 54 |
import ChuljangCostList from '../pages/Manager/financial/ChuljangCostList.vue'; |
52 | 55 |
import MeetingCostList from '../pages/Manager/financial/MeetingCostList.vue'; |
56 |
+//자산관리 |
|
53 | 57 |
import asset from '../pages/Manager/asset/asset.vue'; |
54 | 58 |
import CarList from '../pages/Manager/asset/CarList.vue'; |
55 | 59 |
import CardList from '../pages/Manager/asset/CardList.vue'; |
56 | 60 |
import CarInfoManagement from '../pages/Manager/asset/CarInfoManagement.vue'; |
57 | 61 |
import CardInfoManagement from '../pages/Manager/asset/CardInfoManagement.vue'; |
62 |
+//인사관리 |
|
58 | 63 |
import hr from '../pages/Manager/hr/hr.vue'; |
59 | 64 |
import hrSearch from '../pages/Manager/hr/hrSearch.vue'; |
60 | 65 |
import hrManagement from '../pages/Manager/hr/hrManagement.vue'; |
61 | 66 |
import hrDetail from '../pages/Manager/hr/hrDetail.vue'; |
62 | 67 |
import hrInsert from '../pages/Manager/hr/hrInsert.vue'; |
63 | 68 |
import buseoManagement from '../pages/Manager/hr/buseoManagement.vue'; |
69 |
+//시스템관리 |
|
64 | 70 |
import system from '../pages/Manager/system/system.vue'; |
65 | 71 |
import userManagement from '../pages/Manager/system/userManagement.vue'; |
66 | 72 |
import accessControlManagement from '../pages/Manager/system/accessControlManagement.vue'; |
... | ... | @@ -80,10 +86,10 @@ |
80 | 86 |
|
81 | 87 |
{ path: '/HyugaOk.page', name: 'HyugaOk', component: HyugaOk }, |
82 | 88 |
|
83 |
- { path: '/approval-management.page', name: 'approval', component: approval, |
|
89 |
+ { path: '/approval-management.page', name: 'approval', component: approval, redirect: '/approval-management.page/approvalRequest.page', |
|
84 | 90 |
children: [ |
85 | 91 |
{ |
86 |
- path: '/approvalRequest.page', // => /approval-management.page/list |
|
92 |
+ path: 'approvalRequest.page', // => /approval-management.page/list |
|
87 | 93 |
name: 'approvalRequest', |
88 | 94 |
component: approvalRequest, |
89 | 95 |
children: [ |
... | ... | @@ -91,80 +97,83 @@ |
91 | 97 |
] |
92 | 98 |
}, |
93 | 99 |
{ |
94 |
- path: '/approvalList.page', // => /approval-management.page/detail/123 |
|
100 |
+ path: 'approvalList.page', // => /approval-management.page/detail/123 |
|
95 | 101 |
name: 'approvalList', |
96 |
- component: approvalList |
|
102 |
+ component: approvalList, |
|
103 |
+ children: [ |
|
104 |
+ ] |
|
97 | 105 |
}, |
98 |
- { path: '/ChuljangPumui.page', name: 'ChuljangPumui', component: ChuljangPumui }, |
|
99 |
- { path: '/ChuljangBokmyeong.page', name: 'ChuljangBokmyeong', component: ChuljangBokmyeong }, |
|
106 |
+ { path: 'ChuljangPumui.page', name: 'ChuljangPumui', component: ChuljangPumui }, |
|
107 |
+ { path: 'ChuljangBokmyeong.page', name: 'ChuljangBokmyeong', component: ChuljangBokmyeong }, |
|
108 |
+ { path: 'Hyuga.page', name: 'Hyuga', component: Hyuga }, |
|
109 |
+ |
|
100 | 110 |
|
101 | 111 |
|
102 | 112 |
] |
103 | 113 |
}, //결재관리 |
104 |
- { path: '/attendance-management.page', name: 'attendance', component: attendance, |
|
114 |
+ { path: '/attendance-management.page', name: 'attendance', component: attendance, redirect: '/attendance-management.page/myAttendance.page', |
|
105 | 115 |
children: [ |
106 |
- { path: '/myAttendance.page', name: 'myAttendance', component: myAttendance }, |
|
107 |
- { path: '/buseoAttendance.page', name: 'buseoAttendance', component: buseoAttendance }, |
|
108 |
- { path: '/AttendanceDetail.page', name: 'AttendanceDetail', component: AttendanceDetail }, |
|
109 |
- { path: '/hyugaStatue.page', name: 'hyugaStatue', component: hyugaStatue }, |
|
110 |
- { path: '/HyugaDetail.page', name: 'HyugaDetail', component: HyugaDetail }, |
|
111 |
- { path: '/HyugaInsert.page', name: 'HyugaInsert', component: HyugaInsert }, |
|
112 |
- { path: '/ChuljangStatue.page', name: 'ChuljangStatue', component: ChuljangStatue }, |
|
113 |
- { path: '/BokmyeongInsert.page', name: 'BokmyeongInsert', component: BokmyeongInsert }, |
|
114 |
- { path: '/ChuljangInsert.page', name: 'ChuljangInsert', component: ChuljangInsert }, |
|
115 |
- { path: '/ChuljangPumuiDetail.page', name: 'ChuljangPumuiDetail', component: ChuljangPumuiDetail }, |
|
116 |
- { path: '/ChuljangBokmyeongDetail.page', name: 'ChuljangBokmyeongDetail', component: ChuljangBokmyeongDetail }, |
|
117 |
- { path: '/ChuljangDetailAll.page', name: 'ChuljangDetailAll', component: ChuljangDetailAll }, |
|
116 |
+ { path: 'myAttendance.page', name: 'myAttendance', component: myAttendance }, |
|
117 |
+ { path: 'buseoAttendance.page', name: 'buseoAttendance', component: buseoAttendance }, |
|
118 |
+ { path: 'AttendanceDetail.page', name: 'AttendanceDetail', component: AttendanceDetail }, |
|
119 |
+ { path: 'hyugaStatue.page', name: 'hyugaStatue', component: hyugaStatue }, |
|
120 |
+ { path: 'HyugaDetail.page', name: 'HyugaDetail', component: HyugaDetail }, |
|
121 |
+ { path: 'hyugaInsert.page', name: 'hyugaInsert', component: HyugaInsert }, |
|
122 |
+ { path: 'ChuljangStatue.page', name: 'ChuljangStatue', component: ChuljangStatue }, |
|
123 |
+ { path: 'BokmyeongInsert.page', name: 'BokmyeongInsert', component: BokmyeongInsert }, |
|
124 |
+ { path: 'ChuljangInsert.page', name: 'ChuljangInsert', component: ChuljangInsert }, |
|
125 |
+ { path: 'ChuljangPumuiDetail.page', name: 'ChuljangPumuiDetail', component: ChuljangPumuiDetail }, |
|
126 |
+ { path: 'ChuljangBokmyeongDetail.page', name: 'ChuljangBokmyeongDetail', component: ChuljangBokmyeongDetail }, |
|
127 |
+ { path: 'ChuljangDetailAll.page', name: 'ChuljangDetailAll', component: ChuljangDetailAll }, |
|
118 | 128 |
|
119 | 129 |
] |
120 | 130 |
}, //근태관리 |
121 |
- { path: '/task-management.page', name: 'task', component: task, |
|
131 |
+ { path: '/task-management.page', name: 'task', component: task, redirect: '/task-management.page/projectStatue.page', |
|
122 | 132 |
children: [ |
123 |
- { path: '/projectStatue.page', name: 'projectStatue', component: projectStatue }, |
|
124 |
- { path: '/projectDetail.page', name: 'projectDetail', component: projectDetail }, |
|
125 |
- { path: '/meetingInsert.page', name: 'meetingInsert', component: meetingInsert }, |
|
126 |
- { path: '/meetingDetail.page', name: 'meetingDetail', component: meetingDetail }, |
|
127 |
- { path: '/projectInsert.page', name: 'projectInsert', component: projectInsert }, |
|
128 |
- { path: '/projectTuib.page', name: 'projectTuib', component: projectTuib }, |
|
129 |
- { path: '/projectTuibDetail.page', name: 'projectTuibDetail', component: projectTuibDetail }, |
|
133 |
+ { path: 'projectStatue.page', name: 'projectStatue', component: projectStatue }, |
|
134 |
+ { path: 'projectDetail.page', name: 'projectDetail', component: projectDetail }, |
|
135 |
+ { path: 'meetingInsert.page', name: 'meetingInsert', component: meetingInsert }, |
|
136 |
+ { path: 'meetingDetail.page', name: 'meetingDetail', component: meetingDetail }, |
|
137 |
+ { path: 'projectInsert.page', name: 'projectInsert', component: projectInsert }, |
|
138 |
+ { path: 'projectTuib.page', name: 'projectTuib', component: projectTuib }, |
|
139 |
+ { path: 'projectTuibDetail.page', name: 'projectTuibDetail', component: projectTuibDetail }, |
|
130 | 140 |
] |
131 | 141 |
}, //업무관리 |
132 |
- { path: '/financial-management.page', name: 'financial', component: financial, |
|
142 |
+ { path: '/financial-management.page', name: 'financial', component: financial, redirect: '/financial-management.page/salaryList.page', |
|
133 | 143 |
children: [ |
134 |
- { path: '/salaryList.page', name: 'salaryList', component: salaryList }, |
|
135 |
- { path: '/employeeSalaryList.page', name: 'employeeSalaryList', component: employeeSalaryList }, |
|
136 |
- { path: '/employeeSalaryDetail.page', name: 'employeeSalaryDetail', component: employeeSalaryDetail }, |
|
137 |
- { path: '/employeeSalaryInsert.page', name: 'employeeSalaryInsert', component: employeeSalaryInsert }, |
|
138 |
- { path: '/ChuljangCostList.page', name: 'ChuljangCostList', component: ChuljangCostList }, |
|
139 |
- { path: '/MeetingCostList.page', name: 'MeetingCostList', component: MeetingCostList }, |
|
144 |
+ { path: 'salaryList.page', name: 'salaryList', component: salaryList }, |
|
145 |
+ { path: 'employeeSalaryList.page', name: 'employeeSalaryList', component: employeeSalaryList }, |
|
146 |
+ { path: 'employeeSalaryDetail.page', name: 'employeeSalaryDetail', component: employeeSalaryDetail }, |
|
147 |
+ { path: 'employeeSalaryInsert.page', name: 'employeeSalaryInsert', component: employeeSalaryInsert }, |
|
148 |
+ { path: 'ChuljangCostList.page', name: 'ChuljangCostList', component: ChuljangCostList }, |
|
149 |
+ { path: 'MeetingCostList.page', name: 'MeetingCostList', component: MeetingCostList }, |
|
140 | 150 |
] |
141 | 151 |
}, //재무관리 |
142 |
- { path: '/asset-management.page', name: 'asset', component: asset, |
|
152 |
+ { path: '/asset-management.page', name: 'asset', component: asset, redirect: '/asset-management.page/CarList.page', |
|
143 | 153 |
children: [ |
144 |
- { path: '/CarList.page', name: 'CarList', component: CarList }, |
|
145 |
- { path: '/CarInfoManagement.page', name: 'CarInfoManagement', component: CarInfoManagement }, |
|
146 |
- { path: '/CardList.page', name: 'CardList', component: CardList }, |
|
147 |
- { path: '/CardInfoManagement.page', name: 'CardInfoManagement', component: CardInfoManagement }, |
|
154 |
+ { path: 'CarList.page', name: 'CarList', component: CarList }, |
|
155 |
+ { path: 'CarInfoManagement.page', name: 'CarInfoManagement', component: CarInfoManagement }, |
|
156 |
+ { path: 'CardList.page', name: 'CardList', component: CardList }, |
|
157 |
+ { path: 'CardInfoManagement.page', name: 'CardInfoManagement', component: CardInfoManagement }, |
|
148 | 158 |
|
149 | 159 |
] |
150 | 160 |
}, //자산관리 |
151 |
- { path: '/hr-management.page', name: 'hr', component: hr, |
|
161 |
+ { path: '/hr-management.page', name: 'hr', component: hr, redirect: '/hr-management.page/hrSearch.page', |
|
152 | 162 |
children: [ |
153 |
- { path: '/hrSearch.page', name: 'hrSearch', component: hrSearch }, |
|
154 |
- { path: '/hrManagement.page', name: 'hrManagement', component: hrManagement }, |
|
155 |
- { path: '/hrDetail.page', name: 'hrDetail', component: hrDetail }, |
|
156 |
- { path: '/hrInsert.page', name: 'hrInsert', component: hrInsert }, |
|
157 |
- |
|
158 |
- { path: '/buseoManagement.page', name: 'buseoManagement', component: buseoManagement }, |
|
163 |
+ { path: 'hrSearch.page', name: 'hrSearch', component: hrSearch }, |
|
164 |
+ { path: 'hrManagement.page', name: 'hrManagement', component: hrManagement }, |
|
165 |
+ { path: 'hrDetail.page', name: 'hrDetail', component: hrDetail }, |
|
166 |
+ { path: 'hrInsert.page', name: 'hrInsert', component: hrInsert }, |
|
167 |
+ { path: 'buseoManagement.page', name: 'buseoManagement', component: buseoManagement }, |
|
159 | 168 |
] |
160 | 169 |
}, //인사관리 |
161 |
- { path: '/system-management.page', name: 'system', component: system, |
|
170 |
+ { path: '/system-management.page', name: 'system', component: system, redirect: { name: 'userManagement' }, |
|
162 | 171 |
children:[ |
163 |
- { path: '/userManagement.page', name: 'userManagement', component: userManagement }, |
|
164 |
- { path: '/accessControlManagement.page', name: 'accessControlManagement', component: accessControlManagement }, |
|
165 |
- { path: '/commonCodeManagement.page', name: 'commonCodeManagement', component: commonCodeManagement }, |
|
166 |
- { path: '/commonCodeInsert.page', name: 'commonCodeInsert', component: commonCodeInsert }, |
|
167 |
- { path: '/commonCodeDetail.page', name: 'commonCodeDetail', component: commonCodeDetail }, |
|
172 |
+ { path: 'userManagement.page', name: 'userManagement', component: userManagement }, |
|
173 |
+ { path: 'accessControlManagement.page', name: 'accessControlManagement', component: accessControlManagement }, |
|
174 |
+ { path: 'commonCodeManagement.page', name: 'commonCodeManagement', component: commonCodeManagement }, |
|
175 |
+ { path: 'commonCodeInsert.page', name: 'commonCodeInsert', component: commonCodeInsert }, |
|
176 |
+ { path: 'commonCodeDetail.page', name: 'commonCodeDetail', component: commonCodeDetail }, |
|
168 | 177 |
|
169 | 178 |
] |
170 | 179 |
}, //시스템관리 |
--- client/views/pages/Manager/approval/HyugaDetail.vue
+++ client/views/pages/Manager/approval/Hyuga.vue
... | ... | @@ -67,9 +67,6 @@ |
67 | 67 |
<div class="buttons"> |
68 | 68 |
<button class="btn primary" type="button">승인</button> |
69 | 69 |
<button class="btn btn-red" type="button" @click="showPopup = true">반려</button> |
70 |
- <button class="btn btn-red" type="button">신청취소</button> |
|
71 |
- <button class="btn secondary" type="button">재신청</button> |
|
72 |
- <button class="btn secondary" type="button">수정</button> |
|
73 | 70 |
<button class="btn tertiary " type="button">목록</button> |
74 | 71 |
</div> |
75 | 72 |
<ReturnPopup v-if="showPopup" @close="showPopup = false"/> |
--- client/views/pages/Manager/approval/approval.vue
+++ client/views/pages/Manager/approval/approval.vue
... | ... | @@ -15,17 +15,17 @@ |
15 | 15 |
</div> |
16 | 16 |
|
17 | 17 |
|
18 |
- <details class="menu-box"> |
|
18 |
+ <details class="menu-box" open> |
|
19 | 19 |
<summary><p>결재</p><div class="icon"><img :src="topmenuicon" alt=""></div></summary> |
20 | 20 |
<ul> |
21 |
- <li> <router-link to="/approvalRequest.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
21 |
+ <li> <router-link :to="{ name: 'approvalRequest' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
22 | 22 |
<p>결재 요청</p> |
23 | 23 |
<div class="icon" v-if="isExactActive"> |
24 | 24 |
<img :src="menuicon" alt=""> |
25 | 25 |
</div> |
26 | 26 |
</router-link></li> |
27 | 27 |
<li> |
28 |
- <router-link to="/approvalList.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
28 |
+ <router-link :to="{ name: 'approvalList' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
29 | 29 |
<p>승인 대기 목록</p> |
30 | 30 |
<div class="icon" v-if="isExactActive"> |
31 | 31 |
<img :src="menuicon" alt=""> |
--- client/views/pages/Manager/approval/approvalList.vue
+++ client/views/pages/Manager/approval/approvalList.vue
... | ... | @@ -236,11 +236,11 @@ |
236 | 236 |
goToPage(item) { |
237 | 237 |
const type = item.type; |
238 | 238 |
if (type === '연차' || type === '반차') { |
239 |
- this.$router.push('/hyugaDetail.page'); |
|
239 |
+ this.$router.push({name: 'Hyuga'}); |
|
240 | 240 |
} else if (type === '출장-품의') { |
241 |
- this.$router.push('/ChuljangPumui.page'); |
|
241 |
+ this.$router.push({name: 'ChuljangPumui'}); |
|
242 | 242 |
} else if (type === '출장-복명') { |
243 |
- this.$router.push('/ChuljangBokmyeong.page'); |
|
243 |
+ this.$router.push({name: 'ChuljangBokmyeong'}); |
|
244 | 244 |
} else { |
245 | 245 |
alert('이동할 수 없는 항목입니다.'); |
246 | 246 |
} |
--- client/views/pages/Manager/approval/approvalRequest.vue
+++ client/views/pages/Manager/approval/approvalRequest.vue
... | ... | @@ -184,9 +184,9 @@ |
184 | 184 |
}, |
185 | 185 |
goToPage(type) { |
186 | 186 |
if (type === '휴가') { |
187 |
- this.$router.push('/HyugaInsert.page'); |
|
187 |
+ this.$router.push({ name: 'HyugaInsert' }); |
|
188 | 188 |
} else if (type === '출장') { |
189 |
- this.$router.push('/ChuljangDetail.page'); |
|
189 |
+ this.$router.push({ name: 'HyugaChuljangDetailDetail' }); |
|
190 | 190 |
} |
191 | 191 |
}, |
192 | 192 |
getStatusClass(status) { |
--- client/views/pages/Manager/asset/asset.vue
+++ client/views/pages/Manager/asset/asset.vue
... | ... | @@ -15,17 +15,17 @@ |
15 | 15 |
</div> |
16 | 16 |
|
17 | 17 |
|
18 |
- <details class="menu-box"> |
|
18 |
+ <details class="menu-box" open> |
|
19 | 19 |
<summary><p>법인차량</p><div class="icon"><img :src="topmenuicon" alt=""></div></summary> |
20 | 20 |
<ul> |
21 |
- <li> <router-link to="/CarList.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
21 |
+ <li> <router-link :to="{ name: 'CarList' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
22 | 22 |
<p>사용현황</p> |
23 | 23 |
<div class="icon" v-if="isExactActive"> |
24 | 24 |
<img :src="menuicon" alt=""> |
25 | 25 |
</div> |
26 | 26 |
</router-link></li> |
27 | 27 |
<li> |
28 |
- <router-link to="/CarInfoManagement.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
28 |
+ <router-link :to="{ name: 'CarInfoManagement' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
29 | 29 |
<p>차량정보 관리</p> |
30 | 30 |
<div class="icon" v-if="isExactActive"> |
31 | 31 |
<img :src="menuicon" alt=""> |
... | ... | @@ -39,13 +39,13 @@ |
39 | 39 |
<details class="menu-box"> |
40 | 40 |
<summary><p>법인카드</p><div class="icon"><img :src="topmenuicon" alt=""></div></summary> |
41 | 41 |
<ul> |
42 |
- <li> <router-link to="/CardList.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
42 |
+ <li> <router-link :to="{ name: 'CardList' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
43 | 43 |
<p>사용현황</p> |
44 | 44 |
<div class="icon" v-if="isExactActive"> |
45 | 45 |
<img :src="menuicon" alt=""> |
46 | 46 |
</div> |
47 | 47 |
</router-link></li> |
48 |
- <li> <router-link to="/CardInfoManagement.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
48 |
+ <li> <router-link :to="{ name: 'CardInfoManagement' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
49 | 49 |
<p>카드정보 관리</p> |
50 | 50 |
<div class="icon" v-if="isExactActive"> |
51 | 51 |
<img :src="menuicon" alt=""> |
--- client/views/pages/Manager/attendance/ChuljangPumuiDetail.vue
+++ client/views/pages/Manager/attendance/ChuljangPumuiDetail.vue
... | ... | @@ -139,7 +139,7 @@ |
139 | 139 |
}, |
140 | 140 |
methods: { |
141 | 141 |
goToBokmyeongInsert() { |
142 |
- this.$router.push('/BokmyeongInsert.page'); |
|
142 |
+ this.$router.push({ name: 'BokmyeongInsert' }); |
|
143 | 143 |
}, |
144 | 144 |
hasAnyApprover() { |
145 | 145 |
return this.approvers.some( |
--- client/views/pages/Manager/attendance/ChuljangStatue.vue
+++ client/views/pages/Manager/attendance/ChuljangStatue.vue
... | ... | @@ -221,15 +221,15 @@ |
221 | 221 |
); |
222 | 222 |
|
223 | 223 |
if (item.bokmyeong === '등록') { |
224 |
- this.$router.push('/ChuljangDetailAll.page'); |
|
224 |
+ this.$router.push({ name: 'ChuljangDetailAll' }); |
|
225 | 225 |
} else if (isCasePumui) { |
226 |
- this.$router.push('/ChuljangPumuiDetail.page'); |
|
226 |
+ this.$router.push({ name: 'ChuljangPumuiDetail' }); |
|
227 | 227 |
} else { |
228 | 228 |
console.log('이동 조건이 아닙니다.'); |
229 | 229 |
} |
230 | 230 |
}, |
231 | 231 |
handleBokmyeongClick(item) { |
232 |
- this.$router.push('/ChuljangBokmyeongDetail.page'); |
|
232 |
+ this.$router.push({ name: 'ChuljangBokmyeongDetail' }); |
|
233 | 233 |
}, |
234 | 234 |
}, |
235 | 235 |
created() { |
--- client/views/pages/Manager/approval/HyugaDetail.vue
+++ client/views/pages/Manager/attendance/HyugaDetail.vue
... | ... | @@ -0,0 +1,153 @@ |
1 | +<template> | |
2 | +<div class="card "> | |
3 | + <div class="card-body"> | |
4 | + <h2 class="card-title">휴가 현황</h2> | |
5 | + | |
6 | + <div class="form-card"> | |
7 | + <h1>휴가신청서</h1> | |
8 | + <div class="approval-box tbl-wrap tbl2"> | |
9 | + <table class="tbl data"> | |
10 | + <tbody> | |
11 | + <tr class="thead"> | |
12 | + <td rowspan="2" class="th">승인자</td> | |
13 | + <td>과장</td> | |
14 | + <td>소장</td> | |
15 | + </tr> | |
16 | + <tr> | |
17 | + <td><p class="name">홍길동</p><p class="date">2025/05/09</p></td> | |
18 | + <td><p class="name">홍길동</p><p class="date">2025/05/09</p></td> | |
19 | + </tr> | |
20 | + </tbody> | |
21 | + | |
22 | + </table> | |
23 | + </div> | |
24 | + <form class="row g-3 needs-validation detail" :class="{ 'was-validated': formSubmitted }" @submit.prevent="handleRegister" novalidate> | |
25 | + <div class="col-12 "> | |
26 | + <div class="col-12 border-x"> | |
27 | + <label for="youremail" class="form-label ">유형<p class="require"><img :src="require" alt=""></p></label> | |
28 | + <input v-model="email" type="text" name="username" class="form-control" readonly > | |
29 | + </div> | |
30 | + | |
31 | + <div class="col-12 border-x"> | |
32 | + <label for="yourPassword" class="form-label">신청자</label> | |
33 | + <input v-model="password" type="password" name="password" class="form-control" readonly placeholder="주식회사 테이큰 소프트"> | |
34 | + </div> | |
35 | + </div> | |
36 | + <div class="col-12"> | |
37 | + <div class="col-12 border-x"> | |
38 | + <label for="youremail" class="form-label">부서</label> | |
39 | + <input v-model="email" type="text" name="username" class="form-control" readonly placeholder="과장"> | |
40 | + </div> | |
41 | + | |
42 | + <div class="col-12 border-x"> | |
43 | + <label for="yourPassword" class="form-label">직급</label> | |
44 | + <input v-model="password" type="password" name="password" class="form-control" readonly placeholder="팀장"> | |
45 | + </div> | |
46 | + </div> | |
47 | + <div class="col-12"> | |
48 | + <label for="yourName" class="form-label">기간</label> | |
49 | + <input v-model="name" type="text" name="name" class="form-control" readonly> | |
50 | + </div> | |
51 | + <div class="col-12 hyuga"> | |
52 | + <label for="yourName" class="form-label">세부사항</label> | |
53 | + <input v-model="name" type="text" name="name" class="form-control textarea" readonly> | |
54 | + </div> | |
55 | + <div class="col-12 "> | |
56 | + <label for="yourName" class="form-label">신청일</label> | |
57 | + <input v-model="name" type="text" name="name" class="form-control " readonly> | |
58 | + </div> | |
59 | + <div class="col-12 border-x return" > | |
60 | + <label for="yourName" class="form-label ">반려사유</label> | |
61 | + <input v-model="name" type="text" name="name" class="form-control" readonly > | |
62 | + </div> | |
63 | + | |
64 | + | |
65 | + </form> | |
66 | + </div> | |
67 | + <div class="buttons"> | |
68 | + <button class="btn btn-red" type="button">신청취소</button> | |
69 | + <button class="btn secondary" type="button">재신청</button> | |
70 | + <button class="btn secondary" type="button">수정</button> | |
71 | + <button class="btn tertiary " type="button">목록</button> | |
72 | + </div> | |
73 | + <ReturnPopup v-if="showPopup" @close="showPopup = false"/> | |
74 | + </div> | |
75 | + </div> | |
76 | +</template> | |
77 | + | |
78 | +<script> | |
79 | +import ReturnPopup from '../../../component/Popup/ReturnPopup.vue'; | |
80 | +export default { | |
81 | + data() { | |
82 | + const today = new Date().toISOString().split('T')[0]; | |
83 | + return { | |
84 | + showPopup: false, | |
85 | + startDate: today, | |
86 | + startTime: "09:00", // 기본 시작 시간 09:00 | |
87 | + endDate: today, | |
88 | + endTime: "18:00", // 기본 종료 시간 18:00 | |
89 | + category: "", | |
90 | + dayCount: 1, | |
91 | + reason: "", // 사유 | |
92 | + listData: [ | |
93 | + { | |
94 | + type: '연차', | |
95 | + approvalType: '결재', | |
96 | + applicant: '홍길동', | |
97 | + period: '2025-05-10 ~ 2025-15-03', | |
98 | + requestDate: '2025-04-25', | |
99 | + status: '대기' | |
100 | + }, { | |
101 | + type: '반차', | |
102 | + approvalType: '전결', | |
103 | + applicant: '홍길동', | |
104 | + period: '2025-05-01 ~ 2025-05-03', | |
105 | + requestDate: '2025-04-25', | |
106 | + status: '승인' | |
107 | + }], | |
108 | + }; | |
109 | + }, | |
110 | + components: { | |
111 | + ReturnPopup | |
112 | + }, | |
113 | + computed: { | |
114 | + | |
115 | + }, | |
116 | + methods: { | |
117 | + | |
118 | + calculateDayCount() { | |
119 | + const start = new Date(`${this.startDate}T${this.startTime}:00`); | |
120 | + const end = new Date(`${this.endDate}T${this.endTime}:00`); | |
121 | + | |
122 | + let totalHours = (end - start) / (1000 * 60 * 60); // 밀리초를 시간 단위로 변환 | |
123 | + | |
124 | + if (this.startDate !== this.endDate) { | |
125 | + // 시작일과 종료일이 다른경우 | |
126 | + const startDateObj = new Date(this.startDate); | |
127 | + const endDateObj = new Date(this.endDate); | |
128 | + const daysDifference = (endDateObj - startDateObj) / (1000 * 60 * 60 * 24); // 두 날짜 사이의 차이를 일수로 계산 | |
129 | + if (this.startTime !== "09:00" || this.endTime !== "18:00") { | |
130 | + this.dayCount = daysDifference + 0.5; // 시간 조건이 기준에서 벗어날 경우 | |
131 | + } else { | |
132 | + this.dayCount = Math.ceil(daysDifference + 1); // 시간 조건이 기준에 맞을 경우 | |
133 | + } | |
134 | + } else { | |
135 | + // 시작일과 종료일이 같은 경우 | |
136 | + if (this.startTime !== "09:00" || this.endTime !== "18:00") { | |
137 | + this.dayCount = 0.5; // 시작 시간 또는 종료 시간이 기준과 다를 경우 0.5 | |
138 | + } else { | |
139 | + this.dayCount = 1; // 기준 시간(09:00~18:00)이 맞으면 1일로 간주 | |
140 | + } | |
141 | + } | |
142 | + | |
143 | + this.validateForm(); // dayCount 변경 후 폼 재검증 | |
144 | + }, | |
145 | + | |
146 | + | |
147 | + | |
148 | + }, | |
149 | + mounted() { | |
150 | + }, | |
151 | + | |
152 | +}; | |
153 | +</script> |
--- client/views/pages/Manager/approval/HyugaInsert.vue
+++ client/views/pages/Manager/attendance/HyugaInsert.vue
No changes |
--- client/views/pages/Manager/attendance/attendance.vue
+++ client/views/pages/Manager/attendance/attendance.vue
... | ... | @@ -13,17 +13,17 @@ |
13 | 13 |
</div> |
14 | 14 |
</div> |
15 | 15 |
</div> |
16 |
- <details class="menu-box"> |
|
16 |
+ <details class="menu-box" open> |
|
17 | 17 |
<summary><p>근태현황</p><div class="icon"><img :src="topmenuicon" alt=""></div></summary> |
18 | 18 |
<ul> |
19 |
- <li> <router-link to="/myAttendance.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
19 |
+ <li> <router-link :to="{ name: 'myAttendance' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
20 | 20 |
<p>나의 근태현황</p> |
21 | 21 |
<div class="icon" v-if="isExactActive"> |
22 | 22 |
<img :src="menuicon" alt=""> |
23 | 23 |
</div> |
24 | 24 |
</router-link></li> |
25 | 25 |
<li> |
26 |
- <router-link to="/buseoAttendance.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
26 |
+ <router-link :to="{ name: 'buseoAttendance' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
27 | 27 |
<p>부서별 근태현황</p> |
28 | 28 |
<div class="icon" v-if="isExactActive"> |
29 | 29 |
<img :src="menuicon" alt=""> |
... | ... | @@ -35,33 +35,32 @@ |
35 | 35 |
<details class="menu-box"> |
36 | 36 |
<summary><p>휴가</p><div class="icon"><img :src="topmenuicon" alt=""></div></summary> |
37 | 37 |
<ul> |
38 |
- <li> <router-link to="/hyugaStatue.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
38 |
+ <li> <router-link :to="{ name: 'hyugaStatue' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
39 | 39 |
<p>휴가 현황</p> |
40 | 40 |
<div class="icon" v-if="isExactActive"> |
41 | 41 |
<img :src="menuicon" alt=""> |
42 | 42 |
</div> |
43 | 43 |
</router-link></li> |
44 |
- <li> |
|
45 |
- <router-link to="/hyugaInsert.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
44 |
+ <li> <router-link :to="{ name: 'hyugaInsert' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
46 | 45 |
<p>휴가 신청</p> |
47 | 46 |
<div class="icon" v-if="isExactActive"> |
48 | 47 |
<img :src="menuicon" alt=""> |
49 | 48 |
</div> |
50 |
- </router-link> |
|
51 |
- </li> |
|
49 |
+ </router-link></li> |
|
50 |
+ |
|
52 | 51 |
</ul> |
53 | 52 |
</details> |
54 | 53 |
<details class="menu-box"> |
55 | 54 |
<summary><p>출장</p><div class="icon"><img :src="topmenuicon" alt=""></div></summary> |
56 | 55 |
<ul> |
57 |
- <li> <router-link to="/ChuljangStatue.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
56 |
+ <li> <router-link :to="{ name: 'ChuljangStatue' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
58 | 57 |
<p>출장 현황</p> |
59 | 58 |
<div class="icon" v-if="isExactActive"> |
60 | 59 |
<img :src="menuicon" alt=""> |
61 | 60 |
</div> |
62 | 61 |
</router-link></li> |
63 | 62 |
<li> |
64 |
- <router-link to="/ChuljangInsert.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
63 |
+ <router-link :to="{ name: 'ChuljangInsert' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
65 | 64 |
<p>출장 신청</p> |
66 | 65 |
<div class="icon" v-if="isExactActive"> |
67 | 66 |
<img :src="menuicon" alt=""> |
--- client/views/pages/Manager/attendance/buseoAttendance.vue
+++ client/views/pages/Manager/attendance/buseoAttendance.vue
... | ... | @@ -189,11 +189,11 @@ |
189 | 189 |
} |
190 | 190 |
}, |
191 | 191 |
goToPage(type) { |
192 |
- if (type === '휴가') { |
|
193 |
- this.$router.push('/HyugaDetail.page'); |
|
194 |
- } else if (type === '출장') { |
|
195 |
- this.$router.push('/ChuljangDetail.page'); |
|
196 |
- } |
|
192 |
+ if (type === '휴가') { |
|
193 |
+ this.$router.push({ name: 'HyugaDetail' }); |
|
194 |
+} else if (type === '출장') { |
|
195 |
+ this.$router.push({ name: 'ChuljangDetail' }); |
|
196 |
+} |
|
197 | 197 |
}, |
198 | 198 |
getStatusClass(status) { |
199 | 199 |
if (status === '승인') return 'status-approved'; |
--- client/views/pages/Manager/attendance/hyugaStatue.vue
+++ client/views/pages/Manager/attendance/hyugaStatue.vue
... | ... | @@ -180,9 +180,11 @@ |
180 | 180 |
} |
181 | 181 |
}, |
182 | 182 |
goToDetailPage(item) { |
183 |
- // item.id 또는 다른 식별자를 사용하여 URL을 구성할 수 있습니다. |
|
184 |
- this.$router.push({ path: `/HyugaDetail.page`, query: { id: item.id } }); |
|
185 |
- }, |
|
183 |
+ this.$router.push({ |
|
184 |
+ name: 'HyugaDetail', |
|
185 |
+ query: { id: item.id } |
|
186 |
+ }); |
|
187 |
+}, |
|
186 | 188 |
|
187 | 189 |
// 상태에 따른 클래스 반환 메소드 |
188 | 190 |
getStatusClass(status) { |
--- client/views/pages/Manager/financial/ChuljangCostList.vue
+++ client/views/pages/Manager/financial/ChuljangCostList.vue
... | ... | @@ -129,7 +129,10 @@ |
129 | 129 |
methods: { |
130 | 130 |
goToDetailPage(item) { |
131 | 131 |
// item.id 또는 다른 식별자를 사용하여 URL을 구성할 수 있습니다. |
132 |
- this.$router.push({ path: `/employeeSalaryDetail.page`, query: { id: item.id } }); |
|
132 |
+ this.$router.push({ |
|
133 |
+ name: 'employeeSalaryDetail', |
|
134 |
+ query: { id: item.id } |
|
135 |
+ }); |
|
133 | 136 |
}, |
134 | 137 |
formatCurrency(amount) { |
135 | 138 |
return new Intl.NumberFormat('ko-KR').format(amount) + ' 원'; |
... | ... | @@ -157,9 +160,9 @@ |
157 | 160 |
}, |
158 | 161 |
goToPage(type) { |
159 | 162 |
if (type === '휴가') { |
160 |
- this.$router.push('/HyugaInsert.page'); |
|
163 |
+ this.$router.push({ name: 'HyugaInsert' }); |
|
161 | 164 |
} else if (type === '출장') { |
162 |
- this.$router.push('/ChuljangDetail.page'); |
|
165 |
+ this.$router.push({ name: 'ChuljangDetail' }); |
|
163 | 166 |
} |
164 | 167 |
}, |
165 | 168 |
getStatusClass(status) { |
--- client/views/pages/Manager/financial/MeetingCostList.vue
+++ client/views/pages/Manager/financial/MeetingCostList.vue
... | ... | @@ -102,7 +102,7 @@ |
102 | 102 |
methods: { |
103 | 103 |
goToDetailPage(item) { |
104 | 104 |
// item.id 또는 다른 식별자를 사용하여 URL을 구성할 수 있습니다. |
105 |
- this.$router.push({ path: `/employeeSalaryDetail.page`, query: { id: item.id } }); |
|
105 |
+ this.$router.push({ name: 'employeeSalaryDetail', query: { id: item.id } }); |
|
106 | 106 |
}, |
107 | 107 |
formatCurrency(amount) { |
108 | 108 |
return new Intl.NumberFormat('ko-KR').format(amount) + ' 원'; |
... | ... | @@ -130,9 +130,9 @@ |
130 | 130 |
}, |
131 | 131 |
goToPage(type) { |
132 | 132 |
if (type === '휴가') { |
133 |
- this.$router.push('/HyugaInsert.page'); |
|
133 |
+ this.$router.push({ name: 'HyugaInsert' }); |
|
134 | 134 |
} else if (type === '출장') { |
135 |
- this.$router.push('/ChuljangDetail.page'); |
|
135 |
+ this.$router.push({ name: 'ChuljangDetail' }); |
|
136 | 136 |
} |
137 | 137 |
}, |
138 | 138 |
getStatusClass(status) { |
--- client/views/pages/Manager/financial/employeeSalaryList.vue
+++ client/views/pages/Manager/financial/employeeSalaryList.vue
... | ... | @@ -126,7 +126,7 @@ |
126 | 126 |
methods: { |
127 | 127 |
goToDetailPage(item) { |
128 | 128 |
// item.id 또는 다른 식별자를 사용하여 URL을 구성할 수 있습니다. |
129 |
- this.$router.push({ path: `/employeeSalaryDetail.page`, query: { id: item.id } }); |
|
129 |
+ this.$router.push({ name: 'employeeSalaryDetail', query: { id: item.id } }); |
|
130 | 130 |
}, |
131 | 131 |
formatCurrency(amount) { |
132 | 132 |
return new Intl.NumberFormat('ko-KR').format(amount) + ' 원'; |
... | ... | @@ -154,9 +154,9 @@ |
154 | 154 |
}, |
155 | 155 |
goToPage(type) { |
156 | 156 |
if (type === '휴가') { |
157 |
- this.$router.push('/HyugaInsert.page'); |
|
157 |
+ this.$router.push({ name: 'HyugaInsert' }); |
|
158 | 158 |
} else if (type === '출장') { |
159 |
- this.$router.push('/ChuljangDetail.page'); |
|
159 |
+ this.$router.push({ name: 'ChuljangDetail' }); |
|
160 | 160 |
} |
161 | 161 |
}, |
162 | 162 |
getStatusClass(status) { |
--- client/views/pages/Manager/financial/financial.vue
+++ client/views/pages/Manager/financial/financial.vue
... | ... | @@ -15,17 +15,17 @@ |
15 | 15 |
</div> |
16 | 16 |
|
17 | 17 |
|
18 |
- <details class="menu-box"> |
|
18 |
+ <details class="menu-box" open> |
|
19 | 19 |
<summary><p>급여관리</p><div class="icon"><img :src="topmenuicon" alt=""></div></summary> |
20 | 20 |
<ul> |
21 |
- <li> <router-link to="/salaryList.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
21 |
+ <li> <router-link :to="{ name: 'salaryList' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
22 | 22 |
<p>급여명세서</p> |
23 | 23 |
<div class="icon" v-if="isExactActive"> |
24 | 24 |
<img :src="menuicon" alt=""> |
25 | 25 |
</div> |
26 | 26 |
</router-link></li> |
27 | 27 |
<li> |
28 |
- <router-link to="/employeeSalaryList.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
28 |
+ <router-link :to="{ name: 'employeeSalaryList' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
29 | 29 |
<p>직원별 급여명세서</p> |
30 | 30 |
<div class="icon" v-if="isExactActive"> |
31 | 31 |
<img :src="menuicon" alt=""> |
... | ... | @@ -33,7 +33,7 @@ |
33 | 33 |
</router-link> |
34 | 34 |
</li> |
35 | 35 |
<li> |
36 |
- <router-link to="/employeeSalaryInsert.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
36 |
+ <router-link :to="{ name: 'employeeSalaryInsert' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
37 | 37 |
<p>급여명세서 등록</p> |
38 | 38 |
<div class="icon" v-if="isExactActive"> |
39 | 39 |
<img :src="menuicon" alt=""> |
... | ... | @@ -46,14 +46,14 @@ |
46 | 46 |
<details class="menu-box"> |
47 | 47 |
<summary><p>지출관리</p><div class="icon"><img :src="topmenuicon" alt=""></div></summary> |
48 | 48 |
<ul> |
49 |
- <li> <router-link to="/ChuljangCostList.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
49 |
+ <li> <router-link :to="{ name: 'ChuljangCostList' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
50 | 50 |
<p>출장비 현황</p> |
51 | 51 |
<div class="icon" v-if="isExactActive"> |
52 | 52 |
<img :src="menuicon" alt=""> |
53 | 53 |
</div> |
54 | 54 |
</router-link></li> |
55 | 55 |
<li> |
56 |
- <router-link to="/projectInsert.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
56 |
+ <router-link :to="{ name: '' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
57 | 57 |
<p>출장비 설정</p> |
58 | 58 |
<div class="icon" v-if="isExactActive"> |
59 | 59 |
<img :src="menuicon" alt=""> |
... | ... | @@ -61,7 +61,7 @@ |
61 | 61 |
</router-link> |
62 | 62 |
</li> |
63 | 63 |
<li> |
64 |
- <router-link to="/MeetingCostList.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
64 |
+ <router-link :to="{ name: 'MeetingCostList' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
65 | 65 |
<p>회의비 지출현황</p> |
66 | 66 |
<div class="icon" v-if="isExactActive"> |
67 | 67 |
<img :src="menuicon" alt=""> |
--- client/views/pages/Manager/financial/salaryList.vue
+++ client/views/pages/Manager/financial/salaryList.vue
... | ... | @@ -143,9 +143,9 @@ |
143 | 143 |
}, |
144 | 144 |
goToPage(type) { |
145 | 145 |
if (type === '명세서') { |
146 |
- this.$router.push('/HyugaInsert.page'); |
|
146 |
+ this.$router.push({ name: 'HyugaInsert' }); |
|
147 | 147 |
} else if (type === '출장') { |
148 |
- this.$router.push('/ChuljangDetail.page'); |
|
148 |
+ this.$router.push({ name: 'ChuljangDetail' }); |
|
149 | 149 |
} |
150 | 150 |
}, |
151 | 151 |
getStatusClass(status) { |
--- client/views/pages/Manager/hr/buseoManagement.vue
+++ client/views/pages/Manager/hr/buseoManagement.vue
... | ... | @@ -145,7 +145,7 @@ |
145 | 145 |
submenus: [ |
146 | 146 |
{ |
147 | 147 |
label: '직원검색', |
148 |
- link: '/hrSearch.page', |
|
148 |
+ link: { name: 'hrSearch' }, |
|
149 | 149 |
}, |
150 | 150 |
], |
151 | 151 |
}, |
... | ... | @@ -214,14 +214,14 @@ |
214 | 214 |
addSubMenu(menuIndex) { |
215 | 215 |
this.menus[menuIndex].submenus.push({ |
216 | 216 |
label: `신규메뉴${this.menus[menuIndex].submenus.length + 1}`, |
217 |
- link: '/new.page', |
|
217 |
+ link: { name: 'hrSearch' }, |
|
218 | 218 |
}); |
219 | 219 |
}, |
220 | 220 |
goToPage(type) { |
221 | 221 |
if (type === '회의록 등록') { |
222 |
- this.$router.push('/meetingInsert.page'); |
|
222 |
+ this.$router.push({ name: 'meetingInsert' }); |
|
223 | 223 |
} else if (type === '출장') { |
224 |
- this.$router.push('/ChuljangDetail.page'); |
|
224 |
+ this.$router.push({ name: 'ChuljangDetail' }); |
|
225 | 225 |
} |
226 | 226 |
}, |
227 | 227 |
handleFileUpload(event) { |
--- client/views/pages/Manager/hr/hr.vue
+++ client/views/pages/Manager/hr/hr.vue
... | ... | @@ -15,17 +15,17 @@ |
15 | 15 |
</div> |
16 | 16 |
|
17 | 17 |
|
18 |
- <details class="menu-box"> |
|
18 |
+ <details class="menu-box" open> |
|
19 | 19 |
<summary><p>직원</p><div class="icon"><img :src="topmenuicon" alt=""></div></summary> |
20 | 20 |
<ul> |
21 |
- <li> <router-link to="/hrSearch.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
21 |
+ <li> <router-link :to="{ name: 'hrSearch' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
22 | 22 |
<p>직원검색</p> |
23 | 23 |
<div class="icon" v-if="isExactActive"> |
24 | 24 |
<img :src="menuicon" alt=""> |
25 | 25 |
</div> |
26 | 26 |
</router-link></li> |
27 | 27 |
<li> |
28 |
- <router-link to="/hrManagement.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
28 |
+ <router-link :to="{ name: 'hrManagement' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
29 | 29 |
<p>직원관리</p> |
30 | 30 |
<div class="icon" v-if="isExactActive"> |
31 | 31 |
<img :src="menuicon" alt=""> |
... | ... | @@ -39,7 +39,7 @@ |
39 | 39 |
<details class="menu-box"> |
40 | 40 |
<summary><p>부서</p><div class="icon"><img :src="topmenuicon" alt=""></div></summary> |
41 | 41 |
<ul> |
42 |
- <li> <router-link to="/buseoManagement.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
42 |
+ <li> <router-link :to="{ name: 'buseoManagement' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
43 | 43 |
<p>부서관리</p> |
44 | 44 |
<div class="icon" v-if="isExactActive"> |
45 | 45 |
<img :src="menuicon" alt=""> |
--- client/views/pages/Manager/hr/hrManagement.vue
+++ client/views/pages/Manager/hr/hrManagement.vue
... | ... | @@ -121,7 +121,7 @@ |
121 | 121 |
}, |
122 | 122 |
goToDetailPage(item) { |
123 | 123 |
// item.id 또는 다른 식별자를 사용하여 URL을 구성할 수 있습니다. |
124 |
- this.$router.push({ path: `/hrDetail.page`, query: { id: item.id } }); |
|
124 |
+ this.$router.push({ name: 'hrDetail', query: { id: item.id } }); |
|
125 | 125 |
}, |
126 | 126 |
changePage(page) { |
127 | 127 |
if (page < 1 || page > this.totalPages) return; |
... | ... | @@ -141,7 +141,7 @@ |
141 | 141 |
}, |
142 | 142 |
goToPage(type) { |
143 | 143 |
if (type === '등록') { |
144 |
- this.$router.push('/hrInsert.page'); |
|
144 |
+ this.$router.push({ name: 'hrInsert' }); |
|
145 | 145 |
} |
146 | 146 |
}, |
147 | 147 |
getStatusClass(status) { |
--- client/views/pages/Manager/system/commonCodeManagement.vue
+++ client/views/pages/Manager/system/commonCodeManagement.vue
... | ... | @@ -144,7 +144,7 @@ |
144 | 144 |
methods: { |
145 | 145 |
goToDetailPage(item) { |
146 | 146 |
// item.id 또는 다른 식별자를 사용하여 URL을 구성할 수 있습니다. |
147 |
- this.$router.push({ path: `/commonCodeDetail.page`, query: { id: item.id } }); |
|
147 |
+ this.$router.push({ name: 'commonCodeDetail', query: { id: item.id } }); |
|
148 | 148 |
}, |
149 | 149 |
changePage(page) { |
150 | 150 |
if (page < 1 || page > this.totalPages) return; |
... | ... | @@ -164,7 +164,7 @@ |
164 | 164 |
}, |
165 | 165 |
goToPage(type) { |
166 | 166 |
if (type === '등록') { |
167 |
- this.$router.push('/commonCodeInsert.page'); |
|
167 |
+ this.$router.push({ name: 'commonCodeInsert' }); |
|
168 | 168 |
} |
169 | 169 |
}, |
170 | 170 |
getStatusClass(used) { |
--- client/views/pages/Manager/system/system.vue
+++ client/views/pages/Manager/system/system.vue
... | ... | @@ -16,17 +16,17 @@ |
16 | 16 |
|
17 | 17 |
|
18 | 18 |
<ul class="menu-box danil"> |
19 |
- <router-link to="/userManagement.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
19 |
+ <router-link :to="{ name: 'userManagement' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
20 | 20 |
<li><p>사용자권한관리</p> |
21 | 21 |
<div class="icon"><img :src="menuicon" alt=""></div></li> |
22 | 22 |
</router-link> |
23 |
- <router-link to="/accessControlManagement.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
23 |
+ <router-link :to="{ name: 'accessControlManagement' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
24 | 24 |
<li> |
25 | 25 |
<p>접근제어관리</p> |
26 | 26 |
<div class="icon"><img :src="menuicon" alt=""></div> |
27 | 27 |
</li> |
28 | 28 |
</router-link> |
29 |
- <router-link to="/commonCodeManagement.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
29 |
+ <router-link :to="{ name: 'commonCodeManagement' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
30 | 30 |
<li> |
31 | 31 |
<p>공통코드관리</p> |
32 | 32 |
<div class="icon"><img :src="menuicon" alt=""></div> |
--- client/views/pages/Manager/task/projectDetail.vue
+++ client/views/pages/Manager/task/projectDetail.vue
... | ... | @@ -192,9 +192,9 @@ |
192 | 192 |
methods: { |
193 | 193 |
goToPage(type) { |
194 | 194 |
if (type === '회의록 등록') { |
195 |
- this.$router.push('/meetingInsert.page'); |
|
195 |
+ this.$router.push({ name: 'meetingInsert' }); |
|
196 | 196 |
} else if (type === '회의록 상세') { |
197 |
- this.$router.push('/meetingDetail.page'); |
|
197 |
+ this.$router.push({ name: 'meetingDetail' }); |
|
198 | 198 |
} |
199 | 199 |
}, |
200 | 200 |
handleFileUpload(event) { |
--- client/views/pages/Manager/task/projectStatue.vue
+++ client/views/pages/Manager/task/projectStatue.vue
... | ... | @@ -211,7 +211,7 @@ |
211 | 211 |
}, |
212 | 212 |
goToDetailPage(item) { |
213 | 213 |
// item.id 또는 다른 식별자를 사용하여 URL을 구성할 수 있습니다. |
214 |
- this.$router.push({ path: `/projectDetail.page`, query: { id: item.id } }); |
|
214 |
+ this.$router.push({ name: 'projectDetail', query: { id: item.id } }); |
|
215 | 215 |
}, |
216 | 216 |
|
217 | 217 |
// 상태에 따른 클래스 반환 메소드 |
--- client/views/pages/Manager/task/projectTuib.vue
+++ client/views/pages/Manager/task/projectTuib.vue
... | ... | @@ -164,9 +164,9 @@ |
164 | 164 |
}, |
165 | 165 |
goToPage(type) { |
166 | 166 |
if (type === '휴가') { |
167 |
- this.$router.push('/HyugaDetail.page'); |
|
167 |
+ this.$router.push({ name: 'HyugaDetail' }); |
|
168 | 168 |
} else if (type === '출장') { |
169 |
- this.$router.push('/ChuljangDetail.page'); |
|
169 |
+ this.$router.push({ name: 'ChuljangDetail' }); |
|
170 | 170 |
} |
171 | 171 |
}, |
172 | 172 |
getStatusClass(status) { |
--- client/views/pages/Manager/task/task.vue
+++ client/views/pages/Manager/task/task.vue
... | ... | @@ -15,17 +15,17 @@ |
15 | 15 |
</div> |
16 | 16 |
|
17 | 17 |
|
18 |
- <details class="menu-box"> |
|
18 |
+ <details class="menu-box" open> |
|
19 | 19 |
<summary><p>프로젝트</p><div class="icon"><img :src="topmenuicon" alt=""></div></summary> |
20 | 20 |
<ul> |
21 |
- <li> <router-link to="/projectStatue.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
21 |
+ <li> <router-link :to="{ name: 'projectStatue' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
22 | 22 |
<p>프로젝트 현황</p> |
23 | 23 |
<div class="icon" v-if="isExactActive"> |
24 | 24 |
<img :src="menuicon" alt=""> |
25 | 25 |
</div> |
26 | 26 |
</router-link></li> |
27 | 27 |
<li> |
28 |
- <router-link to="/projectInsert.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
28 |
+ <router-link :to="{ name: 'projectInsert' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
29 | 29 |
<p>프로젝트 등록</p> |
30 | 30 |
<div class="icon" v-if="isExactActive"> |
31 | 31 |
<img :src="menuicon" alt=""> |
... | ... | @@ -33,7 +33,7 @@ |
33 | 33 |
</router-link> |
34 | 34 |
</li> |
35 | 35 |
<li> |
36 |
- <router-link to="/projectTuib.page" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
36 |
+ <router-link :to="{ name: 'projectTuib' }" exact-active-class="active-link" v-slot="{ isExactActive }"> |
|
37 | 37 |
<p>투입현황</p> |
38 | 38 |
<div class="icon" v-if="isExactActive"> |
39 | 39 |
<img :src="menuicon" alt=""> |
--- client/views/pages/User/MyPage.vue
+++ client/views/pages/User/MyPage.vue
... | ... | @@ -99,9 +99,8 @@ |
99 | 99 |
|
100 | 100 |
</form> |
101 | 101 |
<div class="buttons"> |
102 |
- <button class="btn primary" type="submit">반려</button> |
|
103 |
- <button class="btn btn-red " type="submit">반려</button> |
|
104 |
- <button class="btn tertiary " type="submit">목록</button> |
|
102 |
+ <button class="btn btn-red " type="submit">회원탈퇴</button> |
|
103 |
+ <button class="btn secondary " type="submit">수정</button> |
|
105 | 104 |
</div> |
106 | 105 |
</div> |
107 | 106 |
</div> |
--- client/views/pages/main/Main.vue
+++ client/views/pages/main/Main.vue
... | ... | @@ -43,7 +43,7 @@ |
43 | 43 |
<div class="bd-box"> |
44 | 44 |
<div>전체 <span>15</span></div> |
45 | 45 |
<i class="fa-bars"></i> |
46 |
- <div>사용 <span>3.5</span></div> |
|
46 |
+ <div>사용 <span style="color: #E92727;">3.5</span></div> |
|
47 | 47 |
</div> |
48 | 48 |
</div> |
49 | 49 |
<div class="boxs"> |
... | ... | @@ -84,7 +84,7 @@ |
84 | 84 |
</div> |
85 | 85 |
|
86 | 86 |
</div> |
87 |
- <div class="boxs"> |
|
87 |
+ <div class="boxs" style="width: 100%;"> |
|
88 | 88 |
<div class="title"> |
89 | 89 |
<h2>오늘의 주요 </h2> |
90 | 90 |
<div class="sub">더보기<img :src="moreicon" alt=""></div> |
... | ... | @@ -134,6 +134,8 @@ |
134 | 134 |
requestList: [ |
135 | 135 |
{ category: '용역', name: '프로젝트1', startdate: '2025-04-30', enddate: '2025-04-30', status: '진행중' }, |
136 | 136 |
{ category: '내부', name: '프로젝트2', startdate: '2025-05-01', enddate: '2025-04-30', status: '진행전' }, |
137 |
+ { category: '내부', name: '프로젝트2', startdate: '2025-05-01', enddate: '2025-04-30', status: '진행전' }, |
|
138 |
+ { category: '내부', name: '프로젝트2', startdate: '2025-05-01', enddate: '2025-04-30', status: '진행전' }, |
|
137 | 139 |
{ category: '국가과제', name: '프로젝트2', startdate: '2025-05-01', enddate: '2025-04-30', status: '완료' } |
138 | 140 |
] |
139 | 141 |
} |
... | ... | @@ -179,4 +181,9 @@ |
179 | 181 |
}, 1000); |
180 | 182 |
} |
181 | 183 |
} |
182 |
-</script>(파일 끝에 줄바꿈 문자 없음) |
|
184 |
+</script> |
|
185 |
+<style scoped> |
|
186 |
+td{padding: 7px 10px !important; height: auto !important;} |
|
187 |
+td p{display: flex; justify-self: center; justify-content: center; text-align: center !important;} |
|
188 |
+ tr:last-child td{border-bottom: 0 !important;} |
|
189 |
+</style>(파일 끝에 줄바꿈 문자 없음) |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?