src/modules/13_salary/components/04_salaryLists/TabMain.vue

@@ -40,7 +40,6 @@ const props = defineProps({
   roundFilter: { type: Object, require: true },
   snapShot: { type: String, require: true },
   revisionId: { type: String, require: true },
-  ancestorDNA: { type: String, require: true },
 });
 
 const total = ref<number>(0);
@@ -351,7 +350,7 @@ function onClickDownload(data: DataOption, type: string = "xlsx") {
         data.id === "go1"
           ? `${props?.roundFilter?.year}-03-31`
           : `${props?.roundFilter?.year}-09-30`,
-      nodeId: data.id === "go1" ? props.ancestorDNA : props.rootId,
+      nodeId: props.rootId,
       isRetirement: data.id === "go2-01" ? true : undefined,
       revisionId: props.revisionId,
     };

src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue

@@ -41,7 +41,6 @@ const props = defineProps({
   roundFilter: { type: Object, require: true },
   snapShot: { type: String, require: true },
   revisionId: { type: String, require: true },
-  ancestorDNA: { type: String, require: true },
 });
 
 const splitterModel = ref<number>(13);
@@ -326,7 +325,7 @@ async function onClickDownload(data: DataOption, type: string = "xlsx") {
         data.id === "emp-08"
           ? `${props?.roundFilter?.year}-03-31`
           : `${props?.roundFilter?.year}-09-30`,
-      nodeId: data.id === "emp-08" ? props.ancestorDNA : props.rootId,
+      nodeId: props.rootId,
       revisionId: props.revisionId,
     };
     await http

src/modules/13_salary/interface/index/Main.ts

@@ -4,7 +4,6 @@ interface DataOption {
   type?: string;
   typeName?: string;
   keyId?: string;
-  ancestorDNA?: string;
 }
 
 interface DataOptionShort {

src/modules/13_salary/views/04_salaryLists.vue

@@ -89,13 +89,6 @@ const commandTypeCodeArray = computed(() => {
   }
 });
 
-const ancestorDNA = computed(() => {
-  return (
-    agencyOptionsMain.value.find((e) => e.id === agencyFilter.value)
-      ?.ancestorDNA || ""
-  );
-});
-
 /** function เรียกข้อมูลรอบการขึ้นเงินเดือน*/
 async function getRound() {
   showLoader();
@@ -216,7 +209,6 @@ async function getAgency(id: string) {
           data.map((x: DataAgency) => ({
             id: x.id,
             name: x.orgRootName,
-            ancestorDNA: x.ancestorDNA,
           }))
         );
         agencyOptions.value = agencyOptionsMain.value;
@@ -570,6 +562,7 @@ onMounted(async () => {
         @update:model-value="onChangeSnap"
         :disable="!isDisable"
       />
+
       <q-select
         :readonly="checkPermission($route)?.attrOwnership === 'STAFF'"
         v-model="agencyFilter"
@@ -627,7 +620,6 @@ onMounted(async () => {
         :round-filter="roundFilter"
         :snap-shot="snapFilter"
         :revision-id="roundFilter.revisionId"
-        :ancestorDNA="ancestorDNA"
       />
       <q-card v-else class="q-pa-sm">
         <div class="q-pa-sm">

src/modules/13_salary/views/05_salaryListsEmployee.vue

@@ -88,13 +88,6 @@ const commandTypeCodeArray = computed(() => {
   }
 });
 
-const ancestorDNA = computed(() => {
-  return (
-    agencyOptionsMain.value.find((e) => e.id === agencyFilter.value)
-      ?.ancestorDNA || ""
-  );
-});
-
 /**
  * function เรียกข้อมูลรอบการขึ้นค่าจ้าง
  */
@@ -212,7 +205,6 @@ async function getAgency(id: string) {
           data.map((x: DataAgency) => ({
             id: x.id,
             name: x.orgRootName,
-            ancestorDNA: x.ancestorDNA,
           }))
         );
         agencyOptions.value = agencyOptionsMain.value;
@@ -571,7 +563,6 @@ onMounted(async () => {
         :round-filter="roundFilter"
         :snap-shot="snapFilter"
         :revision-id="roundFilter.revisionId"
-        :ancestorDNA="ancestorDNA"
       />
       <q-card v-else class="q-pa-sm">
         <div class="q-pa-sm">