From a18581abbe125650438fe7d5fce66f8aece49c04 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 10 Jul 2024 14:35:56 +0700
Subject: [PATCH] fix bug

---
 src/modules/10_order/components/step/step01.vue    |  1 -
 .../13_salary/components/Command/step01.vue        |  2 +-
 .../components/SalaryChart/DialogFormMain.vue      | 14 ++++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue
index 91c76df07..4221ac87d 100644
--- a/src/modules/10_order/components/step/step01.vue
+++ b/src/modules/10_order/components/step/step01.vue
@@ -877,7 +877,6 @@ const getClass = (val: boolean) => {
                 v-model="command"
                 hide-bottom-space
                 :label="`${'คำสั่งเลขที่'}`"
-                :rules="[(val) => !!val || `${'กรุณากรอกคำสั่งเลขที่'}`]"
               />
             </div>
             <label class="col-1 flex justify-center items-center text-bold"
diff --git a/src/modules/13_salary/components/Command/step01.vue b/src/modules/13_salary/components/Command/step01.vue
index 6f6de2c01..f8f4e351e 100644
--- a/src/modules/13_salary/components/Command/step01.vue
+++ b/src/modules/13_salary/components/Command/step01.vue
@@ -455,7 +455,7 @@ function fetchSalaryRound() {
               v-model="command"
               hide-bottom-space
               :label="`${'คำสั่งเลขที่'}`"
-              :rules="[(val) => !!val || `${'กรุณากรอกคำสั่งเลขที่'}`]"
+        
             />
           </div>
           <label class="col-1 flex justify-center items-center text-bold"
diff --git a/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue b/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue
index 7c5fd482b..e04e1dc0e 100644
--- a/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue
+++ b/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue
@@ -86,8 +86,8 @@ function fetchPosType() {
         id: e.id,
         name: e.posTypeName,
       }));
-      salaryPosTypeOptionMain.value = listOption;
       salaryPosTypeOption.value = listOption;
+      salaryPosTypeOptionMain.value = listOption;
     })
     .catch((err) => {
       messageError($q, err);
@@ -105,8 +105,8 @@ function fetchPosLevel(id: string) {
       name: e.posLevelName,
     })) || [];
 
-  salaryPosLevelOptionMain.value = listOption;
   salaryPosLevelOption.value = listOption;
+  salaryPosLevelOptionMain.value = listOption;
   if (!listOption.some((e: DataOption) => e.id === formData.posLevelId)) {
     formData.posLevelId = "";
   }
@@ -146,18 +146,20 @@ function fetchSalaryDetail(id: string) {
  */
 watch(
   () => modal.value,
-  () => {
+  async () => {
     if (modal.value) {
-      fetchPosType();
+      await fetchPosType();
 
       if (props.typeAction === "edit") {
+        showLoader();
         setTimeout(() => {
           if (props.data) {
             salaryId.value = props.data.id;
+            fetchPosLevel(props?.data?.posTypeId);
             fetchSalaryDetail(props.data.id);
-            fetchPosLevel(props.data.posTypeId);
+            hideLoader();
           }
-        }, 100);
+        }, 2000);
       }
     }
   }