From 5aed5699b994ceeada72d32ffb2302d3502710e5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 11 Jun 2026 18:17:21 +0700
Subject: [PATCH] fix

---
 .../02_NameChangeHistory.vue                  | 68 ++++++++++++++++++-
 .../interface/request/Main.ts                 |  1 +
 2 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
index cbe7f361e..a4c9efd6b 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
@@ -59,6 +59,7 @@ const changeNameData = reactive<FormChangeName>({
   profileId: profileId.value,
   prefixId: "", // id คำนำหน้า
   prefix: "", // คำนำหน้า
+  rank: "", // ยศ
   firstName: "", // ชื่อ
   lastName: "", // นามสกุล
   status: "", // สถานะ
@@ -69,11 +70,13 @@ const selection = ref<string[]>([]); // ตัวเลือก
 const prefixChange = ref<string | null | undefined>(""); // เปลี่ยนคำนำหน้า
 const firstNameChange = ref<string | null | undefined>(""); // เปลียนชื่อ
 const lastNameChange = ref<string | null | undefined>(""); // เปลี่ยนนามสกุล
+const rankChange = ref<string | null | undefined>(""); // เปลี่ยนยศ
 
 const profileInfo = ref<DataProfile>(); // ข้อมูล Profile
 
 const statusOption = ref<string[]>([
   "เปลี่ยนคำนำหน้าชื่อ",
+  "เปลี่ยนยศ",
   "เปลี่ยนชื่อ",
   "เปลี่ยนนามสกุล",
   "เปลี่ยนชื่อ-นามสกุล",
@@ -84,6 +87,7 @@ const statusOption = ref<string[]>([
 const statusOptionFilter = ref<string[]>([
   "เปลี่ยนคำนำหน้าชื่อ",
   "เปลี่ยนชื่อ",
+  "เปลี่ยนยศ",
   "เปลี่ยนนามสกุล",
   "เปลี่ยนชื่อ-นามสกุล",
   "เปลี่ยนคำนำหน้าชื่อ และชื่อ",
@@ -107,6 +111,17 @@ const columns = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
+  {
+    name: "rank",
+    align: "left",
+    label: "ยศ",
+    sortable: true,
+    field: "rank",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
   {
     name: "firstName",
     align: "left",
@@ -156,6 +171,7 @@ const columns = ref<QTableProps["columns"]>([
 ]);
 const visibleColumns = ref<string[]>([
   "prefix",
+  "rank",
   "firstName",
   "lastName",
   "lastUpdateFullName",
@@ -215,6 +231,7 @@ function onSubmit() {
             firstName: changeNameData.firstName,
             lastName: changeNameData.lastName,
             status: changeNameData.status,
+            rank: changeNameData.rank,
             documentId: changeNameData.documentId,
           })
           .then(async (res) => {
@@ -346,6 +363,14 @@ function filterSelector(val: string, update: Function, refData: string) {
         );
       });
       break;
+
+    case "rankOps":
+      update(() => {
+        store.Ops.rankOps = store.OpsFilter.rankOps.filter(
+          (v: DataOption) => v.name.indexOf(val) > -1
+        );
+      });
+      break;
     default:
       break;
   }
@@ -390,12 +415,14 @@ watch(
     changeNameData.prefix,
     changeNameData.firstName,
     changeNameData.lastName,
+    changeNameData.rank,
   ],
   () => {
     submitDisable.value =
       changeNameData.prefix === prefixChange.value &&
       changeNameData.firstName === firstNameChange.value &&
-      changeNameData.lastName === lastNameChange.value;
+      changeNameData.lastName === lastNameChange.value &&
+      changeNameData.rank === rankChange.value;
   }
 );
 
@@ -411,6 +438,9 @@ watch(
     if (!selection.value.includes("lastname")) {
       changeNameData.lastName = lastNameChange.value;
     }
+    if (!selection.value.includes("rank")) {
+      changeNameData.rank = rankChange.value;
+    }
   }
 );
 /** ทำงานเมื่อ Components ถูกเรียกใช้งาน*/
@@ -445,12 +475,14 @@ onMounted(async () => {
       icon="add"
       @click="
         () => {
-          changeNameData.prefix = profileInfo?.prefixMain;
+          changeNameData.prefix = profileInfo?.prefix;
           changeNameData.firstName = profileInfo?.firstName;
           changeNameData.lastName = profileInfo?.lastName;
+          changeNameData.rank = profileInfo?.rank;
           prefixChange = changeNameData.prefix;
           firstNameChange = changeNameData.firstName;
           lastNameChange = changeNameData.lastName;
+          rankChange = changeNameData.rank;
           changeNameData.status = '';
           dialogStatus = 'create';
           submitDisable = true;
@@ -563,12 +595,17 @@ onMounted(async () => {
           <div class="row q-mb-sm">
             <div class="col-12">
               <div class="row">
-                <div class="q-gutter-sm">
+                <div class="q-col-gutter-sm">
                   <q-checkbox
                     v-model="selection"
                     val="prefix"
                     label="เปลี่ยนคำนำหน้าชื่อ"
                   />
+                  <q-checkbox
+                    v-model="selection"
+                    val="rank"
+                    label="เปลี่ยนยศ"
+                  />
                   <q-checkbox
                     v-model="selection"
                     val="firstname"
@@ -609,6 +646,31 @@ onMounted(async () => {
                     ) "
               />
             </div>
+            <div class="col">
+              <q-select
+                :readonly="!selection.includes('rank')"
+                v-model="changeNameData.rank"
+                :options="store.Ops.rankOps"
+                label="ยศ"
+                dense
+                :class="!selection.includes('rank') ? '' : 'inputgreen'"
+                outlined
+                use-input
+                hide-selected
+                fill-input
+                lazy-rules
+                emit-value
+                map-options
+                :rules="[(val:string) => !!val || `${'กรุณาเลือกยศ'}`]"
+                hide-bottom-space
+                input-debounce="0"
+                option-label="name"
+                option-value="name"
+                @filter="(inputValue:string,
+                    doneFn:Function) => filterSelector(inputValue, doneFn,'rankOps'
+                    ) "
+              />
+            </div>
             <div class="col">
               <q-input
                 :readonly="!selection.includes('firstname')"
diff --git a/src/modules/04_registryPerson/interface/request/Main.ts b/src/modules/04_registryPerson/interface/request/Main.ts
index 02fa91b39..d519740d0 100644
--- a/src/modules/04_registryPerson/interface/request/Main.ts
+++ b/src/modules/04_registryPerson/interface/request/Main.ts
@@ -66,6 +66,7 @@ interface FormChangeName {
   profileId: string;
   prefixId: string | null | undefined;
   prefix: string | null | undefined;
+  rank: string | null | undefined;
   firstName: string | null | undefined;
   lastName: string | null | undefined;
   status: string | null | undefined;