From f485d95e812868f19a1057b905a3adcb7875f84d Mon Sep 17 00:00:00 2001
From: puriphatt <puriphat@frappet.com>
Date: Thu, 26 Dec 2024 13:45:36 +0700
Subject: [PATCH] refactor: update emit type and simplify attribute handling in
 MessengerExpansion and RequestListView components

---
 src/pages/08_request-list/MessengerExpansion.vue |  4 ++--
 src/pages/08_request-list/RequestListView.vue    | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/pages/08_request-list/MessengerExpansion.vue b/src/pages/08_request-list/MessengerExpansion.vue
index 0252bd92..5eee9794 100644
--- a/src/pages/08_request-list/MessengerExpansion.vue
+++ b/src/pages/08_request-list/MessengerExpansion.vue
@@ -16,7 +16,7 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-  (e: 'updateAttributes', value: AttributesForm): void;
+  (e: 'updateAttributes', value: Step): void;
 }>();
 
 const requestListStore = useRequestList();
@@ -69,7 +69,7 @@ async function triggerSubmit() {
   if (res) {
     attributesForm.value = JSON.parse(JSON.stringify(formData.value));
     state.isEdit = false;
-    emit('updateAttributes', attributesForm.value);
+    emit('updateAttributes', res);
   }
 }
 
diff --git a/src/pages/08_request-list/RequestListView.vue b/src/pages/08_request-list/RequestListView.vue
index 9ef06ae2..6e85746f 100644
--- a/src/pages/08_request-list/RequestListView.vue
+++ b/src/pages/08_request-list/RequestListView.vue
@@ -169,10 +169,11 @@ async function triggerChangeStatusWork(step: Step, responsibleUserId?: string) {
       message: t('dialog.message.warningSelectDeliveryStaff'),
       action: async () => {
         await nextTick();
+        return;
       },
     });
+    return;
   }
-
   const res = await requestListStore.editStatusRequestWork(step);
   if (res) {
     const indexWork = workList.value?.findIndex(
@@ -782,12 +783,7 @@ function goToQuotation(
                     "
                     @update-attributes="
                       (opt) => {
-                        value.stepStatus[
-                          pageState.currentStep - 1
-                        ].responsibleUserId = opt.responsibleUserId;
-                        value.stepStatus[
-                          pageState.currentStep - 1
-                        ].responsibleUserLocal = opt.responsibleUserLocal;
+                        value.stepStatus[pageState.currentStep - 1] = opt;
                       }
                     "
                   />