From a0a14ca0095222d48867d7588b23afb6533e4255 Mon Sep 17 00:00:00 2001 From: Net <93821485+somnetsak123@users.noreply.github.com> Date: Fri, 5 Jul 2024 15:13:55 +0700 Subject: [PATCH] =?UTF-8?q?refactor:=20=E0=B9=81=E0=B8=81=E0=B9=89=20?= =?UTF-8?q?=E0=B8=81=E0=B8=94=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B9=84=E0=B8=94=E0=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/03_customer-management/MainPage.vue | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue index ccf43046..9d213f3b 100644 --- a/src/pages/03_customer-management/MainPage.vue +++ b/src/pages/03_customer-management/MainPage.vue @@ -838,15 +838,15 @@ async function onDelete(id: string) { } async function submitBranch() { - if (formData.value.customerBranch?.[0]) { - delete formData.value.customerBranch[0]['id']; + if (formData.value.customerBranch?.[indexTab.value]) { + delete formData.value.customerBranch[indexTab.value]['id']; - formData.value.customerBranch[0].status = statusToggle.value + formData.value.customerBranch[indexTab.value].status = statusToggle.value ? 'ACTIVE' : 'INACTIVE'; await editBranchById(currentBranchId.value, { - ...formData.value.customerBranch[0], + ...formData.value.customerBranch[indexTab.value], customerId: currentCustomerId.value, }); @@ -903,7 +903,7 @@ const prevCustomer = ref({ registeredBranchId: '', }); -async function assignFormData(customerId: string) { +async function assignFormData(customerId: string, branch?: CustomerBranch) { let data; const res = await fetchListById(customerId); if (res) { @@ -965,8 +965,6 @@ function cloneData() { ...prevCustomer.value, customerBranch: structuredClone(toRaw(prevCustomer.value.customerBranch)), }; - - console.log(formData.value); } async function assignFormDataEmployee(id: string) { @@ -1819,19 +1817,25 @@ watch([inputSearch, currentStatus], async () => { clearForm(); } " - @dialog="dialogInputCustomerBranchForm = true" + @dialog=" + () => { + indexTab = 0; + dialogInputCustomerBranchForm = true; + } + " @viewDetail=" - async (v) => { - currentBranchId = v[0].id; + async (v, i) => { + currentBranchId = v.id; + indexTab = i; - statusToggle = v[0].status === 'INACTIVE' ? false : true; + statusToggle = v.status === 'INACTIVE' ? false : true; currentBranch = { - name: v[0].name, - code: v[0].code, + name: v.name, + code: v.code, }; - if (currentCustomer) assignFormData(currentCustomer.id); + if (currentCustomer) assignFormData(currentCustomer.id, v); await fetchListOfOptionBranch(); @@ -2452,7 +2456,11 @@ watch([inputSearch, currentStatus], async () => { :isEdit="infoDrawerEdit" :close="() => onClose()" :editData="() => (infoDrawerEdit = true)" - :submit="() => onSubmitEdit(currentCustomerId)" + :submit=" + () => () => { + onSubmitEdit(currentCustomerId); + } + " :deleteData=" () => { deleteCustomerById(currentCustomerId); @@ -2667,6 +2675,7 @@ watch([inputSearch, currentStatus], async () => { :deleteData="() => deleteBranchId(currentBranchId)" :submit=" () => { + console.log(formData.customerBranch?.[indexTab]); submitBranch(); } " @@ -2736,6 +2745,7 @@ watch([inputSearch, currentStatus], async () => {