From d62f4013753ce2e891068e3ef0debc85a838ca57 Mon Sep 17 00:00:00 2001 From: Net <93821485+somnetsak123@users.noreply.github.com> Date: Fri, 28 Jun 2024 12:01:04 +0700 Subject: [PATCH] =?UTF-8?q?fix:=20=E0=B9=81=E0=B8=81=E0=B9=89=20code=20=20?= =?UTF-8?q?=E0=B8=82=E0=B8=AD=E0=B8=87=E0=B8=AA=E0=B8=B3=E0=B8=99=E0=B8=B1?= =?UTF-8?q?=E0=B8=81=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B9=83=E0=B8=AB=E0=B8=8D?= =?UTF-8?q?=E0=B9=88=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B8=A1=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/01_branch-management/MainPage.vue | 35 ++++++++++++++++++--- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue index 0eb893f9..e7334856 100644 --- a/src/pages/01_branch-management/MainPage.vue +++ b/src/pages/01_branch-management/MainPage.vue @@ -262,6 +262,7 @@ async function triggerEdit( openFormType: string, id: string, typeBranch: 'headOffice' | 'subBranch', + code?: string, ) { await fetchBranchById(id); if (openFormType === 'form') { @@ -269,10 +270,16 @@ async function triggerEdit( openDialog(); } if (openFormType === 'drawer') { + console.log(code); + formType.value = 'view'; openDrawer(); } + if (typeBranch === 'headOffice') { + formData.value.codeHeadOffice = code; + } + const currentRecord = branchData.value.result.find((x) => x.id === id); if (!currentRecord) return; @@ -287,6 +294,8 @@ async function triggerEdit( (x) => x.id === currentRecord.headOfficeId, ); + formData.value.codeHeadOffice = currentRecordHead?.code; + if (currentRecordHead) { currentHq.value.id = currentRecordHead.id; currentHq.value.code = currentRecordHead.code; @@ -294,6 +303,7 @@ async function triggerEdit( currentHq.value = currentEdit.value; } } + formTypeBranch.value = typeBranch; } @@ -320,6 +330,8 @@ function triggerDelete(id: string) { async function onSubmit() { if (formType.value === 'edit') { + delete formData.value['codeHeadOffice']; + await branchStore.editById( currentEdit.value.id, { @@ -556,7 +568,12 @@ watch(locale, () => { :id="`view-detail-btn-${node.name}-view`" @click.stop=" if (node.isHeadOffice) { - triggerEdit('drawer', node.id, 'headOffice'); + triggerEdit( + 'drawer', + node.id, + 'headOffice', + node.code, + ); } else { triggerEdit('drawer', node.id, 'subBranch'); } @@ -576,6 +593,7 @@ watch(locale, () => { {{ $t('viewDetail') }} + { @click=" () => { if (node.isHeadOffice) { - triggerEdit('form', node.id, 'headOffice'); + triggerEdit( + 'form', + node.id, + 'headOffice', + node.code, + ); } else { triggerEdit('form', node.id, 'subBranch'); } @@ -851,12 +874,14 @@ watch(locale, () => { :badge-field="['branchLabelStatus']" :inactive="item.status === 'INACTIVE'" @view-detail=" - (v) => + (v) => { triggerEdit( 'drawer', v.id, v.isHeadOffice ? 'headOffice' : 'subBranch', - ) + v.code, + ); + } " /> @@ -986,7 +1011,7 @@ watch(locale, () => { >