Merge branch 'develop' into dev-tee

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

@@ -95,8 +95,7 @@ const fecthAssign = async () => {
   showLoader();
   await http
     .get(config.API.evaluateCreate(assignId.value))
-    .then(async (res: any) => {
-      console.log(res);
+    .then(async (res) => {
       if (props.action == "add") {
         person.value = res.data.data.person;
         commander.value = res.data.data.commander;

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

@@ -6,7 +6,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useRouter, useRoute } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
-import criterion from "@/modules/05_placement/components/Other/Criterion.vue"
+import criterion from "@/modules/05_placement/components/Other/Criterion.vue";
 
 const router = useRouter();
 const routeName = router.currentRoute.value.name;
@@ -28,9 +28,7 @@ const {
 const route = useRoute();
 const assignId = ref<string>(route.params.form.toString());
 const personalId = ref<string>(route.params.personalId.toString());
-const saveEdit = (id: string) => {
-  dialogConfirm($q, () => console.log("save"));
-};
+
 const edit = () => {
   status.value = true;
 };
@@ -87,7 +85,6 @@ const fecthAssign = async () => {
       chairman.value = res.data.data.chairman;
       commander.value = res.data.data.commander;
       mentors.value = res.data.data.mentors;
-      console.log(commander.value.name);
     })
     .catch((e) => {
       messageError($q, e);

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

@@ -265,7 +265,7 @@ const savaForm = () => {
         alerts[index + 11].value = true;
       }
     });
-    console.log(evaluate_expenct_level.value);
+    
 
     dialogMessageNotify($q, "กรุณากรอกข้อมูลให้ครบ");
   } else {
@@ -346,13 +346,13 @@ ArrayCountbotton.forEach((variable, index) => {
 });
 watch(lengthevaluate_expenct_level, (newLength) => {
   if (newLength === evaluate_expenct_level.value.length) {
-    console.log(true);
+    
     alerts[0].value = false;
   }
 });
 watch(lengthevaluate_ouptut, (newLength) => {
   if (newLength === evaluate_ouptut.value.length) {
-    console.log(true);
+   
     alerts[1].value = false;
   }
 });

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

@@ -235,8 +235,6 @@ const savaForm = () => {
         alerts[index + 11].value = true;
       }
     });
-    console.log(evaluate_expenct_level.value);
-
     dialogMessageNotify($q, "กรุณากรอกข้อมูลให้ครบ");
   } else {
     putformData();
@@ -311,13 +309,13 @@ ArrayCountbotton.forEach((variable, index) => {
 });
 watch(lengthevaluate_expenct_level, (newLength) => {
   if (newLength === evaluate_expenct_level.value.length) {
-    console.log(true);
+    
     alerts[0].value = false;
   }
 });
 watch(lengthevaluate_ouptut, (newLength) => {
   if (newLength === evaluate_ouptut.value.length) {
-    console.log(true);
+
     alerts[1].value = false;
   }
 });

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

@@ -64,9 +64,6 @@ const result_option = ref<any>([
 const note = ref<string>("");
 const date = ref<Date>(new Date());
 
-const saveEdit = (id: string) => {
-  dialogConfirm($q, () => console.log("save"));
-};
 const edit = () => {
   status.value = true;
 };
@@ -349,24 +346,24 @@ onMounted(() => {
     </div>
     <div class="row col-12 q-gutter-lg q-mt-md">
       <div class="col-xs-12 col-sm-6">
-            <div class="col-12 text-top0 items-center">
-              ผลการพัฒนาข้าราชการที่อยู่ระหว่างการทดลองปฏิบัติหน้าที่ราชการ
-            </div>
-            <div class="col-12">
-              <q-select
-                class="col-12"
-                dense
-                v-model="develop_result"
-                outlined
-                :options="result_option"
-                option-label="name"
-                option-value="value"
-                map-options
-                emit-value
-                :disable="!status"
-              />
-            </div>
-          </div>
+        <div class="col-12 text-top0 items-center">
+          ผลการพัฒนาข้าราชการที่อยู่ระหว่างการทดลองปฏิบัติหน้าที่ราชการ
+        </div>
+        <div class="col-12">
+          <q-select
+            class="col-12"
+            dense
+            v-model="develop_result"
+            outlined
+            :options="result_option"
+            option-label="name"
+            option-value="value"
+            map-options
+            emit-value
+            :disable="!status"
+          />
+        </div>
+      </div>
 
       <div class="col-xs-12 col-sm-11">
         <div class="col-12 text-top0 row items-center">
@@ -434,7 +431,9 @@ onMounted(() => {
                     dense
                     :disable="!status"
                     class="full-width datepicker"
-                    :model-value="evaluate_date != null ? date2Thai(evaluate_date) : null"
+                    :model-value="
+                      evaluate_date != null ? date2Thai(evaluate_date) : null
+                    "
                     :rules="[(val) => !!val || `${'วัน เดือน ปี ที่ประเมิน'}`]"
                   >
                     <template v-slot:prepend>
@@ -472,8 +471,8 @@ onMounted(() => {
 .q-rating__icon {
   text-shadow: transparent !important;
 }
-.color-txt{
-  color: black!important;;
+.color-txt {
+  color: black !important;
 }
 .q-card {
   box-shadow: 0px 0px 0px 0px !important;

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

@@ -63,7 +63,7 @@ const getSurveyData = async () => {
       }
     })
     .catch((e) => {
-      console.log(e);
+      messageError($q,e)
     });
 };
 const classBordered = ref<string>("");