From 047f711bbfaa133cab469f5b9bae414cc6f30510 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 22 Jan 2025 17:22:46 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=97?=
 =?UTF-8?q?=E0=B8=94=E0=B8=A5=E0=B8=AD=E0=B8=87=E0=B8=9B=E0=B8=8F=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=AB=E0=B8=99=E0=B9=89?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=A3=E0=B8=B2=E0=B8=8A?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/probation/FormAssign.vue       |  5 ++--
 .../probation/FormEvaluation/FormReport.vue   | 23 ++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue
index b31b3ad2d..f9c183113 100644
--- a/src/modules/05_placement/components/probation/FormAssign.vue
+++ b/src/modules/05_placement/components/probation/FormAssign.vue
@@ -1145,11 +1145,12 @@ onMounted(async () => {
             </q-menu>
           </q-btn>
 
-          <div v-if="!isEdit && !isCheckFile">
+          <div v-if="!isEdit">
             <q-btn
               v-if="
                 !checkRoutePermisson &&
-                probationStore.dataPermissions?.tab1.isEdit
+                probationStore.dataPermissions?.tab1.isEdit &&
+                !isCheckFile
               "
               dense
               flat
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
index a8507d7a3..6e9a31f7f 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
@@ -795,17 +795,6 @@ onMounted(() => {
       </div>
     </q-form>
 
-    <FormUploadFile
-      :group="`รายงานผลครั้งที่${props.tab?.charAt(4)}`"
-      v-model:is-check-file="isCheckFile"
-      :check-route-permisson="checkRoutePermisson"
-      :data-permissions="
-        probationStore.dataPermissions?.tab6.isEdit
-          ? probationStore.dataPermissions?.tab6.isEdit
-          : false
-      "
-    />
-
     <q-toolbar
       class="text-primary"
       v-if="
@@ -817,6 +806,18 @@ onMounted(() => {
       <q-space />
       <q-btn label="บันทึก" color="secondary" @click="savaForm" />
     </q-toolbar>
+
+    <FormUploadFile
+      v-else
+      :group="`รายงานผลครั้งที่${props.tab?.charAt(4)}`"
+      v-model:is-check-file="isCheckFile"
+      :check-route-permisson="checkRoutePermisson"
+      :data-permissions="
+        probationStore.dataPermissions?.tab6.isEdit
+          ? probationStore.dataPermissions?.tab6.isEdit
+          : false
+      "
+    />
   </div>
 </template>