Merge branch 'develop' into devTee

src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue

@@ -86,7 +86,7 @@ const baseColumns = ref<QTableColumn[]>([
   {
     name: "unStigma",
     align: "left",
-    label: "ล้างมลทิน",
+    label: "ประเภทคำสั่ง",
     sortable: true,
     field: "unStigma",
     headerStyle: "font-size: 14px",

src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue

@@ -361,8 +361,10 @@ function onSubmit() {
   dialogConfirm(
     $q,
     async () => {
-      showLoader();
+      // showLoader();
       const isEdit = dialogStatus.value === "create" ? false : true;
+
+      console.log("isEdit", isEdit);
       const url = isEdit
         ? config.API.profileNewEducationByEducationId(
             editId.value,
@@ -391,7 +393,7 @@ function onSubmit() {
           ? educationData.durationYear === ""
             ? null
             : educationData.durationYear
-          : undefined,
+          : educationData.durationYear,
         finishDate: convertDateToAPI(educationData.finishDate),
         startDate: convertDateToAPI(educationData.startDate),
         endDate: convertDateToAPI(educationData.endDate),
@@ -805,6 +807,7 @@ onMounted(async () => {
           "
           :close="closeDialog"
         />
+
         <q-separator />
         <q-card-section>
           <div class="row q-col-gutter-sm">