diff --git a/src/modules/01_metadata/components/person/Province.vue b/src/modules/01_metadata/components/person/Province.vue index 5bd1497c8..3d30440fa 100644 --- a/src/modules/01_metadata/components/person/Province.vue +++ b/src/modules/01_metadata/components/person/Province.vue @@ -418,7 +418,7 @@ const fetchData = async (load: boolean = false) => { * ฟังชั้นดูข้อมูลประวัติแก้ไขข้อมูลทั้งหมด */ const fetchHistory = async () => { - showLoader(); + // showLoader(); await http .get(config.API.listProvincePublishedHistory) .then((res) => { diff --git a/src/modules/01_metadata/store.ts b/src/modules/01_metadata/store.ts index 23adcab58..f5f2dbee2 100644 --- a/src/modules/01_metadata/store.ts +++ b/src/modules/01_metadata/store.ts @@ -20,6 +20,7 @@ import type { RequestItemsHistoryObject as positionEmployeeGroupResponse } from import type { RequestItemsHistoryObject as positionEmployeeLineResponse } from "@/modules/01_metadata/interface/request/positionEmployee/Line"; import type { RequestItemsHistoryObject as positionEmployeeLevelResponse } from "@/modules/01_metadata/interface/request/positionEmployee/Level"; import type { RequestItemsHistoryObject as positionEmployeeStatusResponse } from "@/modules/01_metadata/interface/request/positionEmployee/Status"; + import type { RequestItemsHistoryObject as positionPathResponse } from "@/modules/01_metadata/interface/request/position/Path"; import type { RequestItemsHistoryObject as positionPathSideResponse } from "@/modules/01_metadata/interface/request/position/PathSide"; import type { RequestItemsHistoryObject as positionExecutiveResponse } from "@/modules/01_metadata/interface/request/position/Executive"; @@ -28,6 +29,7 @@ import type { RequestItemsHistoryObject as positionTypeResponse } from "@/module import type { RequestItemsHistoryObject as positionLineResponse } from "@/modules/01_metadata/interface/request/position/Line"; import type { RequestItemsHistoryObject as positionLevelResponse } from "@/modules/01_metadata/interface/request/position/Level"; import type { RequestItemsHistoryObject as positionStatusResponse } from "@/modules/01_metadata/interface/request/position/Status"; + import type { RequestItemsHistoryObject as organizationResponse } from "@/modules/01_metadata/interface/request/organization/Organization"; import type { RequestItemsHistoryObject as organizationShortNameResponse } from "@/modules/01_metadata/interface/request/organization/ShortName"; import type { RequestItemsHistoryObject as organizationTypeResponse } from "@/modules/01_metadata/interface/request/organization/Type"; @@ -112,88 +114,254 @@ export const useManageDataStore = defineStore("manage", () => { idversion: string; version: string; }>({ data: [], idversion: "", version: "published" }); //list data table - // const dataDistrict = ref<{ - // data: RequestItemsBlood[]; - // idversion: string; - // version: string; - // }>({ data: [], idversion: "", version: "published" }); //list data table - // const draftDistrict = ref<{ - // data: RequestItemsBlood[]; - // idversion: string; - // version: string; - // }>({ data: [], idversion: "", version: "published" }); //list data table - // const dataSubDistrict = ref<{ - // data: RequestItemsHistoryObject[]; - // idversion: string; - // version: string; - // }>({ data: [], idversion: "", version: "published" }); //list data table - // const draftSubDistrict = ref<{ - // data: RequestItemsHistoryObject[]; - // idversion: string; - // version: string; - // }>({ data: [], idversion: "", version: "published" }); //list data table - const dataInsignia = ref([]); //list data table - const draftInsignia = ref([]); //list data table - const dataInsigniaType = ref([]); //list data table - const draftInsigniaType = ref([]); //list data table - const dataPositionEmployee = ref([]); //list data table - const draftPositionEmployee = ref([]); //list data table - const dataPositionEmployeeSide = ref([]); //list data table - const draftPositionEmployeeSide = ref([]); //list data table - const dataPositionEmployeeGroup = ref([]); //list data table - const draftPositionEmployeeGroup = ref([]); //list data table - const dataPositionEmployeeLine = ref([]); //list data table - const draftPositionEmployeeLine = ref([]); //list data table - const dataPositionEmployeeLevel = ref([]); //list data table - const draftPositionEmployeeLevel = ref([]); //list data table - const dataPositionEmployeeStatus = ref([]); //list data table - const draftPositionEmployeeStatus = ref([]); //list data table - const dataPositionPath = ref([]); //list data table - const draftPositionPath = ref([]); //list data table - const dataPositionPathSide = ref([]); //list data table - const draftPositionPathSide = ref([]); //list data table - const dataPositionExecutive = ref([]); //list data table - const draftPositionExecutive = ref([]); //list data table - const dataPositionExecutiveSide = ref([]); //list data table - const draftPositionExecutiveSide = ref([]); //list data table - const dataPositionType = ref([]); //list data table - const draftPositionType = ref([]); //list data table - const dataPositionLine = ref([]); //list data table - const draftPositionLine = ref([]); //list data table - const dataPositionLevel = ref([]); //list data table - const draftPositionLevel = ref([]); //list data table - const dataPositionStatus = ref([]); //list data table - const draftPositionStatus = ref([]); //list data table - const dataOrganization = ref([]); //list data table - const draftOrganization = ref([]); //list data table - const dataOrganizationShortName = ref([]); //list data table - const draftOrganizationShortName = ref([]); //list data table - const dataOrganizationType = ref([]); //list data table - const draftOrganizationType = ref([]); //list data table - const dataOrganizationLevel = ref([]); //list data table - const draftOrganizationLevel = ref([]); //list data table - const dataOrganizationStatus = ref([]); //list data table - const draftOrganizationStatus = ref([]); //list data table - const dataOrganizationTelInternal = ref( - [] - ); //list data table - const draftOrganizationTelInternal = ref( - [] - ); //list data table - const dataOrganizationTelExternal = ref( - [] - ); //list data table - const draftOrganizationTelExternal = ref( - [] - ); //list data table - const dataOrganizationFax = ref([]); //list data table - const draftOrganizationFax = ref([]); //list data table + const dataInsignia = ref<{ + data: InsigniaResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftInsignia = ref<{ + data: InsigniaResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const dataInsigniaType = ref<{ + data: InsigniaTypeResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftInsigniaType = ref<{ + data: InsigniaTypeResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + + const dataPositionEmployee = ref<{ + data: positionEmployeeResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftPositionEmployee = ref<{ + data: positionEmployeeResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const dataPositionEmployeeSide = ref<{ + data: positionEmployeeSideResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftPositionEmployeeSide = ref<{ + data: positionEmployeeSideResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const dataPositionEmployeeGroup = ref<{ + data: positionEmployeeGroupResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftPositionEmployeeGroup = ref<{ + data: positionEmployeeGroupResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const dataPositionEmployeeLine = ref<{ + data: positionEmployeeLineResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftPositionEmployeeLine = ref<{ + data: positionEmployeeLineResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const dataPositionEmployeeLevel = ref<{ + data: positionEmployeeLevelResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftPositionEmployeeLevel = ref<{ + data: positionEmployeeLevelResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const dataPositionEmployeeStatus = ref<{ + data: positionEmployeeStatusResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftPositionEmployeeStatus = ref<{ + data: positionEmployeeStatusResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + + const dataPositionPath = ref<{ + data: positionPathResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftPositionPath = ref<{ + data: positionPathResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const dataPositionPathSide = ref<{ + data: positionPathSideResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftPositionPathSide = ref<{ + data: positionPathSideResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const dataPositionExecutive = ref<{ + data: positionExecutiveResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftPositionExecutive = ref<{ + data: positionExecutiveResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const dataPositionExecutiveSide = ref<{ + data: positionExecutiveSideResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftPositionExecutiveSide = ref<{ + data: positionExecutiveSideResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const dataPositionType = ref<{ + data: positionTypeResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftPositionType = ref<{ + data: positionTypeResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const dataPositionLine = ref<{ + data: positionLineResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftPositionLine = ref<{ + data: positionLineResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const dataPositionLevel = ref<{ + data: positionLevelResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftPositionLevel = ref<{ + data: positionLevelResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const dataPositionStatus = ref<{ + data: positionStatusResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftPositionStatus = ref<{ + data: positionStatusResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + + const dataOrganization = ref<{ + data: organizationResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftOrganization = ref<{ + data: organizationResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const dataOrganizationShortName = ref<{ + data: organizationShortNameResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftOrganizationShortName = ref<{ + data: organizationShortNameResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const dataOrganizationType = ref<{ + data: organizationTypeResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftOrganizationType = ref<{ + data: organizationTypeResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const dataOrganizationLevel = ref<{ + data: organizationLevelResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftOrganizationLevel = ref<{ + data: organizationLevelResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const dataOrganizationStatus = ref<{ + data: organizationStatusResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftOrganizationStatus = ref<{ + data: organizationStatusResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const dataOrganizationTelInternal = ref<{ + data: organizationTelInternalResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftOrganizationTelInternal = ref<{ + data: organizationTelInternalResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const dataOrganizationTelExternal = ref<{ + data: organizationTelExternalResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftOrganizationTelExternal = ref<{ + data: organizationTelExternalResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const dataOrganizationFax = ref<{ + data: organizationFaxResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table + const draftOrganizationFax = ref<{ + data: organizationFaxResponse[]; + idversion: string; + version: string; + }>({ data: [], idversion: "", version: "published" }); //list data table const storeIdVersion = ref(""); //id data ใน mongodb const storeVersion = ref("published"); //รายการข้อมูลล่าสุดได้เผยแพร่หรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - const storeIdVersionPrefix = ref(""); //id data ใน mongodb - const storeVersionPrefix = ref("published"); //รายการข้อมูลล่าสุดได้เผยแพร่หรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + interface manage { link: number; person: { @@ -650,27 +818,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataInsignia.value.length === 0) { + if (dataInsignia.value.data.length === 0) { await fetchInsigniaType(true, selector); - return { - data: draftInsigniaType.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftInsigniaType.value; } else { if (newFetch) { await fetchInsigniaType(true, selector); - return { - data: draftInsigniaType.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftInsigniaType.value; } else { - return { - data: draftInsigniaType.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataInsigniaType.value.data) == + JSON.stringify(draftInsigniaType.value.data) + ) { + return draftInsigniaType.value; + } else { + await fetchInsigniaType(false, selector); + return draftInsigniaType.value; + } } } }; @@ -679,27 +844,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataInsignia.value.length === 0) { + if (dataInsignia.value.data.length === 0) { await fetchInsignia(true, selector); - return { - data: draftInsignia.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftInsignia.value; } else { if (newFetch) { await fetchInsignia(true, selector); - return { - data: draftInsignia.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftInsignia.value; } else { - return { - data: draftInsignia.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataInsignia.value.data) == + JSON.stringify(draftInsignia.value.data) + ) { + return draftInsignia.value; + } else { + await fetchInsignia(false, selector); + return draftInsignia.value; + } } } }; @@ -708,27 +870,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataPositionEmployee.value.length === 0) { + if (dataPositionEmployee.value.data.length === 0) { await fetchPositionEmployee(true, selector); - return { - data: draftPositionEmployee.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionEmployee.value; } else { if (newFetch) { await fetchPositionEmployee(true, selector); - return { - data: draftPositionEmployee.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionEmployee.value; } else { - return { - data: draftPositionEmployee.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataPositionEmployee.value.data) == + JSON.stringify(draftPositionEmployee.value.data) + ) { + return draftPositionEmployee.value; + } else { + await fetchPositionEmployee(false, selector); + return draftPositionEmployee.value; + } } } }; @@ -737,27 +896,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataPositionEmployeeSide.value.length === 0) { + if (dataPositionEmployeeSide.value.data.length === 0) { await fetchPositionEmployeeSide(true, selector); - return { - data: draftPositionEmployeeSide.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionEmployeeSide.value; } else { if (newFetch) { await fetchPositionEmployeeSide(true, selector); - return { - data: draftPositionEmployeeSide.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionEmployeeSide.value; } else { - return { - data: draftPositionEmployeeSide.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataPositionEmployeeSide.value.data) == + JSON.stringify(draftPositionEmployeeSide.value.data) + ) { + return draftPositionEmployeeSide.value; + } else { + await fetchPositionEmployeeSide(false, selector); + return draftPositionEmployeeSide.value; + } } } }; @@ -766,27 +922,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataPositionEmployeeGroup.value.length === 0) { + if (dataPositionEmployeeGroup.value.data.length === 0) { await fetchPositionEmployeeGroup(true, selector); - return { - data: draftPositionEmployeeGroup.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionEmployeeGroup.value; } else { if (newFetch) { await fetchPositionEmployeeGroup(true, selector); - return { - data: draftPositionEmployeeGroup.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionEmployeeGroup.value; } else { - return { - data: draftPositionEmployeeGroup.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataPositionEmployeeGroup.value.data) == + JSON.stringify(draftPositionEmployeeGroup.value.data) + ) { + return draftPositionEmployeeGroup.value; + } else { + await fetchPositionEmployeeGroup(false, selector); + return draftPositionEmployeeGroup.value; + } } } }; @@ -795,27 +948,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataPositionEmployeeLine.value.length === 0) { + if (dataPositionEmployeeLine.value.data.length === 0) { await fetchPositionEmployeeLine(true, selector); - return { - data: draftPositionEmployeeLine.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionEmployeeLine.value; } else { if (newFetch) { await fetchPositionEmployeeLine(true, selector); - return { - data: draftPositionEmployeeLine.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionEmployeeLine.value; } else { - return { - data: draftPositionEmployeeLine.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataPositionEmployeeLine.value.data) == + JSON.stringify(draftPositionEmployeeLine.value.data) + ) { + return draftPositionEmployeeLine.value; + } else { + await fetchPositionEmployeeLine(false, selector); + return draftPositionEmployeeLine.value; + } } } }; @@ -824,27 +974,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataPositionEmployeeLevel.value.length === 0) { + if (dataPositionEmployeeLevel.value.data.length === 0) { await fetchPositionEmployeeLevel(true, selector); - return { - data: draftPositionEmployeeLevel.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionEmployeeLevel.value; } else { if (newFetch) { await fetchPositionEmployeeLevel(true, selector); - return { - data: draftPositionEmployeeLevel.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionEmployeeLevel.value; } else { - return { - data: draftPositionEmployeeLevel.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataPositionEmployeeLevel.value.data) == + JSON.stringify(draftPositionEmployeeLevel.value.data) + ) { + return draftPositionEmployeeLevel.value; + } else { + await fetchPositionEmployeeLevel(false, selector); + return draftPositionEmployeeLevel.value; + } } } }; @@ -853,27 +1000,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataPositionEmployeeStatus.value.length === 0) { + if (dataPositionEmployeeStatus.value.data.length === 0) { await fetchPositionEmployeeStatus(true, selector); - return { - data: draftPositionEmployeeStatus.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionEmployeeStatus.value; } else { if (newFetch) { await fetchPositionEmployeeStatus(true, selector); - return { - data: draftPositionEmployeeStatus.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionEmployeeStatus.value; } else { - return { - data: draftPositionEmployeeStatus.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataPositionEmployeeStatus.value.data) == + JSON.stringify(draftPositionEmployeeStatus.value.data) + ) { + return draftPositionEmployeeStatus.value; + } else { + await fetchPositionEmployeeStatus(false, selector); + return draftPositionEmployeeStatus.value; + } } } }; @@ -882,27 +1026,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataPositionPath.value.length === 0) { + if (dataPositionPath.value.data.length === 0) { await fetchPositionPath(true, selector); - return { - data: draftPositionPath.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionPath.value; } else { if (newFetch) { await fetchPositionPath(true, selector); - return { - data: draftPositionPath.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionPath.value; } else { - return { - data: draftPositionPath.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataPositionPath.value.data) == + JSON.stringify(draftPositionPath.value.data) + ) { + return draftPositionPath.value; + } else { + await fetchPositionPath(false, selector); + return draftPositionPath.value; + } } } }; @@ -911,27 +1052,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataPositionExecutive.value.length === 0) { + if (dataPositionExecutive.value.data.length === 0) { await fetchPositionExecutive(true, selector); - return { - data: draftPositionExecutive.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionExecutive.value; } else { if (newFetch) { await fetchPositionExecutive(true, selector); - return { - data: draftPositionExecutive.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionExecutive.value; } else { - return { - data: draftPositionExecutive.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataPositionExecutive.value.data) == + JSON.stringify(draftPositionExecutive.value.data) + ) { + return draftPositionExecutive.value; + } else { + await fetchPositionExecutive(false, selector); + return draftPositionExecutive.value; + } } } }; @@ -1314,27 +1452,15 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataPositionExecutiveSide.value.length === 0) { + if (dataPositionExecutiveSide.value.data.length === 0) { await fetchPositionExecutiveSide(true, selector); - return { - data: draftPositionExecutiveSide.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionExecutiveSide.value; } else { if (newFetch) { await fetchPositionExecutiveSide(true, selector); - return { - data: draftPositionExecutiveSide.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionExecutiveSide.value; } else { - return { - data: draftPositionExecutiveSide.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionExecutiveSide.value; } } }; @@ -1343,27 +1469,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataPositionPathSide.value.length === 0) { + if (dataPositionPathSide.value.data.length === 0) { await fetchPositionPathSide(true, selector); - return { - data: draftPositionPathSide.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionPathSide.value; } else { if (newFetch) { await fetchPositionPathSide(true, selector); - return { - data: draftPositionPathSide.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionPathSide.value; } else { - return { - data: draftPositionPathSide.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataPositionPathSide.value.data) == + JSON.stringify(draftPositionPathSide.value.data) + ) { + return draftPositionPathSide.value; + } else { + await fetchPositionPathSide(false, selector); + return draftPositionPathSide.value; + } } } }; @@ -1372,27 +1495,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataPositionType.value.length === 0) { + if (dataPositionType.value.data.length === 0) { await fetchPositionType(true, selector); - return { - data: draftPositionType.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionType.value; } else { if (newFetch) { await fetchPositionType(true, selector); - return { - data: draftPositionType.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionType.value; } else { - return { - data: draftPositionType.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataPositionType.value.data) == + JSON.stringify(draftPositionType.value.data) + ) { + return draftPositionType.value; + } else { + await fetchPositionType(false, selector); + return draftPositionType.value; + } } } }; @@ -1401,27 +1521,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataPositionLine.value.length === 0) { + if (dataPositionLine.value.data.length === 0) { await fetchPositionLine(true, selector); - return { - data: draftPositionLine.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionLine.value; } else { if (newFetch) { await fetchPositionLine(true, selector); - return { - data: draftPositionLine.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionLine.value; } else { - return { - data: draftPositionLine.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataPositionLine.value.data) == + JSON.stringify(draftPositionLine.value.data) + ) { + return draftPositionLine.value; + } else { + await fetchPositionLine(false, selector); + return draftPositionLine.value; + } } } }; @@ -1430,27 +1547,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataPositionLevel.value.length === 0) { + if (dataPositionLevel.value.data.length === 0) { await fetchPositionLevel(true, selector); - return { - data: draftPositionLevel.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionLevel.value; } else { if (newFetch) { await fetchPositionLevel(true, selector); - return { - data: draftPositionLevel.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionLevel.value; } else { - return { - data: draftPositionLevel.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataPositionLevel.value.data) == + JSON.stringify(draftPositionLevel.value.data) + ) { + return draftPositionLevel.value; + } else { + await fetchPositionLevel(false, selector); + return draftPositionLevel.value; + } } } }; @@ -1459,27 +1573,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataPositionStatus.value.length === 0) { + if (dataPositionStatus.value.data.length === 0) { await fetchPositionStatus(true, selector); - return { - data: draftPositionStatus.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionStatus.value; } else { if (newFetch) { await fetchPositionStatus(true, selector); - return { - data: draftPositionStatus.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftPositionStatus.value; } else { - return { - data: draftPositionStatus.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataPositionStatus.value.data) == + JSON.stringify(draftPositionStatus.value.data) + ) { + return draftPositionStatus.value; + } else { + await fetchPositionStatus(false, selector); + return draftPositionStatus.value; + } } } }; @@ -1488,27 +1599,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataOrganization.value.length === 0) { + if (dataOrganization.value.data.length === 0) { await fetchOrganization(true, selector); - return { - data: draftOrganization.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftOrganization.value; } else { if (newFetch) { await fetchOrganization(true, selector); - return { - data: draftOrganization.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftOrganization.value; } else { - return { - data: draftOrganization.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataOrganization.value.data) == + JSON.stringify(draftOrganization.value.data) + ) { + return draftOrganization.value; + } else { + await fetchOrganization(false, selector); + return draftOrganization.value; + } } } }; @@ -1517,27 +1625,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataOrganizationShortName.value.length === 0) { + if (dataOrganizationShortName.value.data.length === 0) { await fetchOrganizationShortName(true, selector); - return { - data: draftOrganizationShortName.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftOrganizationShortName.value; } else { if (newFetch) { await fetchOrganizationShortName(true, selector); - return { - data: draftOrganizationShortName.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftOrganizationShortName.value; } else { - return { - data: draftOrganizationShortName.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataOrganizationShortName.value.data) == + JSON.stringify(draftOrganizationShortName.value.data) + ) { + return draftOrganizationShortName.value; + } else { + await fetchOrganizationShortName(false, selector); + return draftOrganizationShortName.value; + } } } }; @@ -1546,27 +1651,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataOrganizationType.value.length === 0) { + if (dataOrganizationType.value.data.length === 0) { await fetchOrganizationType(true, selector); - return { - data: draftOrganizationType.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftOrganizationType.value; } else { if (newFetch) { await fetchOrganizationType(true, selector); - return { - data: draftOrganizationType.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftOrganizationType.value; } else { - return { - data: draftOrganizationType.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataOrganizationType.value.data) == + JSON.stringify(draftOrganizationType.value.data) + ) { + return draftOrganizationType.value; + } else { + await fetchOrganizationType(false, selector); + return draftOrganizationType.value; + } } } }; @@ -1575,27 +1677,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataOrganizationLevel.value.length === 0) { + if (dataOrganizationLevel.value.data.length === 0) { await fetchOrganizationLevel(true, selector); - return { - data: draftOrganizationLevel.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftOrganizationLevel.value; } else { if (newFetch) { await fetchOrganizationLevel(true, selector); - return { - data: draftOrganizationLevel.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftOrganizationLevel.value; } else { - return { - data: draftOrganizationLevel.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataOrganizationLevel.value.data) == + JSON.stringify(draftOrganizationLevel.value.data) + ) { + return draftOrganizationLevel.value; + } else { + await fetchOrganizationLevel(false, selector); + return draftOrganizationLevel.value; + } } } }; @@ -1604,27 +1703,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataOrganizationStatus.value.length === 0) { + if (dataOrganizationStatus.value.data.length === 0) { await fetchOrganizationStatus(true, selector); - return { - data: draftOrganizationStatus.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftOrganizationStatus.value; } else { if (newFetch) { await fetchOrganizationStatus(true, selector); - return { - data: draftOrganizationStatus.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftOrganizationStatus.value; } else { - return { - data: draftOrganizationStatus.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataOrganizationStatus.value.data) == + JSON.stringify(draftOrganizationStatus.value.data) + ) { + return draftOrganizationStatus.value; + } else { + await fetchOrganizationStatus(false, selector); + return draftOrganizationStatus.value; + } } } }; @@ -1633,27 +1729,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataOrganizationTelInternal.value.length === 0) { + if (dataOrganizationTelInternal.value.data.length === 0) { await fetchOrganizationTelInternal(true, selector); - return { - data: draftOrganizationTelInternal.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftOrganizationTelInternal.value; } else { if (newFetch) { await fetchOrganizationTelInternal(true, selector); - return { - data: draftOrganizationTelInternal.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftOrganizationTelInternal.value; } else { - return { - data: draftOrganizationTelInternal.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataOrganizationTelInternal.value.data) == + JSON.stringify(draftOrganizationTelInternal.value.data) + ) { + return draftOrganizationTelInternal.value; + } else { + await fetchOrganizationTelInternal(false, selector); + return draftOrganizationTelInternal.value; + } } } }; @@ -1662,27 +1755,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataOrganizationTelExternal.value.length === 0) { + if (dataOrganizationTelExternal.value.data.length === 0) { await fetchOrganizationTelExternal(true, selector); - return { - data: draftOrganizationTelExternal.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftOrganizationTelExternal.value; } else { if (newFetch) { await fetchOrganizationTelExternal(true, selector); - return { - data: draftOrganizationTelExternal.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftOrganizationTelExternal.value; } else { - return { - data: draftOrganizationTelExternal.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataOrganizationTelExternal.value.data) == + JSON.stringify(draftOrganizationTelExternal.value.data) + ) { + return draftOrganizationTelExternal.value; + } else { + await fetchOrganizationTelExternal(false, selector); + return draftOrganizationTelExternal.value; + } } } }; @@ -1691,27 +1781,24 @@ export const useManageDataStore = defineStore("manage", () => { selector: boolean = false, newFetch: boolean = false ) => { - if (dataOrganizationFax.value.length === 0) { + if (dataOrganizationFax.value.data.length === 0) { await fetchOrganizationFax(true, selector); - return { - data: draftOrganizationFax.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftOrganizationFax.value; } else { if (newFetch) { await fetchOrganizationFax(true, selector); - return { - data: draftOrganizationFax.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + return draftOrganizationFax.value; } else { - return { - data: draftOrganizationFax.value, - version: storeVersion.value, - idversion: storeIdVersion.value, - }; + // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า + if ( + JSON.stringify(dataOrganizationFax.value.data) == + JSON.stringify(draftOrganizationFax.value.data) + ) { + return draftOrganizationFax.value; + } else { + await fetchOrganizationFax(false, selector); + return draftOrganizationFax.value; + } } } }; @@ -1731,6 +1818,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: InsigniaResponse[] = []; + let version: string = ""; + let id: string = ""; if (selector) { data.map((e: InsigniaResponse) => { rows.push({ @@ -1750,8 +1839,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: InsigniaResponse) => { rows.push({ @@ -1772,9 +1861,9 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftInsignia.value = rows; + draftInsignia.value = { idversion: id, version: version, data: rows }; if (loader) { - dataInsignia.value = rows; + dataInsignia.value = { idversion: id, version: version, data: rows }; } }) .catch((e) => { @@ -1802,6 +1891,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: InsigniaTypeResponse[] = []; + let version: string = ""; + let id: string = ""; if (selector) { data.map((e: InsigniaTypeResponse) => { rows.push({ @@ -1817,8 +1908,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: InsigniaTypeResponse) => { rows.push({ @@ -1835,9 +1926,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftInsigniaType.value = rows; + draftInsigniaType.value = { + idversion: id, + version: version, + data: rows, + }; if (loader) { - dataInsigniaType.value = rows; + dataInsigniaType.value = { + idversion: id, + version: version, + data: rows, + }; } }) .catch((e) => { @@ -1865,6 +1964,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: positionEmployeeResponse[] = []; + let version: string = ""; + let id: string = ""; if (selector) { data.map((e: positionEmployeeResponse) => { rows.push({ @@ -1881,8 +1982,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: positionEmployeeResponse) => { rows.push({ @@ -1900,9 +2001,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftPositionEmployee.value = rows; + draftPositionEmployee.value = { + idversion: id, + version: version, + data: rows, + }; if (loader) { - dataPositionEmployee.value = rows; + dataPositionEmployee.value = { + idversion: id, + version: version, + data: rows, + }; } }) .catch((e) => { @@ -1934,6 +2043,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: positionEmployeeSideResponse[] = []; + let version: string = ""; + let id: string = ""; if (selector) { data.map((e: positionEmployeeSideResponse) => { rows.push({ @@ -1950,8 +2061,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: positionEmployeeSideResponse) => { rows.push({ @@ -1969,9 +2080,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftPositionEmployeeSide.value = rows; + draftPositionEmployeeSide.value = { + idversion: id, + version: version, + data: rows, + }; if (loader) { - dataPositionEmployeeSide.value = rows; + dataPositionEmployeeSide.value = { + idversion: id, + version: version, + data: rows, + }; } }) .catch((e) => { @@ -2002,6 +2121,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: positionEmployeeGroupResponse[] = []; + let version: string = ""; + let id: string = ""; if (selector) { data.map((e: positionEmployeeGroupResponse) => { rows.push({ @@ -2017,8 +2138,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: positionEmployeeGroupResponse) => { rows.push({ @@ -2035,9 +2156,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftPositionEmployeeGroup.value = rows; + draftPositionEmployeeGroup.value = { + idversion: id, + version: version, + data: rows, + }; if (loader) { - dataPositionEmployeeGroup.value = rows; + dataPositionEmployeeGroup.value = { + idversion: id, + version: version, + data: rows, + }; } }) .catch((e) => { @@ -2068,6 +2197,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: positionEmployeeLineResponse[] = []; + let version: string = ""; + let id: string = ""; if (selector) { data.map((e: positionEmployeeLineResponse) => { rows.push({ @@ -2083,8 +2214,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: positionEmployeeLineResponse) => { rows.push({ @@ -2101,9 +2232,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftPositionEmployeeLine.value = rows; + draftPositionEmployeeLine.value = { + idversion: id, + version: version, + data: rows, + }; if (loader) { - dataPositionEmployeeLine.value = rows; + dataPositionEmployeeLine.value = { + idversion: id, + version: version, + data: rows, + }; } }) .catch((e) => { @@ -2134,6 +2273,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: positionEmployeeLevelResponse[] = []; + let version: string = ""; + let id: string = ""; if (selector) { data.map((e: positionEmployeeLevelResponse) => { rows.push({ @@ -2149,8 +2290,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: positionEmployeeLevelResponse) => { rows.push({ @@ -2167,9 +2308,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftPositionEmployeeLevel.value = rows; + draftPositionEmployeeLevel.value = { + idversion: id, + version: version, + data: rows, + }; if (loader) { - dataPositionEmployeeLevel.value = rows; + dataPositionEmployeeLevel.value = { + idversion: id, + version: version, + data: rows, + }; } }) .catch((e) => { @@ -2200,6 +2349,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: positionEmployeeStatusResponse[] = []; + let version: string = ""; + let id: string = ""; if (selector) { data.map((e: positionEmployeeStatusResponse) => { rows.push({ @@ -2215,8 +2366,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: positionEmployeeStatusResponse) => { rows.push({ @@ -2233,9 +2384,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftPositionEmployeeStatus.value = rows; + draftPositionEmployeeStatus.value = { + idversion: id, + version: version, + data: rows, + }; if (loader) { - dataPositionEmployeeStatus.value = rows; + dataPositionEmployeeStatus.value = { + idversion: id, + version: version, + data: rows, + }; } }) .catch((e) => { @@ -2263,6 +2422,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: positionPathResponse[] = []; + let version: string = ""; + let id: string = ""; if (selector) { data.map((e: positionPathResponse) => { rows.push({ @@ -2279,8 +2440,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: positionPathResponse) => { rows.push({ @@ -2298,9 +2459,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftPositionPath.value = rows; + draftPositionPath.value = { + idversion: id, + version: version, + data: rows, + }; if (loader) { - dataPositionPath.value = rows; + dataPositionPath.value = { + idversion: id, + version: version, + data: rows, + }; } }) .catch((e) => { @@ -2328,6 +2497,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: positionPathSideResponse[] = []; + let version: string = ""; + let id: string = ""; if (selector) { data.map((e: positionPathSideResponse) => { rows.push({ @@ -2344,8 +2515,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: positionPathSideResponse) => { rows.push({ @@ -2363,9 +2534,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftPositionPathSide.value = rows; + draftPositionPathSide.value = { + idversion: id, + version: version, + data: rows, + }; if (loader) { - dataPositionPathSide.value = rows; + dataPositionPathSide.value = { + idversion: id, + version: version, + data: rows, + }; } }) .catch((e) => { @@ -2393,6 +2572,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: positionExecutiveResponse[] = []; + let version: string = ""; + let id: string = ""; if (selector) { data.map((e: positionExecutiveResponse) => { rows.push({ @@ -2408,8 +2589,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: positionExecutiveResponse) => { rows.push({ @@ -2426,9 +2607,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftPositionExecutive.value = rows; + draftPositionExecutive.value = { + idversion: id, + version: version, + data: rows, + }; if (loader) { - dataPositionExecutive.value = rows; + dataPositionExecutive.value = { + idversion: id, + version: version, + data: rows, + }; } }) .catch((e) => { @@ -2459,6 +2648,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: positionExecutiveSideResponse[] = []; + let version: string = ""; + let id: string = ""; if (selector) { data.map((e: positionExecutiveSideResponse) => { rows.push({ @@ -2475,8 +2666,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: positionExecutiveSideResponse) => { rows.push({ @@ -2494,9 +2685,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftPositionExecutiveSide.value = rows; + draftPositionExecutiveSide.value = { + idversion: id, + version: version, + data: rows, + }; if (loader) { - dataPositionExecutiveSide.value = rows; + dataPositionExecutiveSide.value = { + idversion: id, + version: version, + data: rows, + }; } }) .catch((e) => { @@ -2524,6 +2723,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: positionTypeResponse[] = []; + let version: string = ""; + let id: string = ""; if (selector) { data.map((e: positionTypeResponse) => { rows.push({ @@ -2539,8 +2740,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: positionTypeResponse) => { rows.push({ @@ -2557,9 +2758,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftPositionType.value = rows; + draftPositionType.value = { + idversion: id, + version: version, + data: rows, + }; if (loader) { - dataPositionType.value = rows; + dataPositionType.value = { + idversion: id, + version: version, + data: rows, + }; } }) .catch((e) => { @@ -2587,6 +2796,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: positionLineResponse[] = []; + let version: string = ""; + let id: string = ""; if (selector) { data.map((e: positionLineResponse) => { rows.push({ @@ -2602,8 +2813,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: positionLineResponse) => { rows.push({ @@ -2620,9 +2831,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftPositionLine.value = rows; + draftPositionLine.value = { + idversion: id, + version: version, + data: rows, + }; if (loader) { - dataPositionLine.value = rows; + dataPositionLine.value = { + idversion: id, + version: version, + data: rows, + }; } }) .catch((e) => { @@ -2650,6 +2869,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: positionLevelResponse[] = []; + let version: string = ""; + let id: string = ""; if (selector) { data.map((e: positionLevelResponse) => { rows.push({ @@ -2667,8 +2888,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: positionLevelResponse) => { rows.push({ @@ -2687,9 +2908,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftPositionLevel.value = rows; + draftPositionLevel.value = { + idversion: id, + version: version, + data: rows, + }; if (loader) { - dataPositionLevel.value = rows; + dataPositionLevel.value = { + idversion: id, + version: version, + data: rows, + }; } }) .catch((e) => { @@ -2717,6 +2946,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: positionStatusResponse[] = []; + let version: string = ""; + let id: string = ""; if (selector) { data.map((e: positionStatusResponse) => { rows.push({ @@ -2732,8 +2963,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: positionStatusResponse) => { rows.push({ @@ -2750,9 +2981,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftPositionStatus.value = rows; + draftPositionStatus.value = { + idversion: id, + version: version, + data: rows, + }; if (loader) { - dataPositionStatus.value = rows; + dataPositionStatus.value = { + idversion: id, + version: version, + data: rows, + }; } }) .catch((e) => { @@ -2780,6 +3019,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: organizationResponse[] = []; + let id: string = ""; + let version: string = ""; if (selector) { data.map((e: organizationResponse) => { rows.push({ @@ -2796,8 +3037,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: organizationResponse) => { rows.push({ @@ -2815,9 +3056,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftOrganization.value = rows; + draftOrganization.value = { + data: rows, + idversion: id, + version: version, + }; if (loader) { - dataOrganization.value = rows; + dataOrganization.value = { + data: rows, + idversion: id, + version: version, + }; } }) .catch((e) => { @@ -2848,6 +3097,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: organizationShortNameResponse[] = []; + let id: string = ""; + let version: string = ""; if (selector) { data.map((e: organizationShortNameResponse) => { rows.push({ @@ -2866,8 +3117,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: organizationShortNameResponse) => { rows.push({ @@ -2887,9 +3138,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftOrganizationShortName.value = rows; + draftOrganizationShortName.value = { + data: rows, + idversion: id, + version: version, + }; if (loader) { - dataOrganizationShortName.value = rows; + dataOrganizationShortName.value = { + data: rows, + idversion: id, + version: version, + }; } }) .catch((e) => { @@ -2917,6 +3176,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: organizationTypeResponse[] = []; + let id: string = ""; + let version: string = ""; if (selector) { data.map((e: organizationTypeResponse) => { rows.push({ @@ -2932,8 +3193,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: organizationTypeResponse) => { rows.push({ @@ -2950,9 +3211,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftOrganizationType.value = rows; + draftOrganizationType.value = { + data: rows, + idversion: id, + version: version, + }; if (loader) { - dataOrganizationType.value = rows; + dataOrganizationType.value = { + data: rows, + idversion: id, + version: version, + }; } }) .catch((e) => { @@ -2980,6 +3249,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: organizationLevelResponse[] = []; + let id: string = ""; + let version: string = ""; if (selector) { data.map((e: organizationLevelResponse) => { rows.push({ @@ -2995,8 +3266,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: organizationLevelResponse) => { rows.push({ @@ -3013,9 +3284,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftOrganizationLevel.value = rows; + draftOrganizationLevel.value = { + data: rows, + idversion: id, + version: version, + }; if (loader) { - dataOrganizationLevel.value = rows; + dataOrganizationLevel.value = { + data: rows, + idversion: id, + version: version, + }; } }) .catch((e) => { @@ -3046,6 +3325,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: organizationStatusResponse[] = []; + let id: string = ""; + let version: string = ""; if (selector) { data.map((e: organizationStatusResponse) => { rows.push({ @@ -3061,8 +3342,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: organizationStatusResponse) => { rows.push({ @@ -3079,9 +3360,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftOrganizationStatus.value = rows; + draftOrganizationStatus.value = { + data: rows, + idversion: id, + version: version, + }; if (loader) { - dataOrganizationStatus.value = rows; + dataOrganizationStatus.value = { + data: rows, + idversion: id, + version: version, + }; } }) .catch((e) => { @@ -3113,6 +3402,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: organizationTelInternalResponse[] = []; + let id: string = ""; + let version: string = ""; if (selector) { data.map((e: organizationTelInternalResponse) => { rows.push({ @@ -3128,8 +3419,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: organizationTelInternalResponse) => { rows.push({ @@ -3146,9 +3437,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftOrganizationTelInternal.value = rows; + draftOrganizationTelInternal.value = { + data: rows, + idversion: id, + version: version, + }; if (loader) { - dataOrganizationTelInternal.value = rows; + dataOrganizationTelInternal.value = { + data: rows, + idversion: id, + version: version, + }; } }) .catch((e) => { @@ -3180,6 +3479,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: organizationTelExternalResponse[] = []; + let id: string = ""; + let version: string = ""; if (selector) { data.map((e: organizationTelExternalResponse) => { rows.push({ @@ -3195,8 +3496,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: organizationTelExternalResponse) => { rows.push({ @@ -3213,9 +3514,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftOrganizationTelExternal.value = rows; + draftOrganizationTelExternal.value = { + data: rows, + idversion: id, + version: version, + }; if (loader) { - dataOrganizationTelExternal.value = rows; + dataOrganizationTelExternal.value = { + data: rows, + idversion: id, + version: version, + }; } }) .catch((e) => { @@ -3243,6 +3552,8 @@ export const useManageDataStore = defineStore("manage", () => { .then((res) => { const data = res.data.result; let rows: organizationFaxResponse[] = []; + let id: string = ""; + let version: string = ""; if (selector) { data.map((e: organizationFaxResponse) => { rows.push({ @@ -3258,8 +3569,8 @@ export const useManageDataStore = defineStore("manage", () => { }); }); } else { - storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ - storeIdVersion.value = data.id; //เลข id ใน mongodb + version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ + id = data.id; //เลข id ใน mongodb data.items.map((e: organizationFaxResponse) => { rows.push({ @@ -3276,9 +3587,17 @@ export const useManageDataStore = defineStore("manage", () => { }); } - draftOrganizationFax.value = rows; + draftOrganizationFax.value = { + data: rows, + idversion: id, + version: version, + }; if (loader) { - dataOrganizationFax.value = rows; + dataOrganizationFax.value = { + data: rows, + idversion: id, + version: version, + }; } }) .catch((e) => {