diff --git a/src/modules/04_registryPerson/store.ts b/src/modules/04_registryPerson/store.ts index 813f22828..981fa3903 100644 --- a/src/modules/04_registryPerson/store.ts +++ b/src/modules/04_registryPerson/store.ts @@ -24,7 +24,11 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => { { id: "position", name: "ตำแหน่งในสายงาน" }, { id: "posNo", - name: route.name === "registryNew" ? "เลขที่ตำแหน่ง" : "ตำแหน่งเลขที่", + name: + route.name === "registryNew" || + route.name === "registryRetireOfficer" + ? "เลขที่ตำแหน่ง" + : "ตำแหน่งเลขที่", }, ]; }); diff --git a/src/modules/15_development/components/Target.vue b/src/modules/15_development/components/Target.vue index 1e24ae62d..be108f377 100644 --- a/src/modules/15_development/components/Target.vue +++ b/src/modules/15_development/components/Target.vue @@ -722,7 +722,7 @@ onMounted(() => { {{ `- ${row.position}` }}{{ props.row.groupTarget === "OFFICER" && - (row.posType || row.posLevel) + (row.posType && row.posLevel) ? ` (${ row.posType && (row.posType == "อำนวยการ" ||