From ef9c99bac20a14589fdb340f866b27bed6df4572 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Thu, 4 Jul 2024 14:27:45 +0700 Subject: [PATCH] refactor: branch card --- .../01_branch-management/BranchCard.vue | 149 ++++++++++-------- src/pages/01_branch-management/MainPage.vue | 3 - 2 files changed, 84 insertions(+), 68 deletions(-) diff --git a/src/components/01_branch-management/BranchCard.vue b/src/components/01_branch-management/BranchCard.vue index d1cc03e4..d1023ff4 100644 --- a/src/components/01_branch-management/BranchCard.vue +++ b/src/components/01_branch-management/BranchCard.vue @@ -2,10 +2,20 @@ defineProps<{ inactive?: boolean; color?: 'none' | 'hq' | 'br'; - data: Record; + data: { + branchLabelCode: string; + branchLabelName: string; + branchLabelTel: string; + branchLabelAddress: string; + branchLabelType: string; + }; metadata?: unknown; badgeField?: string[]; - fieldSelected?: string[]; + fieldSelected?: ( + | 'branchLabelAddress' + | 'branchLabelTel' + | 'branchLabelType' + )[]; footer?: boolean; }>(); @@ -21,41 +31,46 @@ defineProps<{ 'branch-card__hq': color === 'hq', 'branch-card__br': color === 'br', }" + @click="$emit('open')" > -
-
- {{ $t(k) }} -
-
- {{ v }} - +
+
+
+ {{ data.branchLabelName }} + {{ data.branchLabelCode }} +
+ +
+ + + +
+
+
+
+
{{ $t(key) }}
+
{{ data[key as keyof typeof data] }}
@@ -69,41 +84,45 @@ defineProps<{ display: flex; flex-direction: column; overflow: hidden; + padding: var(--size-3); - & > .branch-card__row { + & .branch-card__header { + display: flex; + margin-bottom: var(--size-2); + + & .branch-card__icon { + background-color: hsla(var(--_branch-card-row-bg) / 0.1); + border-radius: 50%; + padding: var(--size-1); + + & :deep(.q-icon) { + color: hsla(var(--_branch-card-row-bg) / 1); + } + } + + & .branch-card__name { + display: flex; + flex-direction: column; + flex: 1; + padding-inline: var(--size-2); + + & .branch-card__code { + color: hsla(var(--text-mute) / 1); + } + } + + & .branch-card__action { + margin-left: auto; + } + } + & .branch-card__data { display: flex; - flex-wrap: nowrap; - padding-inline: var(--size-4); padding-block: var(--size-2); - &:last-child { - flex-grow: 1; - } - - &.branch-card__header > * { - display: flex; - align-items: center; - } - - & > .branch-card__label { - min-width: 120px; - width: 30%; - } - - &:not(.branch-card__header) .branch-card__label { - color: hsl(var(--stone-6-hsl)); - } - - & > .branch-card__value { - width: 70%; - - &.branch-card__badge > span { - display: inline-block; - border-radius: 999rem; - padding-inline: var(--size-2); - color: hsl(var(--_branch-badge-fg)); - background-color: hsla(var(--_branch-badge-bg) / 0.1); - } + & > :first-child { + color: hsla(var(--text-mute) / 1); + width: 0%; + min-width: 40%; } } diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue index 8f1b3685..d207eeba 100644 --- a/src/pages/01_branch-management/MainPage.vue +++ b/src/pages/01_branch-management/MainPage.vue @@ -135,11 +135,9 @@ const beforeBranch = ref<{ id: string; code: string }>({ const inputSearch = ref(''); const fieldBranch = ref(['all', 'branchHQLabel', 'branchLabel']); const fieldDisplay = ref([ - 'branchLabelName', 'branchLabelTel', 'branchLabelAddress', 'branchLabelType', - 'branchLabelStatus', ]); const fieldSelected = ref(fieldDisplay.value); const fieldSelectedBranch = ref<{ @@ -888,7 +886,6 @@ watch(locale, () => { branchLabelType: $t( item.isHeadOffice ? 'branchHQLabel' : 'branchLabel', ), - branchLabelStatus: $t(`status${item.status}`), }" :field-selected="fieldSelected" :badge-field="['branchLabelStatus']"