Merge branch 'develop' of https://github.com/Frappet/BMA-EHR-USER into develop

src/modules/06_evaluate/components/EvaluateStepMain.vue

@@ -606,7 +606,16 @@ onMounted(async () => {
 								@click="onCilckNextStep()"
 							/>
 
-							<q-btn v-else-if="store.step >= store.currentStep && (store.step == 3 || store.step == 7)" unelevated label="ยื่นเอกการ" 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()"
+              />
 
 							<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()" />

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",