diff --git a/src/components/ImageUploadDialog.vue b/src/components/ImageUploadDialog.vue
index 04a65e3d..5386d101 100644
--- a/src/components/ImageUploadDialog.vue
+++ b/src/components/ImageUploadDialog.vue
@@ -137,7 +137,7 @@ async function downloadImage(url: string) {
flat
:color="$q.dark.isActive ? 'grey-9' : 'grey-4'"
:text-color="$q.dark.isActive ? 'grey-1' : 'grey-10'"
- :label="$t('clear')"
+ :label="$t('general.clear')"
@click="
inputFile && (inputFile.value = ''),
(imageUrl = defaultUrl || fallbackUrl || ''),
diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue
index 993718ab..3c3f2d73 100644
--- a/src/pages/01_branch-management/MainPage.vue
+++ b/src/pages/01_branch-management/MainPage.vue
@@ -626,7 +626,7 @@ function changeTitle(
const _type =
typeBranch === 'headOffice'
? 'branch.card.branchHQLabel'
- : 'branch.card.branchHQLabel';
+ : 'branch.card.branchLabel';
return formType === 'create'
? t('form.title.create', { name: t(_type) })
@@ -637,10 +637,10 @@ function changeTitle(
function handleHold(node: BranchWithChildren) {
if ($q.screen.gt.xs) return;
- return function () {
- holdDialog.value = true;
- currentNode.value = node;
- };
+ holdDialog.value = true;
+ currentNode.value = node;
+ // return function () {
+ // };
}
watch(
@@ -1389,8 +1389,8 @@ watch(currentHq, () => {
: `${props.row.address || ''} ${props.row.subDistrict?.name || ''} ${props.row.district?.name || ''} ${props.row.province?.name || ''}`,
branchLabelType: $t(
props.row.isHeadOffice
- ? 'branch.branchHQLabel'
- : 'branch.branchLabel',
+ ? 'branch.card.branchHQLabel'
+ : 'branch.card.branchLabel',
),
branchImgUrl: `/branch/${props.row.id}/branch-image`,
}"
@@ -1697,7 +1697,7 @@ watch(currentHq, () => {
outlined
separator
prefix-id="default"
- :title="$t('form.address')"
+ :title="'form.address'"
v-model:address="formData.address"
v-model:addressEN="formData.addressEN"
v-model:province-id="formData.provinceId"
@@ -1922,7 +1922,7 @@ watch(currentHq, () => {
outlined
separator
prefix-id="default"
- :title="$t('form.address')"
+ :title="'form.address'"
:readonly="formType === 'view'"
v-model:address="formData.address"
v-model:addressEN="formData.addressEN"
@@ -1997,7 +1997,9 @@ watch(currentHq, () => {
- {{ $t('formDialogTitleCreateSubBranch') }}
+ {{
+ $t('form.title.create', { name: $t('branch.card.branchLabel') })
+ }}
@@ -2024,7 +2026,7 @@ watch(currentHq, () => {
style="color: hsl(var(--green-6-hsl))"
/>
- {{ $t('viewDetail') }}
+ {{ $t('general.viewDetail') }}
{
style="color: hsl(var(--cyan-6-hsl))"
/>
- {{ $t('edit') }}
+ {{ $t('general.edit') }}
{
- {{ $t('delete') }}
+ {{ $t('general.delete') }}