Merge branch 'nice' into develop

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

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>