diff --git a/src/components/Dialogs/PopupPersonalNew.vue b/src/components/Dialogs/PopupPersonalNew.vue index 5bb0f24ac..4afdf0b48 100644 --- a/src/components/Dialogs/PopupPersonalNew.vue +++ b/src/components/Dialogs/PopupPersonalNew.vue @@ -14,6 +14,8 @@ import type { Avatar } from "@/components/information/interface/response/avatar" /** importStore*/ import { useCounterMixin } from "@/stores/mixin"; +import CardPosition from "@/modules/21_report/components/CardPosition.vue"; + /** use*/ const route = useRoute(); const mixin = useCounterMixin(); @@ -24,6 +26,7 @@ const { showLoader, hideLoader, messageError, date2Thai } = mixin; const isEmployee = defineModel("isEmployee", { type: String }); const empType = ref("officer"); +const checkRoute = ref(route.name == "reportRegistry"); /** props*/ const props = defineProps({ id: { @@ -172,7 +175,9 @@ async function fetchProfileGov(id: string) { } function redirecToRegistry() { - router.push(`/registry-${props.type == 'employee' ? 'employee':'officer'}/${props.id}`); + router.push( + `/registry-${props.type == "employee" ? "employee" : "officer"}/${props.id}` + ); modal.value = false; } @@ -422,7 +427,11 @@ async function fetchProfile(id: string, avatarName: string) { :model-value=" goverment.positionType ? goverment.positionType : '-' " - :label="props.type == 'employee' ? 'กลุ่มงาน':'ประเภทตำแหน่ง'" + :label=" + props.type == 'employee' + ? 'กลุ่มงาน' + : 'ประเภทตำแหน่ง' + " />
@@ -434,7 +443,11 @@ async function fetchProfile(id: string, avatarName: string) { ? goverment.positionLevel : '-' " - :label="props.type == 'employee' ? 'ระดับชั้นงาน':'ระดับตำแหน่ง'" + :label=" + props.type == 'employee' + ? 'ระดับชั้นงาน' + : 'ระดับตำแหน่ง' + " />
+ + + + 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 b37621bfb..e73da8886 100644 --- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue +++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue @@ -289,6 +289,27 @@ const posExecutiveOptionMain = ref([]); const docOption = ref(store.optionTemplateDoc); +const cardData = ref([ + { + label: "ระยะเวลาดำรงตำแหน่งในสายงาน", + data: [ + { name: "ตำแหน่ง", time: "1 ปี" }, + { name: "ตำแหน่ง", time: "1 ปี" }, + { name: "ตำแหน่ง", time: "1 ปี" }, + { name: "ตำแหน่ง", time: "1 ปี" }, + { name: "ตำแหน่ง", time: "1 ปี" }, + ], + }, + { + label: "ระยะเวลาดำรงตำแหน่งตามระดับ", + data: [{ name: "ละดับ", time: "1 ปี" }], + }, + { + label: "ระยะเวลาดำรงตำแหน่งทางการบริหาร", + data: [{ name: "ตำแหน่งทางการบริหาร", time: "1 ปี" }], + }, +]); + /** function fetch รายการ ตำแหน่งเงินเดือน*/ async function fetchListSalary() { showLoader(); @@ -715,7 +736,24 @@ onMounted(() => { fetchListSalary(); }); +