diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue index 228fcc9f3..56d966ba3 100644 --- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue +++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue @@ -18,6 +18,7 @@ import type { ResListSalary, ResType, } from "@/modules/04_registryPerson/interface/response/Salary"; +import type { DataCardPos } from "@/modules/04_registryPerson/interface/index/government"; import DialogHeader from "@/components/DialogHeader.vue"; import DialogHistory from "@/modules/04_registryPerson/components/detail/GovernmentInformation/07_PositionHistory.vue"; @@ -338,7 +339,7 @@ const posExecutiveOptionMain = ref([]); const docOption = ref(store.optionTemplateDoc); -const cardData = ref([ +const cardData = ref([ { label: "ระยะเวลาดำรงตำแหน่งในสายงาน", data: [], @@ -827,9 +828,7 @@ onMounted(async () => {
-
  • - {{ data.name }} {{ data.time }} -
  • +
  • {{ data.name }} {{ data.time }}
  • diff --git a/src/modules/04_registryPerson/interface/index/government.ts b/src/modules/04_registryPerson/interface/index/government.ts index 5d71032b5..26a0ea930 100644 --- a/src/modules/04_registryPerson/interface/index/government.ts +++ b/src/modules/04_registryPerson/interface/index/government.ts @@ -47,4 +47,14 @@ interface RequestItemsHistoryObject { createdFullName: string | null; createdAt: Date; } -export type { RequestItemsHistoryObject, FormMain }; + +interface DataCardPos { + label: string; + data?: Data[]; +} + +interface Data { + name: string; + time: string; +} +export type { RequestItemsHistoryObject, FormMain, DataCardPos }; diff --git a/src/modules/21_report/components/CardPosition.vue b/src/modules/21_report/components/CardPosition.vue index 8954a94ad..3888464fc 100644 --- a/src/modules/21_report/components/CardPosition.vue +++ b/src/modules/21_report/components/CardPosition.vue @@ -6,6 +6,8 @@ import http from "@/plugins/http"; import config from "@/app.config"; import { useCounterMixin } from "@/stores/mixin"; +import type { DataCardPos } from "@/modules/04_registryPerson/interface/index/government"; + const $q = useQuasar(); const { messageError, formatDatePosition } = useCounterMixin(); @@ -19,7 +21,7 @@ const props = defineProps({ type: { type: String, default: "" }, }); -const cardData = ref([ +const cardData = ref([ { label: "ระยะเวลาดำรงตำแหน่งในสายงาน", data: [], @@ -93,7 +95,7 @@ onMounted(() => { {{ item.label }}
  • + >
  • {{ data.name }} {{ data.time }}