updated

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

@@ -129,6 +129,29 @@ const achievement_result: any = computed(() => {
   }
   return 0;
 });
+
+const score1Per60 = computed(() => {
+  if (
+    etc.value === true &&
+    achievement_other.value.text !== undefined &&
+    achievement_other.value.level !== undefined
+  ) {
+    return (
+      ((learn_level.value +
+        apply_level.value +
+        success_level.value +
+        achievement_other.value.level) /
+        achievement_score_total.value) *
+      60
+    );
+  }
+  return (
+    ((learn_level.value + apply_level.value + success_level.value) /
+      achievement_score_total.value) *
+    60
+  );
+});
+
 const score2 = computed(() => {
   let sum_conduct = conduct_level.value.reduce(
     (sum: number, level: number) => sum + level,
@@ -430,7 +453,8 @@ onMounted(async () => {
           <q-btn
             v-if="
               !checkRoutePermisson &&
-              probationStore.dataPermissions?.tab5.isEdit && !isCheckFile
+              probationStore.dataPermissions?.tab5.isEdit &&
+              !isCheckFile
             "
             dense
             flat
@@ -924,7 +948,7 @@ onMounted(async () => {
                   </q-item-label>
                   <q-item-label caption style="color: #464444">
                     <div class="row text-weight-bold">
-                      <div class="col">{{ score1 }}</div>
+                      <div class="col">{{ score1Per60 }}</div>
                       <div class="col">{{ percent_score1 }}</div>
                     </div>
                   </q-item-label>
@@ -987,7 +1011,7 @@ onMounted(async () => {
                   </q-item-label>
                   <q-item-label caption style="color: #464444">
                     <div class="row text-weight-bold">
-                      <div class="col">{{ score1 + score2 }}</div>
+                      <div class="col">{{ (score1Per60 + score2) / 2 }}</div>
                       <div class="col">{{ percent_sum }}</div>
                     </div>
                   </q-item-label>
@@ -1360,7 +1384,6 @@ onMounted(async () => {
         </div>
 
         <FormUploadFile
-      
           :group="`ประเมินผลคณะกรรมการครั้งที่${props.tab?.charAt(4)}`"
           :check-route-permisson="checkRoutePermisson"
           :data-permissions="

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

@@ -193,7 +193,7 @@ onMounted(async () => {
             v-model="filterKeyword"
             ref="filterRef"
             outlined
-            placeholder="ค้นหา ชื่อ-นามสกุลผู้ทดลองฯ /ตำแหน่ง"
+            placeholder="ค้นหาจากชื่อ-นามสกุล/ตำแหน่งผู้ทดลองฯ"
             @keydown.enter.prevent="getData()"
             style="width: 350px"
           >