From 10534f2f256b704bdb8c6412ca5e4708c6bc2eff Mon Sep 17 00:00:00 2001
From: Methapon Metanipat <methapon@frappet.com>
Date: Mon, 25 Nov 2024 09:39:37 +0700
Subject: [PATCH] fix: error when no data

---
 src/pages/08_request-list/PropertiesExpansion.vue | 2 +-
 src/pages/08_request-list/RequestListView.vue     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/08_request-list/PropertiesExpansion.vue b/src/pages/08_request-list/PropertiesExpansion.vue
index 73a3bf83..aa741758 100644
--- a/src/pages/08_request-list/PropertiesExpansion.vue
+++ b/src/pages/08_request-list/PropertiesExpansion.vue
@@ -55,7 +55,7 @@ async function triggerSubmit() {
   const res = await requestListStore.editRequestWork({
     id: props.id,
     attributes: {
-      ...attributes.value,
+      ...(attributes.value || {}),
       properties: formData.value,
       remark: formRemark.value,
     },
diff --git a/src/pages/08_request-list/RequestListView.vue b/src/pages/08_request-list/RequestListView.vue
index 2f3998a0..adb0d6d7 100644
--- a/src/pages/08_request-list/RequestListView.vue
+++ b/src/pages/08_request-list/RequestListView.vue
@@ -432,7 +432,7 @@ async function triggerViewFile(opt: {
           >
             <ProductExpansion
               :status="
-                value.stepStatus.find((v) => v.step === pageState.currentStep)
+                value.stepStatus?.find((v) => v.step === pageState.currentStep)
               "
               v-model:product-id="value.productService.productId"
               :name="value.productService.product.name"
@@ -509,7 +509,7 @@ async function triggerViewFile(opt: {
                     }"
                     :id="value.id"
                     :attributes-form="
-                      value.stepStatus[pageState.currentStep - 1]?.attributes
+                      value.stepStatus?.[pageState.currentStep - 1]?.attributes
                         ?.form
                     "
                   />