From 0612820928759d73d0c0a9d51ae378f18b40c2fd Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 22 Nov 2024 18:04:12 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table.vue                           |  1 +
 src/components/information/Address.vue             |  6 +++---
 src/modules/03_recruiting/components/Address.vue   |  8 ++++----
 .../03_recruiting/views/03_editor/index.vue        | 14 +++++++-------
 .../components/Dialog/02_Address.vue               |  8 ++++----
 .../components/Dialog/DialogUpdate.vue             |  9 +++++----
 .../04_registryPerson/components/DialogHistory.vue |  2 +-
 .../04_registryPerson/components/TableView.vue     |  2 +-
 .../detail/GovernmentInformation/01_Info.vue       |  2 ++
 .../detail/GovernmentInformation/02_Discipline.vue |  5 ++---
 .../detail/PersonalInformation/03_Address.vue      | 10 +++++-----
 .../04_registryPerson/interface/request/Profile.ts |  2 +-
 .../04_registryPerson/interface/response/Main.ts   |  1 +
 .../interface/response/Profile.ts                  |  1 +
 src/modules/04_registryPerson/store.ts             |  5 +++--
 src/modules/04_registryPerson/stores/Address.ts    |  2 +-
 src/modules/04_registryPerson/stores/LinkCenter.ts |  2 +-
 src/modules/04_registryPerson/views/detailView.vue |  4 +++-
 src/modules/04_registryPerson/views/listView.vue   |  5 ++++-
 .../04_registryPerson/views/requestEditView.vue    |  4 ++++
 .../CheckInformation/02_FormAddress.vue            |  8 ++++----
 .../PersonalDetail/Information/Address.vue         |  8 ++++----
 .../components/ListRetirement/TableList.vue        |  4 ++--
 .../07_insignia/components/2_Manage/Tab1.vue       |  2 +-
 src/modules/07_insignia/views/03_ResultMain.vue    |  2 +-
 src/modules/07_insignia/views/05_BorrowMain.vue    |  2 +-
 src/modules/08_registryEmployee/views/Main.vue     |  6 ++++--
 .../09_leave/components/2_Leave/DetailLeave.vue    |  2 +-
 .../components/2_Leave/DetailLeaveReject.vue       |  2 +-
 .../components/1_Complaint/EditPage.vue            |  2 +-
 .../6_BasicInformation/Director/Form.vue           |  2 +-
 .../components/8_AppealComplain/Form.vue           |  2 +-
 .../11_discipline/store/InvestigateDisStore.ts     |  2 +-
 src/modules/11_discipline/store/Main.ts            |  4 ++--
 src/modules/11_discipline/store/ResultStore.ts     |  2 +-
 .../components/Detail/viewTab2/CardDirector.vue    |  2 +-
 .../components/Detail/viewstep/viewStep1.vue       |  2 +-
 .../components/Director/Form.vue                   |  2 +-
 .../14_KPI/components/Tab/Dialog/DialogEvalute.vue |  2 +-
 src/modules/15_development/components/Record.vue   |  2 +-
 .../15_development/components/history/AddPage.vue  |  4 ++--
 .../components/history/DialogGov.vue               |  4 ++--
 .../components/historyEmployee/AddPage.vue         |  4 ++--
 .../15_development/views/EmployeeHistory.vue       |  2 +-
 src/modules/15_development/views/History.vue       |  2 +-
 45 files changed, 93 insertions(+), 76 deletions(-)

diff --git a/src/components/Table.vue b/src/components/Table.vue
index 38d875fb6..9434aae28 100644
--- a/src/components/Table.vue
+++ b/src/components/Table.vue
@@ -10,6 +10,7 @@
     dense
     :pagination-label="paginationLabel"
     v-model:pagination="pagination"
+    :rows-per-page-options="[10, 25, 50, 100]"
   >
     <template v-slot:pagination="scope">
       ทั้งหมด {{ attrs.rows.length }} รายการ
diff --git a/src/components/information/Address.vue b/src/components/information/Address.vue
index 7db4b8410..460e11419 100644
--- a/src/components/information/Address.vue
+++ b/src/components/information/Address.vue
@@ -89,7 +89,7 @@
             :class="getClass(edit)"
             :readonly="!edit"
             :borderless="!edit"
-            :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง / ตำบล '}`]"
+            :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
             :outlined="edit"
             dense
             lazy-rules
@@ -99,7 +99,7 @@
             option-label="name"
             :options="Ops.subdistrictOps"
             option-value="id"
-            :label="`${'แขวง / ตำบล '}`"
+            :label="`${'แขวง/ตำบล '}`"
             @update:model-value="(value:string) => selectSubDistrict(value, '1')"
             use-input
             input-debounce="0"
@@ -221,7 +221,7 @@
             :class="getClass(edit)"
             :readonly="!edit"
             :borderless="!edit"
-            :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง / ตำบล '}`]"
+            :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
             :outlined="edit"
             dense
             lazy-rules
diff --git a/src/modules/03_recruiting/components/Address.vue b/src/modules/03_recruiting/components/Address.vue
index e0410cc50..f5911a70a 100644
--- a/src/modules/03_recruiting/components/Address.vue
+++ b/src/modules/03_recruiting/components/Address.vue
@@ -258,7 +258,7 @@ const getClass = (val: boolean) => {
           :class="getClass(status == 'checkRegister' || status == 'payment')"
           :readonly="!(status == 'checkRegister' || status == 'payment')"
           :borderless="!(status == 'checkRegister' || status == 'payment')"
-          :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง / ตำบล '}`]"
+          :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
           :outlined="status == 'checkRegister' || status == 'payment'"
           dense
           lazy-rules
@@ -268,7 +268,7 @@ const getClass = (val: boolean) => {
           option-label="name"
           :options="subdistrictOptions"
           option-value="id"
-          :label="`${'แขวง / ตำบล '}`"
+          :label="`${'แขวง/ตำบล '}`"
           @update:model-value="(value) => selectSubDistrict(value, '1')"
         />
       </div>
@@ -382,7 +382,7 @@ const getClass = (val: boolean) => {
           :class="getClass(status == 'checkRegister' || status == 'payment')"
           :readonly="!(status == 'checkRegister' || status == 'payment')"
           :borderless="!(status == 'checkRegister' || status == 'payment')"
-          :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง / ตำบล '}`]"
+          :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
           :outlined="status == 'checkRegister' || status == 'payment'"
           dense
           lazy-rules
@@ -392,7 +392,7 @@ const getClass = (val: boolean) => {
           option-label="name"
           :options="subdistrictCOptions"
           option-value="id"
-          :label="`${'แขวง / ตำบล '}`"
+          :label="`${'แขวง/ตำบล '}`"
           @update:model-value="(value) => selectSubDistrict(value, '2')"
         />
       </div>
diff --git a/src/modules/03_recruiting/views/03_editor/index.vue b/src/modules/03_recruiting/views/03_editor/index.vue
index 810433e08..e5db408e6 100644
--- a/src/modules/03_recruiting/views/03_editor/index.vue
+++ b/src/modules/03_recruiting/views/03_editor/index.vue
@@ -1017,7 +1017,7 @@ onMounted(async () => {
               :options="provinceOptions"
               option-value="id"
               :label="`${'จังหวัด'}`"
-              @update:model-value="(value) => selectProvince(value)"
+              @update:model-value="(value:any) => selectProvince(value)"
             />
           </div>
           <div class="col-xs-6 col-sm-3 col-md-3">
@@ -1037,7 +1037,7 @@ onMounted(async () => {
               :options="districtOptions"
               option-value="id"
               :label="`${'เขต / อำเภอ'}`"
-              @update:model-value="(value) => selectDistrict(value)"
+              @update:model-value="(value:any) => selectDistrict(value)"
             />
           </div>
           <div class="col-xs-6 col-sm-3 col-md-3">
@@ -1046,7 +1046,7 @@ onMounted(async () => {
               :class="getClass(enable.about)"
               :readonly="!enable.about"
               :borderless="!enable.about"
-              :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง / ตำบล '}`]"
+              :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
               :outlined="enable.about"
               dense
               lazy-rules
@@ -1056,8 +1056,8 @@ onMounted(async () => {
               option-label="name"
               :options="subdistrictOptions"
               option-value="id"
-              :label="`${'แขวง / ตำบล '}`"
-              @update:model-value="(value) => selectSubDistrict(value)"
+              :label="`${'แขวง/ตำบล '}`"
+              @update:model-value="(value:any) => selectSubDistrict(value)"
             />
           </div>
           <div class="col-xs-6 col-sm-3 col-md-3">
@@ -1085,8 +1085,8 @@ onMounted(async () => {
               v-model="address.tel"
               :borderless="!enable.about"
               :rules="[
-                (val) => !!val || `${'กรุณากรอก เบอร์โทร'}`,
-                (val) =>
+                (val:any) => !!val || `${'กรุณากรอก เบอร์โทร'}`,
+                (val:any) =>
                   val.length >= 10 || `${'กรุณากรอกข้อมูลเบอร์โทรให้ครบ'}`,
               ]"
               :label="`${'เบอร์โทร'}`"
diff --git a/src/modules/04_registryPerson/components/Dialog/02_Address.vue b/src/modules/04_registryPerson/components/Dialog/02_Address.vue
index 35239965f..1ae5d379c 100644
--- a/src/modules/04_registryPerson/components/Dialog/02_Address.vue
+++ b/src/modules/04_registryPerson/components/Dialog/02_Address.vue
@@ -16,7 +16,7 @@ const dataLabel = {
   registrationAddress: "ที่อยู่ตามทะเบียนบ้าน",
   registrationProvince: "จังหวัด",
   registrationDistrict: "เขต/อำเภอ",
-  registrationSubDistrict: "แขวง / ตำบล",
+  registrationSubDistrict: "แขวง/ตำบล",
   registrationZipCode: "รหัสไปรษณีย์",
 };
 
@@ -51,8 +51,8 @@ async function selectDistrict(e: string | null, name: string) {
 }
 
 /**
- * ฟังก์ชันเลือก  แขวง / ตำบล
- * @param e  แขวง / ตำบล ที่เลือก
+ * ฟังก์ชันเลือก  แขวง/ตำบล
+ * @param e  แขวง/ตำบล ที่เลือก
  * @param name 1 คือ ที่อยู่ตามทะเบียนบ้าน 2 คือ ที่อยู่ปัจจุบัน
  */
 function selectSubDistrict(e: string | null, name: string) {
@@ -162,7 +162,7 @@ watch(
           v-model="formDataAddress.registrationSubDistrictId"
           :options="storeLinkCenter.OpsAddress.subdistrictOps"
           :label="dataLabel.registrationSubDistrict"
-          :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง / ตำบล'}`]"
+          :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล'}`]"
           @update:model-value="(value:string) => selectSubDistrict(value, '1')"
           @filter="(inputValue:string,
                       doneFn:Function) => storeLinkCenter.filterSelector(inputValue, doneFn,'subdistrictOps'
diff --git a/src/modules/04_registryPerson/components/Dialog/DialogUpdate.vue b/src/modules/04_registryPerson/components/Dialog/DialogUpdate.vue
index 4d8b9bd18..f22c6281d 100644
--- a/src/modules/04_registryPerson/components/Dialog/DialogUpdate.vue
+++ b/src/modules/04_registryPerson/components/Dialog/DialogUpdate.vue
@@ -63,6 +63,7 @@ const formInformations = reactive<RequestObject>({
   firstName: "",
   prefix: "",
   rank: null,
+  prefixMain: "",
 });
 
 const formDataAddress = reactive<RequestregistrationAddressObject>({
@@ -257,7 +258,7 @@ async function amiRequest() {
   formInformations.nationality = data.value.nationalityDesc;
 
   // แปลง dateOfBirth เป็น format 1989-01-01
-  formInformations.birthDate = conventDateOfBirth(`${data.value.dateOfBirth}`);
+  formInformations.birthDate = data.value.dateOfBirth ? conventDateOfBirth(`${data.value.dateOfBirth}`) : null;
   age.value = storeLinkCenter.calculateAge(data.value.age);
   formInformations.gender = data.value.genderDesc;
 
@@ -327,15 +328,15 @@ async function convertDistrict(val: string) {
   const id = storeLinkCenter.OpsAddress.districtOps.find(
     (e: DataOption) => e.name === val
   )?.id;
-  // เรียกฟังก์ชันดึงข้อมูล  แขวง / ตำบล
+  // เรียกฟังก์ชันดึงข้อมูล  แขวง/ตำบล
   await storeLinkCenter.fetchSubDistrict(id ? id : null, "1", false);
 
   return id ? id : null;
 }
 
 /**
- * ฟังก์ชันแปลงชื่อแขวง / ตำบล เป็น ID
- * @param val ชื่อแขวง / ตำบล
+ * ฟังก์ชันแปลงชื่อแขวง/ตำบล เป็น ID
+ * @param val ชื่อแขวง/ตำบล
  */
 async function convertSubdistrict(val: string) {
   const result = storeLinkCenter.OpsAddress.subdistrictOps.find(
diff --git a/src/modules/04_registryPerson/components/DialogHistory.vue b/src/modules/04_registryPerson/components/DialogHistory.vue
index 797e41d59..80b00c760 100644
--- a/src/modules/04_registryPerson/components/DialogHistory.vue
+++ b/src/modules/04_registryPerson/components/DialogHistory.vue
@@ -66,7 +66,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     field: "name",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
diff --git a/src/modules/04_registryPerson/components/TableView.vue b/src/modules/04_registryPerson/components/TableView.vue
index bada8fe49..8cfd6ebef 100644
--- a/src/modules/04_registryPerson/components/TableView.vue
+++ b/src/modules/04_registryPerson/components/TableView.vue
@@ -47,7 +47,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "fullName",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "fullName",
     headerStyle: "font-size: 14px; min-width: 200px",
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
index de8e16b39..6cc8999c2 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
@@ -215,6 +215,8 @@ async function getData() {
     .get(config.API.profileNewGovernmentById(profileId.value, empType.value))
     .then(async (res) => {
       const data = await res.data.result;
+      console.log(data);
+      
       formMain.ocId = data.org ?? "-"; //สังกัด
       formMain.positionId = data.position ?? "-"; //ตำแหน่ง
       formMain.positionLine = data.positionField ?? "-"; //สายงาน
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
index 7132a0860..dbd516fcc 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
@@ -39,7 +39,7 @@ const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
 /**
  * props
  */
- const isLeave = defineModel<boolean>("isLeave", {
+const isLeave = defineModel<boolean>("isLeave", {
   required: true,
 });
 
@@ -230,7 +230,7 @@ function openDialogAdd() {
 /**
  * function fetch ข้อมูลรายการวินัย
  */
-function fetchData(id: string) {
+async function fetchData(id: string) {
   showLoader();
   http
     .get(config.API.profileNewDisciplineByProfileId(id, empType.value))
@@ -398,7 +398,6 @@ onMounted(() => {
       map-options
       :options="columns"
       option-value="name"
-      
       style="min-width: 140px"
     />
     <q-btn-toggle
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue
index b4125279f..a295f162e 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue
@@ -252,7 +252,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
 /**
  * ฟังก์ชันดึงข้อมูลที่อยู่
  *
- * ดึงข้อมูลที่อยู่ ข้อมูลจังหวัด ข้อมูล เขต / อำเภอ และข้อมูล แขวง / ตำบล
+ * ดึงข้อมูลที่อยู่ ข้อมูลจังหวัด ข้อมูล เขต / อำเภอ และข้อมูล แขวง/ตำบล
  */
 async function getData() {
   showLoader();
@@ -337,8 +337,8 @@ async function selectDistrict(e: string | null, name: string) {
 }
 
 /**
- * ฟังก์ชันเลือก  แขวง / ตำบล
- * @param e  แขวง / ตำบล ที่เลือก
+ * ฟังก์ชันเลือก  แขวง/ตำบล
+ * @param e  แขวง/ตำบล ที่เลือก
  * @param name 1 คือ ที่อยู่ตามทะเบียนบ้าน 2 คือ ที่อยู่ปัจจุบัน
  */
 function selectSubDistrict(e: string | null, name: string) {
@@ -743,7 +743,7 @@ onMounted(async () => {
                 v-model="formData.registrationSubDistrictId"
                 :options="store.Ops.subdistrictOps"
                 :label="dataLabel.registrationSubDistrict"
-                :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง / ตำบล'}`]"
+                :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล'}`]"
                 @update:model-value="(value:string) => selectSubDistrict(value, '1')"
                 @filter="(inputValue:string,
                       doneFn:Function) => filterSelector(inputValue, doneFn,'subdistrictOps'
@@ -864,7 +864,7 @@ onMounted(async () => {
                   v-model="formData.currentSubDistrictId"
                   :options="store.Ops.subdistrictCOps"
                   :label="dataLabel.currentSubDistrict"
-                  :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง / ตำบล'}`]"
+                  :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล'}`]"
                   @update:model-value="(value:string) => selectSubDistrict(value, '2')"
                   @filter="(inputValue:string,
                       doneFn:Function) => filterSelector(inputValue, doneFn,'subdistrictCOps'
diff --git a/src/modules/04_registryPerson/interface/request/Profile.ts b/src/modules/04_registryPerson/interface/request/Profile.ts
index c75f5e536..0a1719f8d 100644
--- a/src/modules/04_registryPerson/interface/request/Profile.ts
+++ b/src/modules/04_registryPerson/interface/request/Profile.ts
@@ -1,5 +1,5 @@
 interface RequestObject {
-  birthDate: Date | null;
+  birthDate: Date | null | string;
   bloodGroup: string | null;
   citizenId: string;
   // email: string | null;
diff --git a/src/modules/04_registryPerson/interface/response/Main.ts b/src/modules/04_registryPerson/interface/response/Main.ts
index a1664d686..7ca12cd24 100644
--- a/src/modules/04_registryPerson/interface/response/Main.ts
+++ b/src/modules/04_registryPerson/interface/response/Main.ts
@@ -3,6 +3,7 @@ interface DataType {
   posLevels: any;
   posTypeName: string;
   posTypeRank: number;
+  posTypeShortName?: string;
 }
 
 interface DataLevel {
diff --git a/src/modules/04_registryPerson/interface/response/Profile.ts b/src/modules/04_registryPerson/interface/response/Profile.ts
index 1742e7825..9363827a0 100644
--- a/src/modules/04_registryPerson/interface/response/Profile.ts
+++ b/src/modules/04_registryPerson/interface/response/Profile.ts
@@ -95,6 +95,7 @@ interface PosType {
   lastUpdateFullName: string;
   posTypeName: string;
   posTypeRank: number;
+  posTypeShortName?: string;
 }
 
 export type {
diff --git a/src/modules/04_registryPerson/store.ts b/src/modules/04_registryPerson/store.ts
index 4483f3c4a..dd23b8b07 100644
--- a/src/modules/04_registryPerson/store.ts
+++ b/src/modules/04_registryPerson/store.ts
@@ -33,16 +33,17 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
   ]);
   function fetchType(data: DataType[]) {
     posTypeMain.value = data;
+
     const list: DataOption[] = data.map((e: DataType) => ({
       id: e.id,
       name: e.posTypeName,
     }));
     posTypeOps.value = list;
   }
-  function fetchLevel(data: DataLevel[]) {
+  function fetchLevel(data: DataLevel[], shortName: string = "") {
     const list: DataOption[] = data.map((e: DataLevel) => ({
       id: e.id,
-      name: e.posLevelName,
+      name: `${shortName} ${e.posLevelName} `,
     }));
     const seen = new Set();
     posLevelOps.value = list.filter((item: DataOption) => {
diff --git a/src/modules/04_registryPerson/stores/Address.ts b/src/modules/04_registryPerson/stores/Address.ts
index 1ad7c7481..cd106d852 100644
--- a/src/modules/04_registryPerson/stores/Address.ts
+++ b/src/modules/04_registryPerson/stores/Address.ts
@@ -130,7 +130,7 @@ export const useAddressDataStore = defineStore("addess", () => {
   }
 
   /**
-   * ฟังก์ชันดึงข้อมูล  แขวง / ตำบล
+   * ฟังก์ชันดึงข้อมูล  แขวง/ตำบล
    * @param id  เขต / อำเภอ
    * @param position   ที่อยู่ตามทะเบียนบ้าน, ที่อยู่ปัจจุบัน
    */
diff --git a/src/modules/04_registryPerson/stores/LinkCenter.ts b/src/modules/04_registryPerson/stores/LinkCenter.ts
index 22cd3667d..ccfb5e911 100644
--- a/src/modules/04_registryPerson/stores/LinkCenter.ts
+++ b/src/modules/04_registryPerson/stores/LinkCenter.ts
@@ -243,7 +243,7 @@ export const useDataLinkCenter = defineStore("DataLinkCenter", () => {
   }
 
   /**
-   * ฟังก์ชันดึงข้อมูล  แขวง / ตำบล
+   * ฟังก์ชันดึงข้อมูล  แขวง/ตำบล
    * @param id  เขต / อำเภอ
    * @param position   ที่อยู่ตามทะเบียนบ้าน, ที่อยู่ปัจจุบัน
    */
diff --git a/src/modules/04_registryPerson/views/detailView.vue b/src/modules/04_registryPerson/views/detailView.vue
index 37daea1da..3ee865cb4 100644
--- a/src/modules/04_registryPerson/views/detailView.vue
+++ b/src/modules/04_registryPerson/views/detailView.vue
@@ -349,6 +349,8 @@ async function fetchDataPersonal() {
     .get(config.API.registryNewByProfileId(profileId.value, empType.value))
     .then(async (res) => {
       formDetail.value = res.data.result;
+      console.log(formDetail.value);
+
       storeRegistry.isLeave = res.data.result.isLeave;
 
       if (res.data.result.leaveReason) {
@@ -956,7 +958,7 @@ onMounted(async () => {
                   {{ empType === "" ? "ระดับ" : "ระดับชั้นงาน" }}
                 </div>
                 <div class="col">
-                  {{ formDetail?.posLevel?.posLevelName || "-" }}
+                  {{ `${ empType === "" ? '': formDetail?.posType?.posTypeShortName } ${formDetail?.posLevel?.posLevelName}`  || "-" }}
                 </div>
               </div>
             </div>
diff --git a/src/modules/04_registryPerson/views/listView.vue b/src/modules/04_registryPerson/views/listView.vue
index 2aa948d3e..e61a0397e 100644
--- a/src/modules/04_registryPerson/views/listView.vue
+++ b/src/modules/04_registryPerson/views/listView.vue
@@ -242,7 +242,10 @@ function selectType() {
  */
 function selectPosType(item: DataOption) {
   const dataType = store.posTypeMain.find((e: DataType) => e.id === item.id);
-  store.fetchLevel(dataType?.posLevels);
+  const shortName =
+    empType.value === "officer" ? "" : dataType?.posTypeShortName;
+
+  store.fetchLevel(dataType?.posLevels, shortName);
   store.labelOption.posType = item.name;
   store.labelOption.posLevel = "ทั้งหมด";
   store.formFilter.page = 1;
diff --git a/src/modules/04_registryPerson/views/requestEditView.vue b/src/modules/04_registryPerson/views/requestEditView.vue
index c15020ff5..bece2c089 100644
--- a/src/modules/04_registryPerson/views/requestEditView.vue
+++ b/src/modules/04_registryPerson/views/requestEditView.vue
@@ -13,6 +13,9 @@ const route = useRoute();
 const store = useRegistryNewDataStore();
 
 const isIDP = ref<boolean | null>(null);
+const isEmployee = ref<boolean>(
+  route.name?.toString() == "registryNewRequestEditEMP" ? true : false
+);
 
 onBeforeMount(async () => {
   isIDP.value = await (route.name?.toString() == "registryNewRequestEditEMP"
@@ -39,6 +42,7 @@ onMounted(() => {
         @click="router.go(-1)"
       />
       รายการคำร้องขอแก้ไขทะเบียนประวัติ
+      {{ `(${isEmployee ? "ลูกจ้างประจำ" : "ข้าราชการ กทม.สามัญ"})` }}
     </div>
   </div>
 
diff --git a/src/modules/05_placement/components/PersonalDetail/CheckInformation/02_FormAddress.vue b/src/modules/05_placement/components/PersonalDetail/CheckInformation/02_FormAddress.vue
index dc2683063..42649725d 100644
--- a/src/modules/05_placement/components/PersonalDetail/CheckInformation/02_FormAddress.vue
+++ b/src/modules/05_placement/components/PersonalDetail/CheckInformation/02_FormAddress.vue
@@ -394,7 +394,7 @@ onMounted(() => {
       <q-select
         hide-bottom-space
         class="inputgreen"
-        :rules="[(val: string) => !!val || `${'กรุณาเลือก แขวง / ตำบล '}`]"
+        :rules="[(val: string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
         outlined
         dense
         lazy-rules
@@ -404,7 +404,7 @@ onMounted(() => {
         option-label="name"
         :options="Ops.subdistrictOps"
         option-value="id"
-        :label="`${'แขวง / ตำบล '}`"
+        :label="`${'แขวง/ตำบล '}`"
         @update:model-value="(value: string) => selectSubDistrict(value, '1')"
         use-input
         input-debounce="0"
@@ -522,7 +522,7 @@ onMounted(() => {
       <q-select
         hide-bottom-space
         class="inputgreen"
-        :rules="[(val: string) => !!val || `${'กรุณาเลือก แขวง / ตำบล '}`]"
+        :rules="[(val: string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
         outlined
         dense
         lazy-rules
@@ -532,7 +532,7 @@ onMounted(() => {
         option-label="name"
         :options="Ops.subdistrictCOps"
         option-value="id"
-        :label="`${'แขวง / ตำบล '}`"
+        :label="`${'แขวง/ตำบล '}`"
         @update:model-value="(value: string) => selectSubDistrict(value, '2')"
         use-input
         input-debounce="0"
diff --git a/src/modules/05_placement/components/PersonalDetail/Information/Address.vue b/src/modules/05_placement/components/PersonalDetail/Information/Address.vue
index 26af481ea..4a1db283d 100644
--- a/src/modules/05_placement/components/PersonalDetail/Information/Address.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Information/Address.vue
@@ -586,7 +586,7 @@ onMounted(async () => {
             :class="getClass(edit)"
             :readonly="!edit"
             :borderless="!edit"
-            :rules="[(val: string) => !!val || `${'กรุณาเลือก แขวง / ตำบล '}`]"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
             :outlined="edit"
             dense
             lazy-rules
@@ -596,7 +596,7 @@ onMounted(async () => {
             option-label="name"
             :options="Ops.subdistrictOps"
             option-value="id"
-            :label="`${'แขวง / ตำบล '}`"
+            :label="`${'แขวง/ตำบล '}`"
             @update:model-value="(value: string) => selectSubDistrict(value, '1')"
             use-input
             input-debounce="0"
@@ -730,7 +730,7 @@ onMounted(async () => {
             :class="getClass(edit)"
             :readonly="!edit"
             :borderless="!edit"
-            :rules="[(val: string) => !!val || `${'กรุณาเลือก แขวง / ตำบล '}`]"
+            :rules="[(val: string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
             :outlined="edit"
             dense
             lazy-rules
@@ -740,7 +740,7 @@ onMounted(async () => {
             option-label="name"
             :options="Ops.subdistrictCOps"
             option-value="id"
-            :label="`${'แขวง / ตำบล '}`"
+            :label="`${'แขวง/ตำบล '}`"
             @update:model-value="(value: string) => selectSubDistrict(value, '2')"
             use-input
             input-debounce="0"
diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue
index fb2e966ce..05c396491 100644
--- a/src/modules/06_retirement/components/ListRetirement/TableList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue
@@ -140,8 +140,8 @@ async function fecthlistprofile(id: string) {
         {
           name: "name",
           align: "left",
-          label: "ชื่อ - นามสกุล",
-          title: "ชื่อ - นามสกุล",
+          label: "ชื่อ-นามสกุล",
+          title: "ชื่อ-นามสกุล",
           field: "name",
           headerStyle: "font-size: 14px",
           style: "font-size: 14px",
diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue
index 91ea55927..808e2c9bc 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab1.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue
@@ -308,7 +308,7 @@ const filterOption = ref<OptionData[]>([
   },
   {
     id: "fullName",
-    name: "ชื่อ - นามสกุล",
+    name: "ชื่อ-นามสกุล",
   },
 ]);
 
diff --git a/src/modules/07_insignia/views/03_ResultMain.vue b/src/modules/07_insignia/views/03_ResultMain.vue
index da524ca7a..f2790ec0c 100644
--- a/src/modules/07_insignia/views/03_ResultMain.vue
+++ b/src/modules/07_insignia/views/03_ResultMain.vue
@@ -98,7 +98,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     field: "name",
     sortable: true,
     sort: (a: string, b: string) =>
diff --git a/src/modules/07_insignia/views/05_BorrowMain.vue b/src/modules/07_insignia/views/05_BorrowMain.vue
index c2854387e..d092982f4 100644
--- a/src/modules/07_insignia/views/05_BorrowMain.vue
+++ b/src/modules/07_insignia/views/05_BorrowMain.vue
@@ -76,7 +76,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     field: "name",
     sortable: true,
     headerStyle: "font-size: 14px",
diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue
index 5a730c157..95c39fca9 100644
--- a/src/modules/08_registryEmployee/views/Main.vue
+++ b/src/modules/08_registryEmployee/views/Main.vue
@@ -128,12 +128,13 @@ const columns = ref<QTableProps["columns"]>([
   },
 
   {
-    name: "salaryDate",
+    name: "dateAppoint",
     align: "left",
     label: "วันที่แต่งตั้ง",
     sortable: true,
-    field: "salaryDate",
+    field: "dateAppoint",
     headerStyle: "font-size: 14px",
+    format: (val) => date2Thai(val),
     style: "font-size: 14px",
   },
   {
@@ -191,6 +192,7 @@ const visibleColumns = ref<String[]>([
   "createdAt",
   "dateRetireLaw",
   "statustext",
+  "dateAppoint",
 ]);
 
 /**
diff --git a/src/modules/09_leave/components/2_Leave/DetailLeave.vue b/src/modules/09_leave/components/2_Leave/DetailLeave.vue
index 3b1ddf7a9..77116d130 100644
--- a/src/modules/09_leave/components/2_Leave/DetailLeave.vue
+++ b/src/modules/09_leave/components/2_Leave/DetailLeave.vue
@@ -574,7 +574,7 @@ onMounted(async () => {
                   </div>
                   <div class="col-12 row">
                     <div class="col-xs-5 col-sm-3 text-grey-8">
-                      ชื่อ - นามสกุล
+                      ชื่อ-นามสกุล
                     </div>
                     <div class="col text-weight-medium">
                       {{ formData.fullName }}
diff --git a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
index aad0434ea..fcf0b5fc4 100644
--- a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
+++ b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
@@ -549,7 +549,7 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
                   </div>
                   <div class="col-12 row">
                     <div class="col-xs-5 col-sm-3 text-grey-8">
-                      ชื่อ - นามสกุล
+                      ชื่อ-นามสกุล
                     </div>
                     <div class="col text-weight-medium">
                       {{ formData.fullName }}
diff --git a/src/modules/11_discipline/components/1_Complaint/EditPage.vue b/src/modules/11_discipline/components/1_Complaint/EditPage.vue
index f0eb3f714..39fb12305 100644
--- a/src/modules/11_discipline/components/1_Complaint/EditPage.vue
+++ b/src/modules/11_discipline/components/1_Complaint/EditPage.vue
@@ -98,7 +98,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "name",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
index 9cb121eb7..2324e6888 100644
--- a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
@@ -114,7 +114,7 @@ const columnsRespondent = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "name",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/11_discipline/components/8_AppealComplain/Form.vue b/src/modules/11_discipline/components/8_AppealComplain/Form.vue
index 3b43898f6..d93112597 100644
--- a/src/modules/11_discipline/components/8_AppealComplain/Form.vue
+++ b/src/modules/11_discipline/components/8_AppealComplain/Form.vue
@@ -127,7 +127,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "fullname",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "fullname",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/11_discipline/store/InvestigateDisStore.ts b/src/modules/11_discipline/store/InvestigateDisStore.ts
index b1edc616c..21b5199dc 100644
--- a/src/modules/11_discipline/store/InvestigateDisStore.ts
+++ b/src/modules/11_discipline/store/InvestigateDisStore.ts
@@ -201,7 +201,7 @@ export const useInvestigateDisStore = defineStore(
       {
         name: "name",
         align: "left",
-        label: "ชื่อ - นามสกุล",
+        label: "ชื่อ-นามสกุล",
         sortable: true,
         field: "name",
         headerStyle: "font-size: 14px",
diff --git a/src/modules/11_discipline/store/Main.ts b/src/modules/11_discipline/store/Main.ts
index e37d4634f..3ee4a8fd4 100644
--- a/src/modules/11_discipline/store/Main.ts
+++ b/src/modules/11_discipline/store/Main.ts
@@ -56,7 +56,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
     {
       name: "name",
       align: "left",
-      label: "ชื่อ - นามสกุล",
+      label: "ชื่อ-นามสกุล",
       sortable: true,
       field: "name",
       headerStyle: "font-size: 14px",
@@ -153,7 +153,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
     {
       name: "name",
       align: "left",
-      label: "ชื่อ - นามสกุล",
+      label: "ชื่อ-นามสกุล",
       sortable: true,
       field: "name",
       headerStyle: "font-size: 14px",
diff --git a/src/modules/11_discipline/store/ResultStore.ts b/src/modules/11_discipline/store/ResultStore.ts
index 99dd8b3c8..303933fc2 100644
--- a/src/modules/11_discipline/store/ResultStore.ts
+++ b/src/modules/11_discipline/store/ResultStore.ts
@@ -192,7 +192,7 @@ export const useDisciplineResultStore = defineStore(
       {
         name: "name",
         align: "left",
-        label: "ชื่อ - นามสกุล",
+        label: "ชื่อ-นามสกุล",
         sortable: true,
         field: "name",
         headerStyle: "font-size: 14px",
diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue
index 52f1b7027..e17b9e92d 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue
@@ -49,7 +49,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "name",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue
index e9ffe3b37..244a78daa 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue
@@ -161,7 +161,7 @@ onMounted(() => {
                 borderless
                 readonly
                 :model-value="formDetail.fullName"
-                label="ชื่อ - นามสกุล"
+                label="ชื่อ-นามสกุล"
               />
             </div>
             <div class="col-xs-6 col-sm-4 col-md-3">
diff --git a/src/modules/12_evaluatePersonal/components/Director/Form.vue b/src/modules/12_evaluatePersonal/components/Director/Form.vue
index 8797e028e..5d3621980 100644
--- a/src/modules/12_evaluatePersonal/components/Director/Form.vue
+++ b/src/modules/12_evaluatePersonal/components/Director/Form.vue
@@ -106,7 +106,7 @@ const columnsRespondent = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "name",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue b/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
index 39555009e..2da533f73 100644
--- a/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
@@ -105,7 +105,7 @@ const columnsRespondent = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "name",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/15_development/components/Record.vue b/src/modules/15_development/components/Record.vue
index 9c9559df5..726d6e0fb 100644
--- a/src/modules/15_development/components/Record.vue
+++ b/src/modules/15_development/components/Record.vue
@@ -64,7 +64,7 @@ const baseColumns = ref<QTableProps["columns"]>([
   {
     name: "fullName",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "fullName",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/15_development/components/history/AddPage.vue b/src/modules/15_development/components/history/AddPage.vue
index 1ad00f9df..fecb20164 100644
--- a/src/modules/15_development/components/history/AddPage.vue
+++ b/src/modules/15_development/components/history/AddPage.vue
@@ -26,7 +26,7 @@ const order = ref<string>(""); //เลขที่คำสั่ง/เลข
 /** ตัวแปรข้อมูลข้าราชการ */
 const formMain = reactive<FormAddHistory>({
   id: "",
-  name: "", //ชื่อ - นามสกุล
+  name: "", //ชื่อ-นามสกุล
   prefix: "", //คำนำหน้าชื่อ
   rank: "", //ยศ
   firstName: "", //ชื่อ
@@ -147,7 +147,7 @@ onMounted(async () => {
               </div>
               <div class="row col-12">
                 <div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
-                  ชื่อ - นามสกุล
+                  ชื่อ-นามสกุล
                 </div>
 
                 <div class="col-12 col-sm-12 col-md-7">
diff --git a/src/modules/15_development/components/history/DialogGov.vue b/src/modules/15_development/components/history/DialogGov.vue
index 753b7ecb2..851f715c4 100644
--- a/src/modules/15_development/components/history/DialogGov.vue
+++ b/src/modules/15_development/components/history/DialogGov.vue
@@ -56,7 +56,7 @@ const govOp = ref<DataOption[]>([
   },
   {
     id: "fullName",
-    name: "ชื่อ - นามสกุล",
+    name: "ชื่อ-นามสกุล",
   },
 ]);
 
@@ -82,7 +82,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "name",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/15_development/components/historyEmployee/AddPage.vue b/src/modules/15_development/components/historyEmployee/AddPage.vue
index 8319c75e2..07f0048c4 100644
--- a/src/modules/15_development/components/historyEmployee/AddPage.vue
+++ b/src/modules/15_development/components/historyEmployee/AddPage.vue
@@ -29,7 +29,7 @@ const order = ref<string>("");
 /** ตัวแปรข้อมูลข้าราชการ */
 const formMain = reactive<FormAddHistoryEmployee>({
   id: "",
-  name: "", //ชื่อ - นามสกุล
+  name: "", //ชื่อ-นามสกุล
   prefix: "", //คำนำหน้าชื่อ
   rank: "", //ยศ
   firstName: "", //ชื่อ
@@ -159,7 +159,7 @@ onMounted(() => {
               </div>
               <div class="row col-12">
                 <div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
-                  ชื่อ - นามสกุล
+                  ชื่อ-นามสกุล
                 </div>
 
                 <div class="col-12 col-sm-12 col-md-7">
diff --git a/src/modules/15_development/views/EmployeeHistory.vue b/src/modules/15_development/views/EmployeeHistory.vue
index eec0c747b..009ad031a 100644
--- a/src/modules/15_development/views/EmployeeHistory.vue
+++ b/src/modules/15_development/views/EmployeeHistory.vue
@@ -88,7 +88,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "name",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/15_development/views/History.vue b/src/modules/15_development/views/History.vue
index 8866491f9..62d5196e3 100644
--- a/src/modules/15_development/views/History.vue
+++ b/src/modules/15_development/views/History.vue
@@ -65,7 +65,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "name",
     align: "left",
-    label: "ชื่อ - นามสกุล",
+    label: "ชื่อ-นามสกุล",
     sortable: true,
     field: "name",
     headerStyle: "font-size: 14px",