diff --git a/src/components/01_branch-management/BranchCard.vue b/src/components/01_branch-management/BranchCard.vue index bcf8592d..180ac7e0 100644 --- a/src/components/01_branch-management/BranchCard.vue +++ b/src/components/01_branch-management/BranchCard.vue @@ -12,6 +12,7 @@ defineProps<{ metadata?: unknown; badgeField?: string[]; fieldSelected?: ( + | 'branchLabelName' | 'branchLabelAddress' | 'branchLabelTel' | 'branchLabelType' diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue index 25e6805c..15a6d792 100644 --- a/src/pages/01_branch-management/MainPage.vue +++ b/src/pages/01_branch-management/MainPage.vue @@ -34,27 +34,27 @@ const labelBtnStatus = ref(t('all')); const columns = [ { - name: 'name', + name: 'branchLabelName', align: 'left', label: 'office', field: 'name', sortable: true, }, { - name: 'address', + name: 'branchLabelAddress', align: 'left', label: 'address', field: 'address', sortable: true, }, { - name: 'telephoneNo', + name: 'branchLabelTel', align: 'left', label: 'formDialogInputTelephone', field: 'telephoneNo', }, { - name: 'isHeadOffice', + name: 'branchLabelType', align: 'left', label: 'type', field: 'isHeadOffice', @@ -169,10 +169,25 @@ const beforeBranch = ref<{ id: string; code: string }>({ const inputSearch = ref(''); const fieldBranch = ref(['all', 'branchHQLabel', 'branchLabel']); const fieldDisplay = ref< - ('branchLabelAddress' | 'branchLabelTel' | 'branchLabelType')[] ->(['branchLabelTel', 'branchLabelAddress', 'branchLabelType']); + ( + | 'branchLabelName' + | 'branchLabelAddress' + | 'branchLabelTel' + | 'branchLabelType' + )[] +>([ + 'branchLabelName', + 'branchLabelTel', + 'branchLabelAddress', + 'branchLabelType', +]); const fieldSelected = ref< - ('branchLabelAddress' | 'branchLabelTel' | 'branchLabelType')[] + ( + | 'branchLabelName' + | 'branchLabelAddress' + | 'branchLabelTel' + | 'branchLabelType' + )[] >(fieldDisplay.value); const fieldSelectedBranch = ref<{ label: string; @@ -807,7 +822,24 @@ watch(locale, () => { - + + { card-container-class="row q-col-gutter-md" row-key="name" hide-pagination + :visible-columns="fieldSelected" >