From a019cbb327fcc008f1c0d1faff4aee1de80f4df6 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 10 Jan 2024 16:12:31 +0700
Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=E0=B8=84=E0=B8=B3=E0=B8=9C=E0=B8=B7=E0=B8=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/06_evaluate/components/EvaluateStepMain.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/06_evaluate/components/EvaluateStepMain.vue b/src/modules/06_evaluate/components/EvaluateStepMain.vue
index 49bee53..ba13e20 100644
--- a/src/modules/06_evaluate/components/EvaluateStepMain.vue
+++ b/src/modules/06_evaluate/components/EvaluateStepMain.vue
@@ -713,7 +713,7 @@ onMounted(async () => {
                   (store.step == 3 || store.step == 7)
                 "
                 unelevated
-                label="ยื่นเอกการ"
+                label="ยื่นเอกสาร"
                 color="public"
                 @click="onCilckNextStep()"
               />

From 55fe5e8651fb27abd22c88851622ed009a1888e6 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 10 Jan 2024 16:22:56 +0700
Subject: [PATCH 2/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=9C=E0=B8=B7=E0=B8=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/06_evaluate/components/EvaluateStepMain.vue | 4 ----
 src/modules/06_evaluate/components/step/step3.vue       | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/06_evaluate/components/EvaluateStepMain.vue b/src/modules/06_evaluate/components/EvaluateStepMain.vue
index 1ef1145..47d966f 100644
--- a/src/modules/06_evaluate/components/EvaluateStepMain.vue
+++ b/src/modules/06_evaluate/components/EvaluateStepMain.vue
@@ -606,7 +606,6 @@ onMounted(async () => {
 								@click="onCilckNextStep()"
 							/>
 
-<<<<<<< HEAD
               <q-btn
                 v-else-if="
                   store.step >= store.currentStep &&
@@ -617,9 +616,6 @@ onMounted(async () => {
                 color="public"
                 @click="onCilckNextStep()"
               />
-=======
-							<q-btn v-else-if="store.step >= store.currentStep && (store.step == 3 || store.step == 7)" unelevated label="ยื่นเอกการ" color="public" @click="onCilckNextStep()" />
->>>>>>> develop
 
 							<q-btn v-if="store.step >= store.currentStep && store.step == 2 && store.statusUpload" unelevated label="ดำเนินการต่อ" color="public" @click="onCilckNextStep()" />
 							<q-btn v-if="store.step >= store.currentStep && store.step == 6 && store.statusUpload" unelevated label="ดำเนินการต่อ" color="public" @click="onCilckNextStep()" />
diff --git a/src/modules/06_evaluate/components/step/step3.vue b/src/modules/06_evaluate/components/step/step3.vue
index 1b944af..3ded0af 100644
--- a/src/modules/06_evaluate/components/step/step3.vue
+++ b/src/modules/06_evaluate/components/step/step3.vue
@@ -57,6 +57,9 @@ async function fetchDocument(fileName: string) {
       })
       .catch((err) => {
         messageError($q, err);
+      })
+      .finally(() => {
+        showLoader();
       }));
 }
 
@@ -65,6 +68,7 @@ async function fetchDocument(fileName: string) {
  * @param url ลิงก์ดาวน์โหลดไฟล์
  */
 async function downloadFile(url: string) {
+  showLoader();
   await axios
     .get(url, {
       responseType: "blob",