diff --git a/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue b/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue
index 11aa18083..ed676f086 100644
--- a/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue
+++ b/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue
@@ -57,7 +57,7 @@ const statusReport = ref<boolean>();
 const dataProfile = ref<Object>([]);
 
 /** คอลัมน์ที่แสดง */
-const columns = ref<any["columns"]>([
+const columns = computed(() => [
   {
     name: "order",
     label: "ลำดับ",
@@ -79,7 +79,7 @@ const columns = ref<any["columns"]>([
   {
     name: "position",
     align: "left",
-    label: "ตำแหน่ง",
+    label: `ตำแหน่ง ${employeeType.value == "OFFICER" ? "(ในสายงาน)" : ""}`,
     title: "ตำแหน่ง",
     subtitle: employeeType.value == "OFFICER" ? "ในสายงาน" : "",
     field: "position",
@@ -89,7 +89,9 @@ const columns = ref<any["columns"]>([
   {
     name: "positionType",
     align: "left",
-    label: "ตำแหน่ง",
+    label: `ตำแหน่ง (${
+      employeeType.value == "OFFICER" ? "ประเภท" : "กลุ่มงาน"
+    })`,
     title: "ตำแหน่ง",
     subtitle: employeeType.value == "OFFICER" ? "ประเภท" : "กลุ่มงาน",
     field: "positionType",
@@ -100,7 +102,7 @@ const columns = ref<any["columns"]>([
   {
     name: "positionNumber",
     align: "left",
-    label: "ตำแหน่ง (เลขที่) ",
+    label: "ตำแหน่ง (เลขที่)",
     title: "ตำแหน่ง",
     subtitle: "เลขที่",
     field: "positionNumber",
@@ -439,6 +441,7 @@ onMounted(async () => {
       @click="backHistory"
     />
     รายชื่อผู้เกษียณอายุราชการ
+    {{ employeeType === "OFFICER" ? "ข้าราชการ กทม.สามัญ" : "ลูกจ้างประจำ" }}
   </div>
   <div>
     <q-card class="col-12 q-pa-md">
diff --git a/src/modules/08_registryEmployee/components/DialogSelectPos.vue b/src/modules/08_registryEmployee/components/DialogSelectPos.vue
index 92b88294c..0f9c090ed 100644
--- a/src/modules/08_registryEmployee/components/DialogSelectPos.vue
+++ b/src/modules/08_registryEmployee/components/DialogSelectPos.vue
@@ -82,6 +82,9 @@ const columns = ref<QTableProps["columns"]>([
     label: "ตำแหน่งเลขที่",
     sortable: true,
     field: "posMasterNo",
+    format(val, row) {
+      return `${row.orgShortname} ${row.posMasterNo}`;
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue
index f64d86eff..f2ea25601 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue
@@ -162,9 +162,7 @@ async function copyLink(name: string) {
     });
 }
 
-/**
- * function เรียกข้อมูลวันที่ประกาศ
- */
+/** function เรียกข้อมูลวันที่ประกาศ */
 async function getDate() {
   showLoader();
   await http
@@ -185,9 +183,8 @@ async function getDate() {
 }
 
 const download10Url = ref<string>("");
-/**
- * function เช็คไฟล์อัปโหลด
- */
+
+/** function เช็คไฟล์อัปโหลด*/
 async function checkDocResult() {
   showLoader();
   await http
@@ -297,7 +294,7 @@ onMounted(async () => {
         >
           <div>บันทึกแจ้งผลการประกาศคัดเลือก</div>
           <q-space />
-          <div>
+          <div v-if="download10Url">
             <q-btn
               :href="download10Url"
               target="_blank"
diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/DialogDirector.vue b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/DialogDirector.vue
index 18b5cc45e..1dfd6d58a 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/DialogDirector.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/DialogDirector.vue
@@ -167,6 +167,7 @@ function onSearch() {
 watchEffect(() => {
   if (props.Modal === true) {
     selected.value = props.selectedRow;
+    filterKeyword2.value = "";
   }
 });
 
@@ -201,7 +202,7 @@ watch(
           outlined
           dense
           class="col-12 q-mb-sm"
-          :model-value="filterKeyword2"
+          v-model="filterKeyword2"
           placeholder="ค้นหารายชื่อ"
           style="max-width: 100%"
           @keydown.enter="onSearch"
diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/DialogMeet.vue b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/DialogMeet.vue
index 3ae02ee09..79a9c5540 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/DialogMeet.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/DialogMeet.vue
@@ -167,6 +167,7 @@ function onSearch() {
 watchEffect(() => {
   if (props.Modal === true) {
     selected.value = props.selectedRow;
+    filterKeyword.value = "";
   }
 });
 
@@ -201,7 +202,7 @@ watch(
           outlined
           dense
           class="col-12 q-mb-sm"
-          :model-value="filterKeyword"
+          v-model="filterKeyword"
           placeholder="ค้นหารายการประชุม"
           style="max-width: 100%"
           @keydown.enter="onSearch"
diff --git a/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue b/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
index 6faac6049..31abb9691 100644
--- a/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
@@ -526,7 +526,7 @@ watch(
               <div class="row q-pa-md q-col-gutter-sm">
                 <div class="col-12">
                   <datepicker
-                    :disable="selected.length === 0"
+                    :readonly="selected.length === 0"
                     menu-class-name="modalfix"
                     v-model="yearDialog"
                     :locale="'th'"
diff --git a/src/modules/14_KPI/components/Tab/Topic/03_Develop.vue b/src/modules/14_KPI/components/Tab/Topic/03_Develop.vue
index 5fe445e7a..82657fe60 100644
--- a/src/modules/14_KPI/components/Tab/Topic/03_Develop.vue
+++ b/src/modules/14_KPI/components/Tab/Topic/03_Develop.vue
@@ -156,10 +156,11 @@ function getDevelop() {
     .then((res) => {
       const data = res.data.result;
       rows.value = data;
-      store.devScoreVal = rows.value.reduce(
+      const total = rows.value.reduce(
         (sum: number, e: any) => sum + e.summary,
         0
       );
+      store.devScoreVal = total / rows.value.length;
     });
 }