From b093e4b546777066802e7f531d5cdb583edf4410 Mon Sep 17 00:00:00 2001
From: Thanaphon Frappet <thanaphon@frappet.com>
Date: Thu, 26 Dec 2024 12:02:09 +0700
Subject: [PATCH] refactor: fall back value

---
 src/pages/08_request-list/DutyExpansion.vue      | 13 ++++++++++++-
 src/pages/08_request-list/MessengerExpansion.vue | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/pages/08_request-list/DutyExpansion.vue b/src/pages/08_request-list/DutyExpansion.vue
index 92459157..8a19521a 100644
--- a/src/pages/08_request-list/DutyExpansion.vue
+++ b/src/pages/08_request-list/DutyExpansion.vue
@@ -69,7 +69,18 @@ function triggerEdit() {
 }
 
 function assignToForm() {
-  formData.value = JSON.parse(JSON.stringify(attributesForm.value));
+  formData.value = JSON.parse(
+    JSON.stringify({
+      customerDuty: attributesForm.value.customerDuty ?? false,
+      customerDutyCost: attributesForm.value.customerDutyCost ?? 30,
+      companyDuty: attributesForm.value.companyDuty ?? false,
+      companyDutyCost: attributesForm.value.companyDutyCost ?? 30,
+      responsibleUserLocal: attributesForm.value.responsibleUserLocal ?? true,
+      responsibleUserId: attributesForm.value.responsibleUserId ?? '',
+      individualDuty: attributesForm.value.individualDuty ?? false,
+      individualDutyCost: attributesForm.value.individualDutyCost ?? 10,
+    }),
+  );
 }
 </script>
 <template>
diff --git a/src/pages/08_request-list/MessengerExpansion.vue b/src/pages/08_request-list/MessengerExpansion.vue
index 872ddffe..36072bb1 100644
--- a/src/pages/08_request-list/MessengerExpansion.vue
+++ b/src/pages/08_request-list/MessengerExpansion.vue
@@ -78,7 +78,18 @@ function triggerEdit() {
 }
 
 function assignToForm() {
-  formData.value = JSON.parse(JSON.stringify(attributesForm.value));
+  formData.value = JSON.parse(
+    JSON.stringify({
+      customerDuty: attributesForm.value.customerDuty ?? false,
+      customerDutyCost: attributesForm.value.customerDutyCost ?? 30,
+      companyDuty: attributesForm.value.companyDuty ?? false,
+      companyDutyCost: attributesForm.value.companyDutyCost ?? 30,
+      responsibleUserLocal: attributesForm.value.responsibleUserLocal ?? true,
+      responsibleUserId: attributesForm.value.responsibleUserId ?? '',
+      individualDuty: attributesForm.value.individualDuty ?? false,
+      individualDutyCost: attributesForm.value.individualDutyCost ?? 10,
+    }),
+  );
 }
 </script>
 <template>