Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into develop

* 'develop' of github.com:Frappet/bma-ehr-frontend:
  no message

src/modules/14_KPI/components/indicatorByRole/DetailView.vue

@@ -126,8 +126,7 @@ function onSubmit() {
 
   const body = {
     position: form.position, //ตำแหน่ง
-    year: form.year, //ปีงบประมาณ
+    kpiPeriodId: form.round, //รอบการประเมิน(เมษา->APR, ตุลา->OCT)
-    round: form.round, //รอบการประเมิน(เมษา->APR, ตุลา->OCT)
     including: form.including, //รหัสตัวชี้วัด
     includingName: form.includingName, //ชื่อตัวชี้วัด
     target: form.target, //ค่าเป้าหมาย
@@ -165,7 +164,7 @@ function getDetail() {
     .then((res) => {
       const data = res.data.result;
       form.position = data.position;
-      form.year = data.year;
+      form.year = data.year == null ? 0:data.year;
       form.round = data.round;
       form.including = data.including;
       form.includingName = data.includingName;
@@ -259,6 +258,7 @@ function getRound() {
     });
 }
 
+
 function statusTothai(val: string) {
   switch (val) {
     case "SPECIAL":
@@ -273,9 +273,9 @@ function statusTothai(val: string) {
 }
 
 onMounted(() => {
-  getRound()
   fetchActive();
   getOptions();
+  getRound()
   if (id.value !== "") {
     console.log("edit");
     getDetail();
@@ -334,6 +334,7 @@ onMounted(() => {
               autoApply
               year-picker
               :enableTimePicker="false"
+              @update:model-value="form.round = '',getRound()"
             >
               <template #year="{ year }">{{ year + 543 }}</template>
               <template #year-overlay-value="{ value }">{{
@@ -347,9 +348,10 @@ onMounted(() => {
                   hide-bottom-space
                   outlined
                   :model-value="
-                    form.year === null ? null : Number(form.year) + 543
+                    form.year === 0 ? null : Number(form.year) + 543
                   "
                   :label="`${'ปีงบประมาณ'}`"
+
                 >
                   <template v-slot:prepend>
                     <q-icon

src/modules/14_KPI/views/indicatorByRole.vue

@@ -74,7 +74,7 @@ function fetchList() {
   http
     .get(
       config.API.kpiRoleMainList +
-        `?page=${formFilter.page}&pageSize=${formFilter.pageSize}&kpiPeriodId=${formFilter.round}&position=${formFilter.position}`
+        `?page=${formFilter.page}&pageSize=${formFilter.pageSize}&kpiPeriodId=${formFilter.round}&position=${formFilter.position}&year=2024`
     )
     .then((res) => {
       console.log(res);
@@ -306,6 +306,7 @@ onMounted(async () => {
           option-value="id"
           emit-value
           map-options
+          
           @update:model-value="fetchList"
           style="width: 200px;"
         />