diff --git a/src/api/09_leave/api.leave.ts b/src/api/09_leave/api.leave.ts
index 120aca326..6fc2d10a2 100644
--- a/src/api/09_leave/api.leave.ts
+++ b/src/api/09_leave/api.leave.ts
@@ -45,5 +45,7 @@ export default {
   leaveReportTimeLate: (type: string) => `${leaveReport}/late/${type}`,
 
   leaveReportLeaveday: (type: string) => `${leaveReport}/leaveday/${type}`,
+  leaveReportLeavedayRetire: () => `${leaveReport}/leavedayRetire`,
+
   leaveReportLeave2: (type: string) => `${leaveReport}/leave2/${type}`,
 };
diff --git a/src/api/reports/api.report.ts b/src/api/reports/api.report.ts
index 8570cb24a..fd9421831 100644
--- a/src/api/reports/api.report.ts
+++ b/src/api/reports/api.report.ts
@@ -3,11 +3,11 @@
  */
 import env from "../index";
 const reportOrder = `${env.API_REPORT2_URI}/report/order`;
-const reportRetire = `${env.API_REPORT2_URI}/report/retire`;
-const reportProbation = `${env.API_REPORT2_URI}/report/probation`;
-const reportResign = `${env.API_REPORT2_URI}/report/resign/33`;
-const reportTransfer = `${env.API_REPORT2_URI}/report/transfer`;
-const reportDeceased = `${env.API_REPORT2_URI}/report/deceased`;
+const reportRetire = `${env.API_REPORT_URI}/retirement`;
+const reportProbation = `${env.API_REPORT_URI}/placement/probation`;
+const reportResign = `${env.API_REPORT_URI}/retirement/resign/33`;
+const reportTransfer = `${env.API_REPORT_URI}/placement/transfer`;
+const reportDeceased = `${env.API_REPORT_URI}/retirement/deceased`;
 const reportTemplate = `${env.API_REPORT_TEMPLATE_URI}`;
 
 export default {
diff --git a/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue b/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
index 17a3af36d..e33d0c816 100644
--- a/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
+++ b/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
@@ -70,6 +70,7 @@ const roundOp = ref<DataOption[]>([
   { id: "OCT", name: "รอบตุลาคม" },
 ]);
 
+const nodeDnaId = ref<string>("");
 const nodeplan = ref<NodePlan[]>([]);
 const nodeAgency = ref<OrgTreeNode[]>([]);
 const filter = ref<string>("");
@@ -117,6 +118,7 @@ async function fetchDataById(id: string) {
       planData.strategy = data.strategy;
       planData.strategyId = data.strategyId;
       planData.documentInfoEvidence = data.documentInfoEvidence;
+      nodeDnaId.value = data.nodeDnaId;
 
       // หน่วยงาน/ส่วนราชการ
       const arrayexpandedAgency = [
@@ -168,6 +170,7 @@ function updateSelectedAgency(data: any, isUpdate: boolean = false) {
   } else {
     planData.node = data.orgLevel;
     planData.nodeId = data.orgTreeId;
+    nodeDnaId.value = data.orgTreeDnaId;
   }
   planData.orgRevisionId = data.orgRevisionId;
 }
@@ -185,7 +188,7 @@ function onSubmit() {
       async () => {
         const body = {
           year: year.value == 0 ? null : year.value?.toString(),
-          period: planData.period,
+          period: planData.period ? planData.period : null,
           includingName: planData.includingName,
           target: planData.target,
           unit: planData.unit,
@@ -304,7 +307,6 @@ onMounted(async () => {
                   <template v-slot:append>
                     <q-icon
                       v-if="year && !checkRoute"
-                      
                       name="cancel"
                       class="cursor-pointer"
                       @click.stop.prevent="year = 0"
@@ -551,7 +553,7 @@ onMounted(async () => {
                     <q-item
                       :clickable="!checkRoute"
                       @click.stop="updateSelectedAgency(prop.node)"
-                      :active="planData.nodeId == prop.node.orgTreeId"
+                      :active="nodeDnaId == prop.node.orgTreeDnaId"
                       active-class="my-list-link text-primary text-weight-medium"
                       class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
                     >
diff --git a/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue b/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
index 599b0d996..185d947c9 100644
--- a/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
+++ b/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
@@ -79,6 +79,7 @@ const formScore = reactive<any>({
 
 const positionOp = ref<DataOption[]>([]);
 const positionMainOp = ref<DataOption[]>([]);
+const nodeDnaId = ref<string>("");
 
 /** Option  รอบการประเมิน*/
 const roundOp = ref<DataOption[]>([
@@ -184,8 +185,6 @@ function onSubmit() {
   }
 }
 
-//
-//
 async function getDetail() {
   showLoader();
   await http
@@ -203,6 +202,7 @@ async function getDetail() {
       form.meaning = data.meaning;
       form.formula = data.formula;
       form.documentInfoEvidence = data.documentInfoEvidence;
+      nodeDnaId.value = data.nodeDnaId;
 
       formScore.score1 = data.achievement1;
       formScore.score2 = data.achievement2;
@@ -240,6 +240,7 @@ function updateSelected(data: any) {
   form.node = data.orgLevel;
   form.nodeId = data.orgTreeId;
   form.orgRevisionId = data.orgRevisionId;
+  nodeDnaId.value = data.orgTreeDnaId;
 }
 
 function onResize(size: any) {
@@ -470,7 +471,7 @@ onMounted(() => {
                       <q-item
                         :clickable="!checkRoute"
                         @click.stop="updateSelected(prop.node)"
-                        :active="form.nodeId === prop.node.orgTreeId"
+                        :active="nodeDnaId == prop.node.orgTreeDnaId"
                         active-class="my-list-link text-primary text-weight-medium"
                         class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
                       >
diff --git a/src/modules/01_masterdata/views/indicatorByPlan.vue b/src/modules/01_masterdata/views/indicatorByPlan.vue
index c44098e97..e8cb74971 100644
--- a/src/modules/01_masterdata/views/indicatorByPlan.vue
+++ b/src/modules/01_masterdata/views/indicatorByPlan.vue
@@ -139,7 +139,7 @@ function updateSelectedTreeMain(data: any) {
     nodeData.nodeId = null;
   } else {
     nodeData.node = data.orgLevel;
-    nodeData.nodeId = data.orgTreeId;
+    nodeData.nodeId = data.orgTreeDnaId;
   }
   getSearch();
 }
@@ -246,7 +246,7 @@ onMounted(() => {
                 <q-item
                   clickable
                   @click.stop="updateSelectedTreeMain(prop.node)"
-                  :active="nodeData.nodeId === prop.node.orgTreeId"
+                  :active="nodeData.nodeId === prop.node.orgTreeDnaId"
                   active-class="my-list-link text-primary text-weight-medium"
                   class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
                 >
@@ -352,6 +352,7 @@ onMounted(() => {
           <q-space />
 
           <q-checkbox
+            :disable="nodeData.nodeId === null"
             keep-color
             v-model="isAll"
             label="แสดงทั้งหมด"
diff --git a/src/modules/01_masterdata/views/indicatorByRole.vue b/src/modules/01_masterdata/views/indicatorByRole.vue
index 50e2f24fb..caa472d1a 100644
--- a/src/modules/01_masterdata/views/indicatorByRole.vue
+++ b/src/modules/01_masterdata/views/indicatorByRole.vue
@@ -191,7 +191,7 @@ function filterOption(val: any, update: Function) {
 
 /** ดึงข้อมูลตำแหน่ง */
 async function getOptions() {
-  showLoader();
+  // showLoader();
   await http
     .get(config.API.orgSalaryPosition)
     .then(async (res) => {
@@ -218,14 +218,10 @@ async function getOptions() {
       messageError($q, err);
     })
     .finally(() => {
-      hideLoader();
+      // hideLoader();
     });
 }
 
-function setModel(val: string) {
-  formFilter.position = val;
-}
-
 /**
  * เปิด dialog history
  * @param id
@@ -248,7 +244,7 @@ function onClickHistory(id: string) {
 }
 
 async function getTotal() {
-  showLoader();
+  // showLoader();
   await http
     .post(config.API.indicatorSummary)
     .then(async (res) => {
@@ -264,12 +260,15 @@ async function getTotal() {
       messageError($q, e);
     })
     .finally(() => {
-      hideLoader();
+      // hideLoader();
     });
 }
 
 onMounted(async () => {
-  await Promise.all([getTotal(), getOptions(), fetchList()]);
+  showLoader();
+  await Promise.all([getTotal(), getOptions(), fetchList()]).finally(() => {
+    hideLoader();
+  });
 });
 </script>
 
@@ -572,7 +571,7 @@ onMounted(async () => {
                 }}
               </div>
 
-              <div v-else >
+              <div v-else>
                 {{ col.value ? col.value : "-" }}
               </div>
             </q-td>
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
index f65c1dab8..481bedfdd 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
@@ -271,7 +271,7 @@ function changeReson52(val: number) {
         reson52.value = "เห็นควรให้ออกจากราชการ";
         break;
       case 3:
-        reson52.value = `เห็นควรให้ขยายเวลาทดลองปฏิบัตหน้าที่ราชการต่อไปอีก ${
+        reson52.value = `เห็นควรให้ขยายเวลาทดลองปฏิบัติหน้าที่ราชการต่อไปอีก ${
           expand_month.value ? expand_month.value : ""
         } เดือน`;
         break;
@@ -523,7 +523,7 @@ onMounted(async () => {
             <div class="row q-mt-xs" v-if="result === 3">
               <q-input
                 outlined
-                @update:model-value="changeReson52(3)"
+                @change="changeReson52(3)"
                 dense
                 v-model="expand_month"
                 label="จำนวนเดือน"
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template1Commader.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template1Commader.vue
index 77e43d5fc..e0f0f4ec7 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template1Commader.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template1Commader.vue
@@ -53,7 +53,7 @@ async function fecthAssign(id: string) {
       // messageError($q, e);
     })
     .finally(() => {
-      probationStore.checkLoad && hideLoader();
+      hideLoader();
     });
 }
 
diff --git a/src/modules/13_salary/components/04_salaryLists/Dashboard.vue b/src/modules/13_salary/components/04_salaryLists/Dashboard.vue
index 9dde8731d..eeacc9b21 100644
--- a/src/modules/13_salary/components/04_salaryLists/Dashboard.vue
+++ b/src/modules/13_salary/components/04_salaryLists/Dashboard.vue
@@ -15,12 +15,11 @@ import type {
 } from "@/modules/13_salary/interface/index/Main";
 import type { ResSalaryOrg } from "@/modules/13_salary/interface/response/SalaryList";
 
-/** importStore*/
-
 /** use*/
 const $q = useQuasar();
 const store = useSalaryListSDataStore();
-const { messageError, showLoader, hideLoader,onSearchDataTable } = useCounterMixin();
+const { messageError, showLoader, hideLoader, onSearchDataTable } =
+  useCounterMixin();
 
 /** props*/
 const props = defineProps({
@@ -389,9 +388,7 @@ const columns = computed(() => {
   return columnsss;
 });
 
-/**
- * function fetch ข้อมูลสถิติ
- */
+/** function fetch ข้อมูลสถิติ*/
 async function fetchDataDashboard() {
   showLoader();
   const formData = {
@@ -561,7 +558,6 @@ watch([() => props?.snapShot, () => props.roundFilter], () => {
             map-options
             :options="columns"
             option-value="name"
-            
             style="min-width: 140px"
           />
         </div>
diff --git a/src/modules/13_salary/components/04_salaryLists/TabMain.vue b/src/modules/13_salary/components/04_salaryLists/TabMain.vue
index 2acee0243..b606e5192 100644
--- a/src/modules/13_salary/components/04_salaryLists/TabMain.vue
+++ b/src/modules/13_salary/components/04_salaryLists/TabMain.vue
@@ -311,7 +311,7 @@ function fetchDataPeriodNew() {
 
 function onClickDownload(data: DataOption, type: string = "xlsx") {
   showLoader();
-  if (data.id === "go1" || data.id === "go2") {
+  if (data.id === "go1" || data.id === "go2" || data.id === "go2-01") {
     const formData = {
       type: "HAFT",
       startDate:
@@ -323,12 +323,17 @@ function onClickDownload(data: DataOption, type: string = "xlsx") {
           ? `${props?.roundFilter?.year}-03-31`
           : `${props?.roundFilter?.year}-09-30`,
       nodeId: props.rootId,
+      isRetirement: data.id === "go2-01" ? true : undefined,
     };
+    const pathApi =
+      data.id === "go2-01"
+        ? config.API.leaveReportLeavedayRetire()
+        : config.API.leaveReportLeaveday("officer");
     http
-      .post(config.API.leaveReportLeaveday("officer"), formData)
-      .then((res) => {
+      .post(pathApi, formData)
+      .then(async (res) => {
         const dataList = res.data.result;
-        genReportXLSX(dataList, data.name);
+        await genReportXLSX(dataList, data.name);
       })
       .catch((e) => {
         messageError($q, e);
@@ -358,9 +363,9 @@ function onClickDownload(data: DataOption, type: string = "xlsx") {
       const finalUrl = isGovernmentId ? `${url}/${store.tabGroup}` : url;
       http
         .get(finalUrl)
-        .then((res) => {
+        .then(async (res) => {
           const dataList = res.data.result;
-          genReportXLSX(dataList, data.name, type);
+          await genReportXLSX(dataList, data.name, type);
         })
         .catch((e) => {
           messageError($q, e);
@@ -383,7 +388,7 @@ onMounted(() => {
 
 const isRetire = ref<boolean>(false);
 const updateIsShowRetire = async () => {
-  isRetire.value = await !isRetire.value;
+  isRetire.value = !isRetire.value;
   fetchDataPeriodNew();
 };
 </script>
diff --git a/src/modules/13_salary/views/04_salaryLists.vue b/src/modules/13_salary/views/04_salaryLists.vue
index 763e300b8..360136b2f 100644
--- a/src/modules/13_salary/views/04_salaryLists.vue
+++ b/src/modules/13_salary/views/04_salaryLists.vue
@@ -69,14 +69,6 @@ const titleCommand = computed(() => {
       break;
   }
   return `ปีงบประมาณ ${year.value + 543} รอบการขึ้นเงินเดือน ${txt}`;
-
-  // return `ปีงบประมาณ ${year.value + 543} รอบการขึ้นเงินเดือน ${
-  //   roundFilter.value?.shortCode === "SPECIAL"
-  //     ? roundFilter.value?.name
-  //       ? roundFilter.value?.name
-  //       : ""
-  //     : `1 ${roundFilter.value?.name ? roundFilter.value?.name : ""}`
-  // } `;
 });
 
 /**
@@ -140,6 +132,7 @@ async function getRound() {
 
 /**
  * function เรียกรอบ
+ * @param code  value รอบเงินเดือน
  */
 async function getSnap(code: string) {
   snapOptions.value =
@@ -287,9 +280,7 @@ async function fetchSalalyPeriod(
   }
 }
 
-/**
- * function เปลี่ยนรอบการขั้นเงินเดือน
- */
+/** function เปลี่ยนรอบการขั้นเงินเดือน*/
 async function onChangeRound() {
   // เก็บสถานะการปิดรอบในตัวแปร isClosedRound เพื่อใช้ในการเช็ค
   store.isClosedRound = roundFilter.value.isClose;
@@ -309,11 +300,8 @@ async function onChangeRound() {
   }
 }
 
-/**
- * function เปลี่ยนรอบ
- */
+/** function เปลี่ยนรอบ*/
 async function onChangeSnap() {
-  // agencyFilter.value = "";
   if (agencyFilter.value && roundFilter.value.id && snapFilter.value) {
     await fetchSalalyPeriod(
       agencyFilter.value,
@@ -323,9 +311,7 @@ async function onChangeSnap() {
   }
 }
 
-/**
- * function เปลี่ยนหน่วยงาน
- */
+/** function เปลี่ยนหน่วยงาน*/
 async function onChangeAgency() {
   store.rootId = agencyFilter.value;
   if (
@@ -341,9 +327,7 @@ async function onChangeAgency() {
   }
 }
 
-/**
- *  function fetch PeriodQuota
- */
+/**  function fetch PeriodQuota*/
 function getQuota() {
   http
     .get(config.API.salaryListPeriodQuota(store.groupId))
diff --git a/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue b/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue
index 187fdbfe5..71d40cb16 100644
--- a/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue
@@ -105,7 +105,7 @@ const title = computed(() => {
 
 /** ดึงข้อมูล งานตามแผนปฏิบัติราชการประจำปี */
 function fetchListPlan() {
-  formFilter.nodeId = store.dataProfile.nodeId;
+  formFilter.nodeId = store.dataProfile.nodeDnaId;
   formFilter.node = store.dataProfile.node;
   formFilter.year = formFilter?.year ? formFilter.year.toString() : "";
   formFilter.keyword = formFilter.keyword.trim();
@@ -166,7 +166,7 @@ function fetchListPlanByid(id: string) {
 
 /** ดึงข้อมูล งานตามหน้าที่ความรับผิดชอบหลัก */
 function fetchListRole() {
-  formFilter.nodeId = store.dataProfile.nodeId;
+  formFilter.nodeId = store.dataProfile.nodeDnaId;
   formFilter.node = store.dataProfile.node;
   formFilter.year = formFilter?.year ? formFilter.year.toString() : "";
   formFilter.position = store.dataProfile.position;
@@ -224,7 +224,7 @@ function fetchRoleByid(id: string) {
 
 /** ดึงข้อมูล งานอื่นๆ ที่ได้รับมอบหมาย */
 function fetchListSpecial() {
-  formFilter.nodeId = store.dataProfile.nodeId;
+  formFilter.nodeId = store.dataProfile.nodeDnaId;
   formFilter.node = store.dataProfile.node;
   formFilter.year = formFilter?.year ? formFilter.year.toString() : "";
 
diff --git a/src/modules/15_development/components/BasicInfo.vue b/src/modules/15_development/components/BasicInfo.vue
index f9effcd94..627877a1e 100644
--- a/src/modules/15_development/components/BasicInfo.vue
+++ b/src/modules/15_development/components/BasicInfo.vue
@@ -47,6 +47,7 @@ const orgName = ref<string>(""); //ชื่อ หน่วยงาน/ส่
 const node = ref<any[]>([]); //โครงสร้าง หน่วยงาน/ส่วนราชการ
 const filter = ref<string>(""); //input ค้นหา
 const expanded = ref<string[]>([]);
+const nodeDnaId = ref<string>('');
 
 /**
  * function fetch ข้อมูลเบื้องต้น
@@ -66,6 +67,7 @@ async function fetchData(id: string) {
       formData.nodeId = data.nodeId;
       formData.node = data.node;
       formData.orgRevisionId = data.revisionId;
+      nodeDnaId.value = data.nodeDnaId
 
       const arrayExpanded = [
         data.root,
@@ -124,6 +126,7 @@ function updateSelected(data: DataTree) {
   formData.node = data.orgLevel;
   formData.nodeId = data.orgTreeId;
   formData.orgRevisionId = data.orgRevisionId;
+  nodeDnaId.value = data.orgTreeDnaId
   props.onCheckChangeData();
 }
 
@@ -186,7 +189,7 @@ onMounted(async () => {
                   clickable
                   :disable="checkRoutePermission"
                   @click.stop="updateSelected(prop.node)"
-                  :active="formData.nodeId === prop.node.orgTreeId"
+                  :active="nodeDnaId === prop.node.orgTreeDnaId"
                   active-class="my-list-link text-primary text-weight-medium"
                   class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
                 >