Merge branch 'dev' into develop

feat(Retired): add convertTypeRetired RETIRE_MILITARY
2026-06-11 16:27:39 +07:00 · 2026-06-11 16:27:07 +07:00
2 changed files with 5 additions and 3 deletions
--- a/src/modules/04_registryPerson/store.ts
+++ b/src/modules/04_registryPerson/store.ts
@ -25,8 +25,7 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
      {
        id: "posNo",
        name:
-          route.name === "registryNew" ||
-          route.name === "registryRetireOfficer"
+          route.name === "registryNew" || route.name === "registryRetireOfficer"
            ? "เลขที่ตำแหน่ง"
            : "ตำแหน่งเลขที่",
      },
@ -130,6 +129,8 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
        return "ให้ออกจากราชการ";
      case "DISCIPLINE_TEMP_SUSPEND":
        return "ให้ออกจากราชการไว้ก่อน";
+      case "RETIRE_MILITARY":
+        return "ลาออกเพื่อไปรับราชการทหาร";
      default:
        return "";
    }
--- a/src/modules/04_registryPerson/views/detailView.vue
+++ b/src/modules/04_registryPerson/views/detailView.vue
@ -857,7 +857,8 @@ onMounted(async () => {
            ])) ||
          leaveType === 'DISCIPLINE_TEMP_SUSPEND' ||
          leaveType === 'RETIRE_RESIGN' ||
-          leaveType === 'DISCIPLINE_SUSPEND'
+          leaveType === 'DISCIPLINE_SUSPEND' || 
+          leaveType === 'RETIRE_MILITARY'
        "
        size="md"
        rounded
Author	SHA1	Message	Date
$DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490	5bcf07c306	Merge branch 'dev' into develop All checks were successful Build & Deploy on Dev / build (push) Successful in 2m51s Details	2026-06-11 16:27:39 +07:00
$DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490	f1b94c0d93	feat(Retired): add convertTypeRetired RETIRE_MILITARY	2026-06-11 16:27:07 +07:00