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

Merge refactor/i18n into develop

Browse source
This commit is contained in:
Methapon Metanipat 2024-08-26 16:24:08 +07:00
parent 3da5bf9079
commit c681b19e39
99 changed files with 2192 additions and 2987 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/pages/03_customer-management/BranchPage.vue
View file

@ -275,7 +275,7 @@ watch([customerId, inputSearch, currentStatus], async () => {
outlined
dense
class="col-6"
:label="$t('search')"
:label="$t('general.search')"
:bg-color="$q.dark.isActive ? 'dark' : 'white'"
v-model="inputSearch"
debounce="500"
@ -299,9 +299,9 @@ watch([customerId, inputSearch, currentStatus], async () => {
emit-value
:hide-dropdown-icon="$q.screen.lt.sm"
:options="[
{ label: $t('all'), value: 'All' },
{ label: $t('statusACTIVE'), value: 'ACTIVE' },
{ label: $t('statusINACTIVE'), value: 'INACTIVE' },
{ label: $t('general.all'), value: 'All' },
{ label: $t('status.ACTIVE'), value: 'ACTIVE' },
{ label: $t('status.INACTIVE'), value: 'INACTIVE' },
]"
></q-select>
@ -423,9 +423,7 @@ watch([customerId, inputSearch, currentStatus], async () => {
<div class="col" style="min-width: fit-content">
<div class="col">
{{
$i18n.locale === 'en-US'
? props.row.nameEN
: props.row.name
$i18n.locale === 'eng' ? props.row.nameEN : props.row.name
}}
</div>
<div class="col app-text-muted">
@ -445,7 +443,7 @@ watch([customerId, inputSearch, currentStatus], async () => {
class="text-center"
>
{{
$i18n.locale === 'en-US'
$i18n.locale === 'eng'
? `${props.row.addressEN || ''} ${props.row.subDistrict?.nameEN || ''} ${props.row.district?.nameEN || ''} ${props.row.province?.nameEN || ''}`
: `${props.row.address || ''} ${props.row.subDistrict?.name || ''} ${props.row.district?.name || ''} ${props.row.province?.name || ''}`
}}
@ -531,7 +529,7 @@ watch([customerId, inputSearch, currentStatus], async () => {
:field-selected="[
'orderNumber',
'firstName',
'formDialogInputAge',
'general.age',
'formDialogInputNationality',
'formDialogInputPassportNo',
'passportExpiryDate',
@ -562,7 +560,7 @@ watch([customerId, inputSearch, currentStatus], async () => {
customerBranchFormTab: props.row.branchNo,
branchName: props.row.name,
address:
$i18n.locale === 'en-US'
$i18n.locale === 'eng'
? `${props.row.addressEN || ''} ${props.row.subDistrict?.nameEN || ''} ${props.row.district?.nameEN || ''} ${props.row.province?.nameEN || ''}`
: `${props.row.address || ''} ${props.row.subDistrict?.name || ''} ${props.row.district?.name || ''} ${props.row.province?.name || ''}`,
telephone: props.row.telephoneNo,
@ -584,7 +582,7 @@ watch([customerId, inputSearch, currentStatus], async () => {
<div class="col"></div>
<div class="app-text-muted col text-center">
{{
$t('recordsPage', {
$t('general.recordsPage', {
resultcurrentPage: branch?.length,
total: totalBranch,
})