chamomind/jws-frontend
chamomind/jws-frontend
6
0
Fork 0
Code Issues Projects Releases Packages 1 Wiki Activity Actions

fix: format address & card height

Browse source
This commit is contained in:
puriphatt 2024-11-11 12:11:54 +07:00
parent eaa55c7ae4
commit 2bfb90beab
4 changed files with 112 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/pages/01_branch-management/MainPage.vue
View file

@ -16,6 +16,7 @@ import {
Branch,
BankBook,
} from 'stores/branch/types';
import { formatAddress } from 'src/utils/address';
import NoData from 'src/components/NoData.vue';
import QrCodeUploadDialog from 'src/components/QrCodeUploadDialog.vue';
@ -1456,12 +1457,39 @@ watch(currentHq, () => {
v-if="fieldSelected.includes('branchLabelAddress')"
>
{{
locale === 'eng'
? `${props.row.addressEN}, ${props.row.mooEN && `${$t('form.moo')} ${props.row.mooEN},`} ${props.row.soiEN && `${$t('form.soi')} ${props.row.soiEN},`} ${props.row.moo && `${props.row.streetEN} Rd,`} ${props.row.subDistrict.nameEN}, ${props.row.district.nameEN}, ${props.row.province.nameEN} ${props.row.subDistrict.zipCode}` ||
'-'
: `${props.row.address} ${props.row.moo && `${$t('form.moo')} ${props.row.moo},`} ${props.row.soi && `${$t('form.soi')} ${props.row.soi},`} ${props.row.street && `${$t('form.road')} ${props.row.street},`} ${props.row.subDistrict.name}, ${props.row.district.name}, ${props.row.province.name} ${props.row.subDistrict.zipCode}` ||
'-'
formatAddress({
address: props.row.address,
addressEN: props.row.addressEN,
moo: props.row.moo,
mooEN: props.row.mooEN,
soi: props.row.soi,
soiEN: props.row.soiEN,
street: props.row.street,
streetEN: props.row.streetEN,
province: props.row.province,
district: props.row.district,
subDistrict: props.row.subDistrict,
en: $i18n.locale === 'eng',
})
}}
<q-tooltip>
{{
formatAddress({
address: props.row.address,
addressEN: props.row.addressEN,
moo: props.row.moo,
mooEN: props.row.mooEN,
soi: props.row.soi,
soiEN: props.row.soiEN,
street: props.row.street,
streetEN: props.row.streetEN,
province: props.row.province,
district: props.row.district,
subDistrict: props.row.subDistrict,
en: $i18n.locale === 'eng',
})
}}
</q-tooltip>
</q-td>
<q-td>
<KebabAction
@ -1520,9 +1548,9 @@ watch(currentHq, () => {
</template>
<template v-slot:item="props">
<div class="col-12 col-md-6">
<div class="col-12 col-md-6 column">
<BranchCard
class="surface-1"
class="surface-1 col"
:virtual-branch="props.row.virtual"
:id="`branch-card-${props.row.name}`"
:class="{
@ -1571,12 +1599,20 @@ watch(currentHq, () => {
.map((c: BranchContact) => c.telephoneNo || '-')
.join(','),
contactName: props.row.contactName || '-',
branchLabelAddress:
$i18n.locale === 'eng'
? `${props.row.addressEN}, ${props.row.mooEN && `${$t('form.moo')} ${props.row.mooEN},`} ${props.row.soiEN && `${$t('form.soi')} ${props.row.soiEN},`} ${props.row.moo && `${props.row.streetEN} Rd,`} ${props.row.subDistrict.nameEN}, ${props.row.district.nameEN}, ${props.row.province.nameEN} ${props.row.subDistrict.zipCode}` ||
'-'
: `${props.row.address} ${props.row.moo && `${$t('form.moo')} ${props.row.moo},`} ${props.row.soi && `${$t('form.soi')} ${props.row.soi},`} ${props.row.street && `${$t('form.road')} ${props.row.street},`} ${props.row.subDistrict.name}, ${props.row.district.name}, ${props.row.province.name} ${props.row.subDistrict.zipCode}` ||
'-',
branchLabelAddress: formatAddress({
address: props.row.address,
addressEN: props.row.addressEN,
moo: props.row.moo,
mooEN: props.row.mooEN,
soi: props.row.soi,
soiEN: props.row.soiEN,
street: props.row.street,
streetEN: props.row.streetEN,
province: props.row.province,
district: props.row.district,
subDistrict: props.row.subDistrict,
en: $i18n.locale === 'eng',
}),
branchImgUrl: `/branch/${props.row.id}/branch`,
}"
:field-selected="fieldSelected"