fix ระบบพัฒนาบุคคล

src/modules/15_development/components/history/AddPage.vue

@@ -60,9 +60,9 @@ function getClass() {
 }
 
 /** ดึงข้อมูล */
-function fetchData() {
+async function fetchData() {
   showLoader();
-  http
+  await http
     .get(config.API.developmentHistoryListByid("officer", id.value))
     .then((res) => {
       const data = res.data.result;
@@ -104,9 +104,9 @@ function fetchData() {
 }
 
 /** ดึงข้อมูลเมื่อคอมโพเนนต์โหลดเสร็จสมบูรณ์  */
-onMounted(() => {
+onMounted(async () => {
   if (id.value) {
-    fetchData();
+    await fetchData();
   }
 });
 </script>
@@ -232,7 +232,11 @@ onMounted(() => {
                 </div>
 
                 <div class="col-12 col-sm-12 col-md-7">
-                  {{ Number(formMainProject.year) + 543 ?? "-" }}
+                  {{
+                    formMainProject.year
+                      ? Number(formMainProject.year) + 543
+                      : "-"
+                  }}
                 </div>
               </div>
               <div class="row col-12">

src/modules/15_development/components/history/DialogGov.vue

@@ -254,7 +254,6 @@ watch(
               :options="govOp"
               map-options
               emit-value
-              :class="getClass()"
               @update:model-value="inputSearch = ''"
             />
           </div>
@@ -264,7 +263,6 @@ watch(
               outlined
               label="ค้นหา"
               v-model="inputSearch"
-              :class="getClass()"
               :mask="search === 'citizenId' ? '#############' : undefined"
             />
           </div>
@@ -274,7 +272,7 @@ watch(
               class="full-width full-height"
               unelevated
               color="teal"
-              @click="searchFilter()"
+              @click="(formFilter.page = 1), searchFilter()"
             >
             </q-btn>
           </div>

src/modules/15_development/components/historyEmployee/AddPage.vue

@@ -235,7 +235,11 @@ onMounted(() => {
                 </div>
 
                 <div class="col-12 col-sm-12 col-md-7">
-                  {{ Number(formMainProject.year) + 543 ?? "-" }}
+                  {{
+                    formMainProject.year
+                      ? Number(formMainProject.year) + 543
+                      : "-"
+                  }}
                 </div>
               </div>
               <div class="row col-12">