From 133ede6a607e4341c5d1e0e0fa71f5a9f1186504 Mon Sep 17 00:00:00 2001
From: puriphatt <puriphat@frappet.com>
Date: Wed, 25 Sep 2024 14:46:00 +0700
Subject: [PATCH] fix: comma & customer form

---
 .../components/employer/EmployerFormAbout.vue | 70 +++++++++----------
 .../employer/EmployerFormBusiness.vue         | 19 +++--
 2 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue
index 0134a8e8..f74a5025 100644
--- a/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue
+++ b/src/pages/03_customer-management/components/employer/EmployerFormAbout.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { QSelect } from 'quasar';
 import { onMounted, ref, watch, capitalize } from 'vue';
-import { formatNumberDecimal, selectFilterOptionRefMod } from 'stores/utils';
+import { selectFilterOptionRefMod, commaInput } from 'stores/utils';
 import { calculateAge, disabledAfterToday } from 'src/utils/datetime';
 
 import useOptionStore from 'src/stores/options';
@@ -108,6 +108,36 @@ watch(
 <template>
   <div class="row q-col-gutter-sm">
     <template v-if="customerType === 'CORP'">
+      <div class="col-12 row q-col-gutter-sm">
+        <q-input
+          dense
+          outlined
+          :readonly="readonly"
+          hide-bottom-space
+          class="col-12 col-md-6"
+          :label="$t('customer.form.registerName')"
+          for="input-register-name"
+          v-model="registerName"
+          :rules="[(val: string) => !!val || $t('form.error.required')]"
+        />
+
+        <q-input
+          dense
+          outlined
+          :readonly="readonly"
+          hide-bottom-space
+          class="col-12 col-md-6"
+          label="Company name"
+          for="input-register-name-en"
+          v-model="registerNameEN"
+          :rules="[
+            (val: string) => !!val || $t('form.error.required'),
+            (val: string) =>
+              /^[0-9A-Za-z\s.,]+$/.test(val) || $t('form.error.letterOnly'),
+          ]"
+        />
+      </div>
+
       <div class="col-12 row q-col-gutter-sm">
         <q-input
           dense
@@ -166,36 +196,6 @@ watch(
         />
       </div>
 
-      <div class="col-12 row q-col-gutter-sm">
-        <q-input
-          dense
-          outlined
-          :readonly="readonly"
-          hide-bottom-space
-          class="col-12 col-md-6"
-          :label="$t('customer.form.registerName')"
-          for="input-register-name"
-          v-model="registerName"
-          :rules="[(val: string) => !!val || $t('form.error.required')]"
-        />
-
-        <q-input
-          dense
-          outlined
-          :readonly="readonly"
-          hide-bottom-space
-          class="col-12 col-md-6"
-          label="Company name"
-          for="input-register-name-en"
-          v-model="registerNameEN"
-          :rules="[
-            (val: string) => !!val || $t('form.error.required'),
-            (val: string) =>
-              /^[0-9A-Za-z\s.,]+$/.test(val) || $t('form.error.letterOnly'),
-          ]"
-        />
-      </div>
-
       <div class="col-12 row q-col-gutter-sm">
         <DatePicker
           v-model="registerDate"
@@ -214,14 +214,10 @@ watch(
           class="col-12 col-md-2"
           :label="$t('customer.form.authorizedCapital')"
           for="input-authorized-capital"
-          :model-value="
-            !readonly
-              ? authorizedCapital
-              : formatNumberDecimal(+authorizedCapital, 2)
-          "
+          :model-value="authorizedCapital"
           @update:model-value="
             (v) => {
-              authorizedCapital = `${v}`;
+              if (typeof v === 'string') authorizedCapital = commaInput(v);
             }
           "
         />
diff --git a/src/pages/03_customer-management/components/employer/EmployerFormBusiness.vue b/src/pages/03_customer-management/components/employer/EmployerFormBusiness.vue
index 32b0e394..37e4736d 100644
--- a/src/pages/03_customer-management/components/employer/EmployerFormBusiness.vue
+++ b/src/pages/03_customer-management/components/employer/EmployerFormBusiness.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { selectFilterOptionRefMod } from 'stores/utils';
+import { selectFilterOptionRefMod, commaInput } from 'stores/utils';
 import { onMounted, watch } from 'vue';
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
@@ -13,9 +13,10 @@ const jobPosition = defineModel<string>('jobPosition');
 const jobDescription = defineModel<string>('jobDescription');
 const payDate = defineModel<string>('payDate');
 const payDateEN = defineModel<string>('payDateEN');
-const wageRate = defineModel<number>('wageRate');
+const wageRate = defineModel<number | string>('wageRate');
 const wageRateText = defineModel<string>('wageRateText');
 
+const wageRate4Show = ref('');
 const typeBusinessOption = ref([]);
 const typeBusinessENOption = ref([]);
 const jobPositionOption = ref([]);
@@ -272,7 +273,6 @@ let jobPositionENFilter = selectFilterOptionRefMod(
         (v) => (typeof v === 'string' ? (payDateEN = v) : '')
       "
     />
-
     <q-input
       :for="`${prefixId}-input-pay-rate`"
       :id="`${prefixId}-input-pay-rate`"
@@ -282,7 +282,18 @@ let jobPositionENFilter = selectFilterOptionRefMod(
       hide-bottom-space
       class="col-md-3 col-6"
       :label="$t('customer.form.payRate')"
-      v-model="wageRate"
+      :model-value="commaInput(wageRate?.toString() || '-')"
+      @update:model-value="
+        (v) => {
+          if (typeof v === 'string') wageRate4Show = commaInput(v);
+          const x = parseInt(
+            wageRate4Show && typeof wageRate4Show === 'string'
+              ? wageRate4Show.replace(/,/g, '')
+              : '',
+          );
+          wageRate = x;
+        }
+      "
     />
 
     <q-input