Merge branch 'develop' into devTee

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"
+            ? "เลขที่ตำแหน่ง"
+            : "ตำแหน่งเลขที่",
       },
     ];
   });

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 == "อำนวยการ" ||