Merge branch 'develop' into devTee

src/modules/05_placement/components/probation/FormEvaluation/Header.vue

@@ -21,6 +21,13 @@ const props = defineProps({
   loop: {
     type: Number,
   },
+  isMax: {
+    required: false,
+    type: Boolean,
+    default() {
+      return false;
+    },
+  },
   addData: {
     type: Function,
     default() {
@@ -114,7 +121,7 @@ function nextPage() {
         </q-tabs>
         <div>
           <q-btn
-            v-if="!checkRoutePermisson && props.checkPermission"
+            v-if="!checkRoutePermisson && props.checkPermission && !isMax"
             color="blue"
             flat
             dense

src/modules/05_placement/components/probation/FormEvaluation/Template1.vue

@@ -130,6 +130,7 @@ onMounted(async () => {
     :loop="probationStore.tabs.length"
     :FileDownload="FileDownload"
     :checkPermission="probationStore?.dataPermissions?.tab2?.isEdit as boolean"
+    :is-max="probationStore.tabs.length === 3"
   />
   <q-tab-panels
     v-model="tab"

src/modules/05_placement/components/probation/FormEvaluation/Template1Commader.vue

@@ -146,6 +146,7 @@ onMounted(async () => {
     :loop="probationStore.tabs.length"
     :FileDownload="FileDownload"
     :checkPermission="probationStore?.dataPermissions?.tab3?.isEdit as boolean"
+    :is-max="probationStore.tabs.length === 3"
   />
   <q-tab-panels
     v-model="tab"

src/modules/05_placement/components/probation/FormEvaluation/Template2.vue

@@ -114,6 +114,7 @@ onMounted(() => {
     :add-data="addData"
     :FileDownload="FileDownload"
     :checkPermission="probationStore?.dataPermissions?.tab4?.isEdit as boolean"
+    :is-max="tabs.length === 2"
   />
 
   <q-tab-panels

src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue

@@ -103,6 +103,7 @@ const changeTab = (tabVal: string) => {
     :add-data="addData"
     :FileDownload="FileDownload"
     :checkPermission="probationStore?.dataPermissions?.tab5?.isEdit as boolean"
+    :is-max="tabs.length === 2"
   />
 
   <q-tab-panels

src/modules/05_placement/components/probation/FormEvaluation/TemplateSummaryScore.vue

@@ -83,7 +83,7 @@ onMounted(() => {
 
   <div class="q-gutter-md" v-else>
     <div class="flex justify-center items-center q-my-md q-gutter-md">
-      ยังไม่ได้ดำเนินการแบบประเมินผล
+      ยังไม่ได้รายงานผลการประเมินฯ
     </div>
   </div>
 </template>

src/modules/05_placement/components/probation/SummaryScore.vue

@@ -55,6 +55,7 @@ const result_option = reactive([
   },
 ]);
 
+const checkDisplay = ref<boolean | null>(null);
 /** get คะแนน */
 async function getReportScore() {
   showLoader();
@@ -98,6 +99,10 @@ async function getReportScore() {
       reason.value = data.reason;
       pass_result.value = data.pass_result;
       evaluate_date.value = data.evaluate_date;
+      checkDisplay.value = true;
+    })
+    .catch((e) => {
+      checkDisplay.value = false;
     })
     .finally(() => {
       hideLoader();
@@ -111,7 +116,12 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="row col-12 q-ma-xs">
+  <div v-if="checkDisplay === false" class="q-gutter-md">
+    <div class="flex justify-center items-center q-my-lg">
+      ยังไม่ได้รายงานผลการประเมินฯ
+    </div>
+  </div>
+  <div v-if="checkDisplay" class="row col-12 q-ma-xs">
     <div class="toptitle text-dark col-12 row items-center q-gutter-md">
       <div>ผลการประเมินการทดลองปฏิบัติหน้าที่ราชการ</div>
     </div>
@@ -232,7 +242,7 @@ onMounted(() => {
 
             <q-item-section
               side
-              v-if="pass_result == 1"
+              v-if="Number(sum_percent) >= 60"
               style="white-space: nowrap; width: 140px"
             >
               ผ่าน (สูงกว่าร้อยละ 60)