Merge branch 'develop' into devTee

src/interface/request/main/main.ts

@@ -107,6 +107,12 @@ const menuList = readonly<any[]>([
         path: "KPICompetency",
         role: "evaluateKPI",
       },
+      {
+        key: 2.0,
+        label: "ยุทธศาสตร์",
+        path: "developmentStrategic",
+        role: "development",
+      },
     ],
   },
   {
@@ -575,7 +581,7 @@ const menuList = readonly<any[]>([
         role: "salary",
       },
       {
-        label: "รอบการขึ้นเงินเดือน",
+        label: "รอบการเลื่อนเงินเดือน",
         path: "salaryRound",
         role: "salary",
       },
@@ -637,11 +643,6 @@ const menuList = readonly<any[]>([
         path: "developmentScholarship",
         role: "development",
       },
-      {
-        label: "ยุทธศาสตร์",
-        path: "developmentStrategic",
-        role: "development",
-      },
     ],
   },
 ]);

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

@@ -274,6 +274,7 @@ onMounted(() => {
               option-value="id"
               emit-value
               map-options
+              @update:model-value="fetchListProjectNew"
             />
           </div>
           <div class="col-2">
@@ -350,17 +351,25 @@ onMounted(() => {
             </template>
             <template v-slot:body="props">
               <q-tr :props="props" class="cursor-pointer">
-                <q-td
-                  v-for="col in props.cols"
-                  :key="col.name"
-                  :props="props"
-                  @click="onClickAddOrView(true, props.row.id)"
-                >
+                <q-td v-for="col in props.cols" :key="col.name" :props="props">
                   <div class="table_ellipsis">
                     {{ col.value ? col.value : "-" }}
                   </div>
                 </q-td>
                 <q-td>
+                  <q-btn
+                    color="primary"
+                    flat
+                    dense
+                    round
+                    class="q-mr-xs"
+                    size="14px"
+                    icon="mdi-pencil-outline"
+                    clickable
+                    @click="onClickAddOrView(true, props.row.id)"
+                  >
+                    <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+                  </q-btn>
                   <q-btn
                     flat
                     round