src/modules/03_recruiting/components/Table.vue

@@ -56,7 +56,6 @@ const optionsStatus = ref<ExamResultOption[]>([
   { label: "ขาดสอบ", value: "missed_exam" },
   { label: "ผ่าน", value: "pass" },
   { label: "ไม่ผ่าน", value: "notpass" },
-  { label: "อื่น ๆ", value: "other" },
 ]);
 
 const emit = defineEmits([

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

@@ -97,8 +97,6 @@ const develop_result_option = ref<any>([
 
 const isCheckFile = ref<boolean>(false);
 
-const isSelectionPartfour = ref<boolean>(false);
-
 // score
 const score1 = computed(() => {
   if (
@@ -214,21 +212,20 @@ const percent_sum: any = computed(() => {
 });
 const score4 = computed(() => {
   return (
-    Number(orientation.value) +
+    (Number(orientation.value) +
-    Number(self_learning.value) +
+      Number(self_learning.value) +
-    Number(training_seminar.value) +
+      Number(training_seminar.value) +
-    (isSelectionPartfour.value ? Number(other_training.value) : 0)
+      Number(other_training.value)) /
+    4
   );
 });
 const score5 = computed(() => {
-  const rawTotal =
+  const total =
     (Number(orientation_percent.value) +
       Number(self_learning_percent.value) +
       Number(training_seminar_percent.value) +
       Number(other_training_percent.value)) /
-    (isSelectionPartfour.value ? 4 : 3);
+    4;
-
-  const total = Math.trunc(rawTotal);
 
   develop_result.value = total > 60 ? 1 : 0;
 
@@ -1136,20 +1133,10 @@ onMounted(async () => {
               <q-separator class="q-my-xs" />
               <div class="row q-gutter-md align-center q-pl-md">
                 <div class="col-8">
-                  <q-checkbox
-                    class="q-mr-sm"
-                    dense
-                    v-model="isSelectionPartfour"
-                    @update:model-value="
-                      other_training = 0;
-                      other_training_percent = 0;
-                    "
-                  />
                   4. การอบรมอื่น ๆ ตามที่หน่วยงานกำหนด (ถ้ามี)
                 </div>
                 <div class="col">
                   <q-input
-                    :disable="!isSelectionPartfour"
                     outlined
                     dense
                     type="number"
@@ -1161,7 +1148,6 @@ onMounted(async () => {
                 </div>
                 <div class="col">
                   <q-input
-                    :disable="!isSelectionPartfour"
                     outlined
                     dense
                     type="number"

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

@@ -90,8 +90,6 @@ const develop_result_option = ref<any>([
 // footer
 const dateAutherise = ref<any>(null);
 
-const isSelectionPartfour = ref<boolean>(false);
-
 onMounted(() => {
   fecthAssign(assignId.value);
 });
@@ -241,21 +239,20 @@ const percent_sum: any = computed(() => {
 });
 const score4 = computed(() => {
   return (
-    Number(orientation.value) +
+    (Number(orientation.value) +
-    Number(self_learning.value) +
+      Number(self_learning.value) +
-    Number(training_seminar.value) +
+      Number(training_seminar.value) +
-    (isSelectionPartfour.value ? Number(other_training.value) : 0)
+      Number(other_training.value)) /
+    4
   );
 });
 const score5 = computed(() => {
-  const rawTotal =
+  const total =
     (Number(orientation_percent.value) +
       Number(self_learning_percent.value) +
       Number(training_seminar_percent.value) +
       Number(other_training_percent.value)) /
-    (isSelectionPartfour.value ? 4 : 3);
+    4;
-
-  const total = Math.trunc(rawTotal);
 
   develop_result.value = total > 60 ? 1 : 0;
 
@@ -1217,20 +1214,10 @@ watch(lengthdiscipline_level, (newLength) => {
                   <q-separator class="q-my-xs" />
                   <div class="row q-gutter-md align-center q-pl-md">
                     <div class="col-8">
-                      <q-checkbox
-                        class="q-mr-sm"
-                        dense
-                        v-model="isSelectionPartfour"
-                        @update:model-value="
-                          other_training = 0;
-                          other_training_percent = 0;
-                        "
-                      />
                       4. การอบรมอื่น ๆ ตามที่หน่วยงานกำหนด (ถ้ามี)
                     </div>
                     <div class="col">
                       <q-input
-                        :disable="!isSelectionPartfour"
                         outlined
                         dense
                         type="number"
@@ -1244,7 +1231,6 @@ watch(lengthdiscipline_level, (newLength) => {
                         outlined
                         dense
                         type="number"
-                        :disable="!isSelectionPartfour"
                         v-model="other_training_percent"
                         :rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
                         hide-bottom-space

src/stores/mixin.ts

@@ -362,21 +362,13 @@ export const useCounterMixin = defineStore("mixin", () => {
   const messageError = (q: any, e: any = "", msg: string = "") => {
     if (e.response !== undefined) {
       if (e.response.data.status !== undefined) {
-        if (
+        if (e.response.data.status == 401) {
-          e.response.data.status == 401 ||
-          (e.response.data.status == 404 &&
-            e.response.data.message == "ไม่พบข้อมูลสิทธิ์")
-        ) {
           //invalid_token
-          const msg =
-            e.response.data.status == 401
-              ? "ล็อกอินหมดอายุ กรุณาล็อกอินใหม่อีกครั้ง"
-              : e.response.data.message;
           q.dialog({
             component: CustomComponent,
             componentProps: {
               title: `พบข้อผิดพลาด`,
-              message: msg,
+              message: `ล็อกอินหมดอายุ กรุณาล็อกอินใหม่อีกครั้ง`,
               icon: "warning",
               color: "red",
               onlycancel: true,