diff --git a/src/components/app/AppBox.vue b/src/components/app/AppBox.vue index df423954..e9249bf0 100644 --- a/src/components/app/AppBox.vue +++ b/src/components/app/AppBox.vue @@ -1,9 +1,16 @@ @@ -14,6 +21,9 @@ defineProps<{ dark?: boolean; bordered?: boolean }>(); background-color: var(--surface-1); border-radius: var(--radius-3); padding: var(--size-4); +} + +.app-box__shadowed { box-shadow: var(--shadow-1); } diff --git a/src/components/home/PersonCard.vue b/src/components/home/PersonCard.vue index 42f25852..c85dd489 100644 --- a/src/components/home/PersonCard.vue +++ b/src/components/home/PersonCard.vue @@ -14,6 +14,7 @@ defineProps<{ disabled?: boolean; img?: string; }[]; + detailColumnCount?: number; }>(); const status = ref(false); @@ -131,7 +132,7 @@ const status = ref(false);
* { display: flex; diff --git a/src/pages/02_personnel-management/MainPage.vue b/src/pages/02_personnel-management/MainPage.vue index 2eda42cb..19a1ee9e 100644 --- a/src/pages/02_personnel-management/MainPage.vue +++ b/src/pages/02_personnel-management/MainPage.vue @@ -1,5 +1,7 @@ @@ -147,8 +59,27 @@ const selectorList = [ - -
+ +
= { total: number; }; -export enum Status { - CREATED, - USED, -} +export type Status = 'CREATED' | 'ACTIVE' | 'INACTIVE'; diff --git a/src/stores/user/types.ts b/src/stores/user/types.ts index 58ff7c5b..cdb508a8 100644 --- a/src/stores/user/types.ts +++ b/src/stores/user/types.ts @@ -17,6 +17,7 @@ export type User = { licenseIssueDate: string | null; licenseNo: string | null; discountCondition: string | null; + gender: string; userRole: string; userType: string; retireDate: string | null; @@ -34,7 +35,7 @@ export type User = { lastName: string; firstNameEN: string; firstName: string; - code: string | null; + code: string; keycloakId: string; id: string; profileImageUrl: string; @@ -47,6 +48,7 @@ export type UserCreate = { telephoneNo: string; email: string; zipCode: string; + gender: string; addressEN: string; address: string; trainingPlace?: string;