From 77654698530e0c8e649880f37a2d4749dbb6ab13 Mon Sep 17 00:00:00 2001 From: Methapon Metanipat Date: Wed, 11 Sep 2024 11:13:12 +0700 Subject: [PATCH] fix: tree i18n branch --- src/pages/01_branch-management/MainPage.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue index 8993604b..8bdb5028 100644 --- a/src/pages/01_branch-management/MainPage.vue +++ b/src/pages/01_branch-management/MainPage.vue @@ -191,13 +191,15 @@ const treeData = computed(() => { const children: Branch[] = []; branchData.value?.result.forEach((v) => { - if (v.isHeadOffice) map[v.id] = Object.assign(v, { branch: [] }); - else children.push(v); + const name = locale.value === 'eng' ? v.nameEN : v.name; + if (v.isHeadOffice) map[v.id] = { ...v, name, branch: [] }; + else children.push({ ...v, name }); }); children.forEach((v) => { + const name = locale.value === 'eng' ? v.nameEN : v.name; if (v.headOfficeId && map[v.headOfficeId]) { - map[v.headOfficeId].branch.push(v); + map[v.headOfficeId].branch.push({ ...v, name }); } });