From f6e49ec2b10302bd31937600dac3d659268c3b49 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 28 Jan 2025 16:22:01 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=97=E0=B8=94=E0=B8=A5=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=87=E0=B8=87=E0=B8=B2=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../probation/FormEvaluation/FormEvaluate.vue |  2 +-
 .../FormEvaluation/FormEvaluateScore.vue      |  2 +-
 .../probation/FormEvaluation/FormReport.vue   |  2 +-
 .../FormEvaluation/FormSaveResult.vue         |  2 +-
 .../FormEvaluation/FormSaveResultCommader.vue |  6 ++--
 .../FormEvaluation/FormUploadFile.vue         | 29 ++++++++++++++++++-
 .../probation/FormEvaluation/Header.vue       |  2 +-
 7 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
index 7f1b3b459..8e14422e4 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
@@ -1085,7 +1085,7 @@ onMounted(async () => {
       </div>
 
       <FormUploadFile
-        :group="`ประเมินผลผู้บังคับบัญชาครั้งที่${props.tab?.charAt(4)}`"
+        :group="`ประเมินผลผู้บังคับบัญชาครั้งที่ ${props.tab?.charAt(4)}`"
         v-model:is-check-file="isCheckFile"
         :check-route-permisson="checkRoutePermisson"
         :data-permissions="
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
index 4426d2d76..a2c3c0cc1 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
@@ -1405,7 +1405,7 @@ onMounted(async () => {
         </div>
 
         <FormUploadFile
-          :group="`ประเมินผลคณะกรรมการครั้งที่${props.tab?.charAt(4)}`"
+          :group="`ประเมินผลคณะกรรมการครั้งที่ ${props.tab?.charAt(4)}`"
           :check-route-permisson="checkRoutePermisson"
           :data-permissions="
             probationStore.dataPermissions?.tab5.isEdit
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
index 90d617118..7615798f8 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
@@ -894,7 +894,7 @@ onMounted(async () => {
 
     <FormUploadFile
       v-else
-      :group="`รายงานผลครั้งที่${props.tab?.charAt(4)}`"
+      :group="`รายงานผลครั้งที่ ${props.tab?.charAt(4)}`"
       v-model:is-check-file="isCheckFile"
       :check-route-permisson="checkRoutePermisson"
       :data-permissions="
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
index eb64abdef..326bb9729 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
@@ -1261,7 +1261,7 @@ onMounted(async () => {
       </div>
 
       <FormUploadFile
-        :group="`บันทึกผลผู้ดูแลครั้งที่${props.tab?.charAt(4)}`"
+        :group="`บันทึกผลผู้ดูแลครั้งที่ ${props.tab?.charAt(4)}`"
         v-model:is-check-file="isCheckFile"
         :check-route-permisson="checkRoutePermisson"
         :data-permissions="
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue
index f176924ee..5a8692d45 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue
@@ -384,7 +384,9 @@ onMounted(async () => {
       <div v-if="status == false">
         <q-btn
           v-if="
-            !checkRoutePermisson && probationStore.dataPermissions?.tab3.isEdit && !isCheckFile
+            !checkRoutePermisson &&
+            probationStore.dataPermissions?.tab3.isEdit &&
+            !isCheckFile
           "
           dense
           flat
@@ -1271,7 +1273,7 @@ onMounted(async () => {
       </div>
 
       <FormUploadFile
-        :group="`บันทึกผลผู้บังคับบัญชาครั้งที่${props.tab?.charAt(4)}`"
+        :group="`บันทึกผลผู้บังคับบัญชาครั้งที่ ${props.tab?.charAt(4)}`"
         v-model:is-check-file="isCheckFile"
         :check-route-permisson="checkRoutePermisson"
         :data-permissions="
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormUploadFile.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormUploadFile.vue
index 8bffb45d1..256cbbff3 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormUploadFile.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormUploadFile.vue
@@ -32,6 +32,7 @@ const dataPermissions = defineModel<boolean>("dataPermissions", {
 
 const assignId = ref<string>(route.params.form as string);
 const file = ref<any>();
+const dataDownload = ref<any>();
 
 function onUploadFiles() {
   showLoader();
@@ -72,6 +73,7 @@ async function uploadFileURL(uploadUrl: string) {
     })
     .then(async () => {
       await success($q, "อัปโหลดไฟล์สำเร็จ");
+      file.value = null;
       await fetchCheckfile();
     })
     .catch((err) => {
@@ -79,7 +81,6 @@ async function uploadFileURL(uploadUrl: string) {
     })
     .finally(() => {
       hideLoader();
-      file.value = null;
     });
 }
 
@@ -91,6 +92,7 @@ async function fetchCheckfile() {
     .then(async (res) => {
       if (res.data.length >= 1) {
         isCheckFile.value = true;
+        dataDownload.value = res.data[0];
       }
     })
     .catch((e) => {
@@ -98,6 +100,22 @@ async function fetchCheckfile() {
     });
 }
 
+async function onDownloadFile() {
+  showLoader();
+  http
+    .get(config.API.filefullPath(`${dataDownload.value.pathname}`))
+    .then(async (res) => {
+      const data = res.data.downloadUrl;
+      window.open(data, "_blank");
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
 onMounted(() => {
   fetchCheckfile();
 });
@@ -141,6 +159,15 @@ onMounted(() => {
       </div>
     </div>
   </div>
+
+  <div class="col-12" v-if="isCheckFile">
+    <q-btn
+      color="primary"
+      icon="mdi-download"
+      label="ดาวน์โหลดไฟล์"
+      @click="onDownloadFile"
+    />
+  </div>
 </template>
 
 <style scoped></style>
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Header.vue b/src/modules/05_placement/components/probation/FormEvaluation/Header.vue
index 485ece40c..2f7c29eb5 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Header.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Header.vue
@@ -69,7 +69,7 @@ function nextPage() {
         >
           <q-tab v-for="(i, j) in loop" :name="`save${i}`" :key="j">
             <div class="row col-12 items-center">
-              <div class="q-mr-sm">ครั้งที่{{ i }}</div>
+              <div class="q-mr-sm">ครั้งที่ {{ i }}</div>
               <q-btn
                 size="12px"
                 flat