From f87547d1bcfde322427358e6a486ff8fc8171748 Mon Sep 17 00:00:00 2001
From: puriphatt <puriphat@frappet.com>
Date: Tue, 26 Nov 2024 16:33:09 +0700
Subject: [PATCH] fix: request list => form expansion add individual cost

---
 src/pages/08_request-list/FormDuty.vue      | 16 +++++++++++-----
 src/pages/08_request-list/FormEmployee.vue  |  4 ++--
 src/pages/08_request-list/FormExpansion.vue |  9 +++++++--
 src/stores/request-list/types.ts            |  3 ++-
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/pages/08_request-list/FormDuty.vue b/src/pages/08_request-list/FormDuty.vue
index 37b000ad..149fb0ef 100644
--- a/src/pages/08_request-list/FormDuty.vue
+++ b/src/pages/08_request-list/FormDuty.vue
@@ -2,10 +2,16 @@
 const duty = defineModel<boolean>('duty', { required: true });
 const dutyCost = defineModel<number>('dutyCost', { required: false });
 
-defineProps<{
-  readonly?: boolean;
-  cost?: boolean;
-}>();
+withDefaults(
+  defineProps<{
+    options?: number[];
+    readonly?: boolean;
+    cost?: boolean;
+  }>(),
+  {
+    options: () => [30],
+  },
+);
 </script>
 <template>
   <div class="row items-center q-px-md q-py-xs">
@@ -24,7 +30,7 @@ defineProps<{
       class="col"
     />
     <q-select
-      :options="[30]"
+      :options
       :disable="!duty"
       :label="$t('duty.cost')"
       :readonly
diff --git a/src/pages/08_request-list/FormEmployee.vue b/src/pages/08_request-list/FormEmployee.vue
index 86573264..0e29a9ca 100644
--- a/src/pages/08_request-list/FormEmployee.vue
+++ b/src/pages/08_request-list/FormEmployee.vue
@@ -15,14 +15,14 @@ defineProps<{
       <q-radio
         v-model="localEmployee"
         :val="true"
-        :label="$t('requestList.nonLocalEmployee')"
+        :label="$t('requestList.localEmployee')"
         :disable="readonly"
         class="col"
       />
       <q-radio
         v-model="localEmployee"
         :val="false"
-        :label="$t('requestList.localEmployee')"
+        :label="$t('requestList.nonLocalEmployee')"
         :disable="readonly"
         class="col"
       />
diff --git a/src/pages/08_request-list/FormExpansion.vue b/src/pages/08_request-list/FormExpansion.vue
index 4d735473..adea2168 100644
--- a/src/pages/08_request-list/FormExpansion.vue
+++ b/src/pages/08_request-list/FormExpansion.vue
@@ -24,9 +24,10 @@ const defaultForm = {
   customerDutyCost: 30,
   companyDuty: false,
   companyDutyCost: 30,
-  individualDuty: false,
   localEmployee: true,
   employeeId: '',
+  individualDuty: false,
+  individualDutyCost: 10,
 };
 
 const attributesForm = defineModel<AttributesForm>('attributesForm', {
@@ -35,9 +36,10 @@ const attributesForm = defineModel<AttributesForm>('attributesForm', {
     customerDutyCost: 30,
     companyDuty: false,
     companyDutyCost: 30,
-    individualDuty: false,
     localEmployee: true,
     employeeId: '',
+    individualDuty: false,
+    individualDutyCost: 10,
   },
 });
 
@@ -155,9 +157,12 @@ function assignToForm() {
           {{ $t('duty.text', { subject: $t('general.individual') }) }}
         </FormGroupHead>
         <FormDuty
+          :options="[10]"
           :readonly="!state.isEdit"
           class="surface-1"
           v-model:duty="formData.individualDuty"
+          v-model:duty-cost="formData.individualDutyCost"
+          cost
         />
       </section>
     </main>
diff --git a/src/stores/request-list/types.ts b/src/stores/request-list/types.ts
index 6799f362..81d4fb02 100644
--- a/src/stores/request-list/types.ts
+++ b/src/stores/request-list/types.ts
@@ -76,9 +76,10 @@ export type AttributesForm = {
   customerDutyCost?: number;
   companyDuty: boolean;
   companyDutyCost?: number;
-  individualDuty: boolean;
   localEmployee: boolean;
   employeeId?: string;
+  individualDuty: boolean;
+  individualDutyCost?: number;
 };
 
 export type Step = {