From e279f2fbb06788f081e3ab3f6f6457daa71f4f99 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 1 May 2025 09:40:15 +0700
Subject: [PATCH 1/2] =?UTF-8?q?View=20Table=20=E0=B8=97=E0=B8=B0=E0=B9=80?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/Achievement/03_Insignia.vue        |  11 ++
 .../04_PerformSpecialWork.vue                 |  11 ++
 .../GovernmentInformation/05_ActingPos.vue    | 126 +++++--------
 .../06_HelpGovernment.vue                     | 172 ++++++++----------
 .../02_NameChangeHistory.vue                  |   1 +
 .../PersonalInformation/06_SpecialSkill.vue   |  11 ++
 .../detail/Salary/02_NotReceiveSalary.vue     |   1 -
 7 files changed, 160 insertions(+), 173 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
index f1a85597f..a516e844f 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
@@ -799,6 +799,17 @@ onMounted(async () => {
       <div class="q-pa-xs col-xs-12 col-sm-4 col-md-3">
         <q-card flat bordered>
           <q-card-actions class="bg-grey-3" align="right">
+            <q-btn
+              v-if="props.row.isUpload"
+              color="green"
+              flat
+              dense
+              round
+              icon="mdi-file-document-outline"
+              @click="onDownloadFile(props.row.id)"
+            >
+              <q-tooltip>ดาวน์โหลด</q-tooltip>
+            </q-btn>
             <q-btn
               flat
               round
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
index fae201801..6d2a7df33 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
@@ -596,6 +596,17 @@ onMounted(() => {
       <div class="q-pa-xs col-xs-12 col-sm-4 col-md-3">
         <q-card flat bordered>
           <q-card-actions align="right" class="bg-grey-3">
+            <q-btn
+              v-if="props.row.isUpload == true"
+              color="green"
+              flat
+              dense
+              round
+              icon="mdi-file-document-outline"
+              @click="onDownloadFile(props.row.id)"
+            >
+              <q-tooltip>ดาวน์โหลด</q-tooltip>
+            </q-btn>
             <q-btn
               color="deep-purple"
               icon="mdi-history"
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/05_ActingPos.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/05_ActingPos.vue
index de816c5b1..bdbf6e568 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/05_ActingPos.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/05_ActingPos.vue
@@ -325,7 +325,6 @@ onMounted(() => {
       </template>
     </q-input>
     <q-select
-      v-if="mode == 'table'"
       v-model="visibleColumns"
       multiple
       outlined
@@ -371,7 +370,6 @@ onMounted(() => {
   </div>
 
   <d-table
-    :card-container-class="mode === 'card' ? 'q-col-gutter-md' : ''"
     :grid="mode === 'card'"
     ref="table"
     row-key="id"
@@ -438,86 +436,60 @@ onMounted(() => {
       </q-tr>
     </template>
     <template v-slot:item="props" v-else>
-      <div class="col-xs-12 col-sm-6 col-md-6">
-        <q-card flat bordered class="q-pa-none">
-          <div class="row bg-grey-3">
-            <q-space />
-            <div>
-              <q-btn
-                color="deep-purple"
-                icon="mdi-history"
-                flat
-                round
-                @click.stop.prevent="showHistoryDialog(props.row.id)"
-              >
-                <q-tooltip>ประวัติแก้ไขรักษาการในตำแหน่ง</q-tooltip>
-              </q-btn>
+      <div class="q-pa-xs col-xs-12 col-sm-4 col-md-3">
+        <q-card flat bordered>
+          <q-card-actions align="right" class="bg-grey-3">
+            <q-btn
+              color="deep-purple"
+              icon="mdi-history"
+              flat
+              round
+              @click.stop.prevent="showHistoryDialog(props.row.id)"
+            >
+              <q-tooltip>ประวัติแก้ไขรักษาการในตำแหน่ง</q-tooltip>
+            </q-btn>
 
-              <q-btn
-                v-if="
-                  isLeave === false && checkPermission($route)?.attrIsUpdate
-                "
-                :color="props.row.commandId ? 'grey-5' : 'edit'"
-                :disable="props.row.commandId !== null"
-                icon="edit"
-                flat
-                round
-                @click.stop.prevent="openEditDialog(props.row)"
-              >
-                <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-              </q-btn>
-            </div>
-          </div>
+            <q-btn
+              v-if="isLeave === false && checkPermission($route)?.attrIsUpdate"
+              :color="props.row.commandId ? 'grey-5' : 'edit'"
+              :disable="props.row.commandId !== null"
+              icon="edit"
+              flat
+              round
+              @click.stop.prevent="openEditDialog(props.row)"
+            >
+              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+            </q-btn>
+          </q-card-actions>
           <q-separator />
-          <q-card-section class="q-pa-none">
-            <div class="row q-pa-sm">
-              <div class="col-3 text-grey-6 text-weight-medium">
-                วันที่เริ่มต้น
+
+          <q-list>
+            <div
+              :class="`row q-pa-sm`"
+              :style="`background-color: ${index % 2 !== 0 ? '#FAFAFA' : ''}`"
+              v-for="(col, index) in props.cols"
+              :key="col.name"
+            >
+              <div class="col text-grey-6">
+                <div>{{ col.label }}</div>
               </div>
-              <div class="col-3">
-                {{ props.row.dateStart ? date2Thai(props.row.dateStart) : "-" }}
-              </div>
-              <div class="col-3 text-grey-6 text-weight-medium">
-                วันที่สิ้นสุด
-              </div>
-              <div class="col-3">
-                {{ props.row.dateEnd ? date2Thai(props.row.dateEnd) : "-" }}
+              <div class="col">
+                <div
+                  v-if="col.name == 'refCommandNo' && props.row.commandId"
+                  @click="col.value ? openViewCommand(props.row) : null"
+                  :class="
+                    col.value
+                      ? 'table_ellipsis text-blue cursor-pointer'
+                      : 'table_ellipsis'
+                  "
+                >
+                  {{ col.value ? col.value : "-" }}
+                  <q-tooltip v-if="col.value">ดูคำสั่ง</q-tooltip>
+                </div>
+                <div v-else>{{ col.value ? col.value : "-" }}</div>
               </div>
             </div>
-            <q-separator />
-            <div class="row q-pa-sm bg-grey-2">
-              <div class="col-3 text-grey-6 text-weight-medium">
-                {{ empType === "" ? "เลขที่ตำแหน่ง" : "ตำแหน่งเลขที่" }}
-              </div>
-              <div class="col-3">
-                {{ props.row.posNo ? props.row.posNo : "-" }}
-              </div>
-              <div class="col-3 text-grey-6 text-weight-medium">ตำแหน่ง</div>
-              <div class="col-3">
-                {{ props.row.position ? props.row.position : "-" }}
-              </div>
-            </div>
-            <q-separator />
-            <div class="row q-pa-sm">
-              <div class="col-3 text-grey-6 text-weight-medium">
-                เลขที่คำสั่ง
-              </div>
-              <div
-                v-if="props.row.commandId"
-                @click="openViewCommand(props.row)"
-                class="col-3 text-blue"
-              >
-                {{ props.row.refCommandNo }}
-                <q-tooltip v-if="props.row.commandId">ดูคำสั่ง</q-tooltip>
-              </div>
-              <div class="col-3" v-else>-</div>
-              <div class="col-3 text-grey-6 text-weight-medium">สถานะ</div>
-              <div class="col-3">
-                {{ props.row.status ? "ใช้งาน" : "-" }}
-              </div>
-            </div>
-            <q-separator />
-          </q-card-section>
+          </q-list>
         </q-card>
       </div>
     </template>
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue
index e2d2472a6..66587ef10 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue
@@ -469,7 +469,6 @@ onMounted(() => {
       </template>
     </q-input>
     <q-select
-      v-if="mode == 'table'"
       v-model="visibleColumns"
       multiple
       outlined
@@ -515,7 +514,6 @@ onMounted(() => {
   </div>
 
   <d-table
-    :card-container-class="mode === 'card' ? 'q-col-gutter-md' : ''"
     :grid="mode === 'card'"
     ref="table"
     row-key="id"
@@ -616,102 +614,86 @@ onMounted(() => {
       </q-tr>
     </template>
     <template v-slot:item="props" v-else>
-      <div class="col-xs-12 col-sm-6 col-md-6">
-        <q-card flat bordered class="q-pa-none">
-          <div class="row bg-grey-3">
-            <q-space />
-            <div>
-              <q-btn
-                color="deep-purple"
-                icon="mdi-history"
-                flat
-                round
-                @click.stop.prevent="showHistoryDialog(props.row.id)"
-              >
-                <q-tooltip>ประวัติแก้ไขรายการช่วยราชการ</q-tooltip>
-              </q-btn>
-              <q-btn
-                v-if="!isLeave && checkPermission($route)?.attrIsUpdate"
-                :color="props.row.commandId ? 'grey-5' : 'edit'"
-                :disable="props.row.commandId !== null"
-                icon="edit"
-                flat
-                round
-                @click.stop.prevent="openEditDialog(props.row)"
-              >
-                <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-              </q-btn>
-              <q-btn
-                v-if="checkPermission($route)?.attrIsUpdate"
-                flat
-                dense
-                round
-                :color="
-                  !props.row.refId || props.row.status !== 'PENDING'
-                    ? 'grey-5'
-                    : 'primary'
-                "
-                :disable="!props.row.refId || props.row.status !== 'PENDING'"
-                icon="mdi-account-arrow-left-outline"
-                @click.stop.prevent="onReturner(props.row.refId)"
-              >
-                <q-tooltip>ส่งตัวกลับ</q-tooltip>
-              </q-btn>
-            </div>
-          </div>
-          <q-separator />
-          <q-card-section class="q-pa-none">
-            <div class="row q-pa-sm">
-              <div class="col-3 text-grey-6 text-weight-medium">
-                หน่วยงานที่ให้ช่วยราชการ
-              </div>
-              <div class="col-9">
-                {{ props.row.agency ? props.row.agency : "-" }}
-              </div>
-            </div>
-            <div class="row q-pa-sm bg-grey-2">
-              <div class="col-3 text-grey-6 text-weight-medium">
-                วันที่เริ่มต้น
-              </div>
-              <div class="col-3">
-                {{ props.row.dateStart ? date2Thai(props.row.dateStart) : "-" }}
-              </div>
-              <div class="col-3 text-grey-6 text-weight-medium">
-                วันที่สิ้นสุด
-              </div>
-              <div class="col-3">
-                {{ props.row.dateEnd ? date2Thai(props.row.dateEnd) : "-" }}
-              </div>
-            </div>
-            <q-separator />
-            <div class="row q-pa-sm">
-              <div class="col-3 text-grey-6 text-weight-medium">
-                เลขที่คำสั่ง
-              </div>
-              <div
-                v-if="props.row.commandId"
-                @click="openViewCommand(props.row)"
-                class="col-9 text-blue"
-              >
-                {{ props.row.commandNo }}
-                <q-tooltip v-if="props.row.commandId">ดูคำสั่ง</q-tooltip>
-              </div>
+      <div class="q-pa-xs col-xs-12 col-sm-4 col-md-3">
+        <q-card flat bordered>
+          <q-card-actions align="right" class="bg-grey-3">
+            <q-btn
+              flat
+              dense
+              round
+              color="green"
+              icon="mdi-file-document-outline"
+              v-if="props.row.isUpload"
+              @click="onDownloadFile(props.row.id)"
+            >
+              <q-tooltip>ดาวน์โหลด</q-tooltip>
+            </q-btn>
+            <q-btn
+              color="deep-purple"
+              icon="mdi-history"
+              flat
+              round
+              @click.stop.prevent="showHistoryDialog(props.row.id)"
+            >
+              <q-tooltip>ประวัติแก้ไขรายการช่วยราชการ</q-tooltip>
+            </q-btn>
+            <q-btn
+              v-if="!isLeave && checkPermission($route)?.attrIsUpdate"
+              :color="props.row.commandId ? 'grey-5' : 'edit'"
+              :disable="props.row.commandId !== null"
+              icon="edit"
+              flat
+              round
+              @click.stop.prevent="openEditDialog(props.row)"
+            >
+              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+            </q-btn>
+            <q-btn
+              v-if="checkPermission($route)?.attrIsUpdate"
+              flat
+              dense
+              round
+              :color="
+                !props.row.refId || props.row.status !== 'PENDING'
+                  ? 'grey-5'
+                  : 'primary'
+              "
+              :disable="!props.row.refId || props.row.status !== 'PENDING'"
+              icon="mdi-account-arrow-left-outline"
+              @click.stop.prevent="onReturner(props.row.refId)"
+            >
+              <q-tooltip>ส่งตัวกลับ</q-tooltip>
+            </q-btn>
+          </q-card-actions>
 
-              <div class="col-9" v-else>
-                {{ props.row.commandNo ? props.row.commandNo : "-" }}
+          <q-separator />
+          <q-list>
+            <div
+              :class="`row q-pa-sm`"
+              :style="`background-color: ${index % 2 !== 0 ? '#FAFAFA' : ''}`"
+              v-for="(col, index) in props.cols"
+              :key="col.name"
+            >
+              <div class="col text-grey-6">
+                <div>{{ col.label }}</div>
+              </div>
+              <div class="col">
+                <div
+                  v-if="col.name == 'commandNo' && props.row.commandId"
+                  @click="col.value ? openViewCommand(props.row) : null"
+                  :class="
+                    col.value
+                      ? 'table_ellipsis text-blue cursor-pointer'
+                      : 'table_ellipsis'
+                  "
+                >
+                  {{ col.value ? col.value : "-" }}
+                  <q-tooltip v-if="col.value">ดูคำสั่ง</q-tooltip>
+                </div>
+                <div v-else>{{ col.value ? col.value : "-" }}</div>
               </div>
             </div>
-            <q-separator />
-            <div class="row q-pa-sm">
-              <div class="col-3 text-grey-6 text-weight-medium">
-                เอกสารอ้างอิง
-              </div>
-              <div class="col-9">
-                {{ props.row.document ? props.row.document : "-" }}
-              </div>
-            </div>
-            <q-separator />
-          </q-card-section>
+          </q-list>
         </q-card>
       </div>
     </template>
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 7f4b94024..4bce5855f 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
@@ -503,6 +503,7 @@ onMounted(async () => {
 
         <q-td auto-width>
           <q-btn
+            v-if="props.row.documentId !== null"
             color="green"
             flat
             dense
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
index ff65f9f40..3e021ecc9 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
@@ -552,6 +552,17 @@ onMounted(() => {
       <div class="q-pa-xs col-xs-12 col-sm-4 col-md-3">
         <q-card bordered>
           <q-card-actions align="right" class="bg-grey-3">
+            <q-btn
+              v-if="props.row.isUpload == true"
+              color="green"
+              flat
+              dense
+              round
+              icon="mdi-file-document-outline"
+              @click="onDownloadFile(props.row.id)"
+            >
+              <q-tooltip>ดาวน์โหลด</q-tooltip>
+            </q-btn>
             <q-btn
               dense
               flat
diff --git a/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue
index 361f84248..ddea4db6d 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue
@@ -369,7 +369,6 @@ onMounted(() => {
       </template>
     </q-input>
     <q-select
-      v-if="modelView == 'table'"
       v-model="visibleColumns"
       multiple
       outlined

From 2f4b1d198ff52a469692354c3cb5b4df3d171e79 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 1 May 2025 11:40:54 +0700
Subject: [PATCH 2/2] fix insignia

---
 .../07_insignia/components/1_Round/DialogDetail.vue   | 11 +++++++----
 src/modules/07_insignia/components/2_Manage/Tab1.vue  |  4 ++--
 src/modules/07_insignia/components/2_Manage/Tab2.vue  |  4 ++--
 src/modules/07_insignia/components/2_Manage/Tab3.vue  |  4 ++--
 src/modules/07_insignia/store.ts                      |  4 ++--
 src/modules/07_insignia/storeAllocate.ts              |  4 ++--
 src/modules/07_insignia/storeBrrow.ts                 |  6 +++---
 src/modules/07_insignia/storeResult.ts                |  4 ++--
 src/modules/07_insignia/views/03_ResultMain.vue       |  4 ++--
 src/modules/07_insignia/views/05_BorrowMain.vue       |  4 ++--
 10 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/modules/07_insignia/components/1_Round/DialogDetail.vue b/src/modules/07_insignia/components/1_Round/DialogDetail.vue
index 927a3dfec..e603bebdd 100644
--- a/src/modules/07_insignia/components/1_Round/DialogDetail.vue
+++ b/src/modules/07_insignia/components/1_Round/DialogDetail.vue
@@ -1,4 +1,3 @@
-divdivdivdiv
 <script setup lang="ts">
 import { computed, reactive, ref, watch } from "vue";
 import { useQuasar } from "quasar";
@@ -147,9 +146,13 @@ function onSubmit() {
       formData.append("endDate", dateToISO(dateEnd.value));
     }
     formData.append("file", files.value);
-    newEmpPosId.forEach((id) => {
-      formData.append("empPosId", id);
-    });
+    if (newEmpPosId.length > 0) {
+      newEmpPosId.forEach((id) => {
+        formData.append("empPosId", id);
+      });
+    } else {
+      formData.append("empPosId", '');
+    }
     const url =
       actionType.value !== "edit"
         ? config.API.listRoundInsignia()
diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue
index cb72e5e57..22f7416db 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab1.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue
@@ -146,7 +146,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "employeeType",
     align: "left",
-    label: "สถานภาพ",
+    label: "ประเภทตำแหน่ง",
     sortable: true,
     field: "employeeType",
     headerStyle: "font-size: 14px",
@@ -1012,7 +1012,7 @@ onMounted(async () => {
             outlined
             lazy-rules
             hide-bottom-space
-            :label="`${'สถานภาพ'}`"
+            :label="`${'ประเภทตำแหน่ง'}`"
             emit-value
             use-input
             map-options
diff --git a/src/modules/07_insignia/components/2_Manage/Tab2.vue b/src/modules/07_insignia/components/2_Manage/Tab2.vue
index 807e1df29..ea2b204c6 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab2.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab2.vue
@@ -71,7 +71,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "employeeType",
     align: "left",
-    label: "สถานภาพ",
+    label: "ประเภทตำแหน่ง",
     sortable: true,
     field: "employeeType",
     headerStyle: "font-size: 14px",
@@ -400,7 +400,7 @@ watch(
             outlined
             lazy-rules
             hide-bottom-space
-            :label="`${'สถานภาพ'}`"
+            :label="`${'ประเภทตำแหน่ง'}`"
             emit-value
             use-input
             hide-selected
diff --git a/src/modules/07_insignia/components/2_Manage/Tab3.vue b/src/modules/07_insignia/components/2_Manage/Tab3.vue
index 85a7b14bb..e4058e3a3 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab3.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab3.vue
@@ -71,7 +71,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "employeeType",
     align: "left",
-    label: "สถานภาพ",
+    label: "ประเภทตำแหน่ง",
     sortable: true,
     field: "employeeType",
     headerStyle: "font-size: 14px",
@@ -400,7 +400,7 @@ onMounted(async () => {
             outlined
             lazy-rules
             hide-bottom-space
-            :label="`${'สถานภาพ'}`"
+            :label="`${'ประเภทตำแหน่ง'}`"
             emit-value
             use-input
             map-options
diff --git a/src/modules/07_insignia/store.ts b/src/modules/07_insignia/store.ts
index 3e461d844..d6a99c582 100644
--- a/src/modules/07_insignia/store.ts
+++ b/src/modules/07_insignia/store.ts
@@ -184,9 +184,9 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
   }
 
   /**
-   * function ค้นหาข้อมมูลรายชื่อ ตาม ประเภทและสถานภาพ
+   * function ค้นหาข้อมมูลรายชื่อ ตาม ประเภทและประเภทตำแหน่ง
    * @param type ประเภท
-   * @param employeeClasstype สถานภาพ
+   * @param employeeClasstype ประเภทตำแหน่ง
    */
   async function searchDataTable(type: string, employeeClasstype: string) {
     typeinsignia.value = type;
diff --git a/src/modules/07_insignia/storeAllocate.ts b/src/modules/07_insignia/storeAllocate.ts
index 8b52350d9..ba7cdc30a 100644
--- a/src/modules/07_insignia/storeAllocate.ts
+++ b/src/modules/07_insignia/storeAllocate.ts
@@ -78,8 +78,8 @@ export const useAllocateDataStore = defineStore("insigniaallocate", () => {
   }
 
   /**
-   * function convert สถานภาพ
-   * @param val สถานภาพ
+   * function convert ประเภทตำแหน่ง
+   * @param val ประเภทตำแหน่ง
    */
   function profileType(val: string) {
     switch (val) {
diff --git a/src/modules/07_insignia/storeBrrow.ts b/src/modules/07_insignia/storeBrrow.ts
index 03a02de09..65db6bb3f 100644
--- a/src/modules/07_insignia/storeBrrow.ts
+++ b/src/modules/07_insignia/storeBrrow.ts
@@ -105,7 +105,7 @@ export const useBrrowDataStore = defineStore("insigniaBrrow", () => {
   /**
    * function ค้นหาข้อมูล Table
    * @param type ประเภทเครื่องราช
-   * @param employeeClass  สถานภาพ
+   * @param employeeClass  ประเภทตำแหน่ง
    */
   function searchDatatable(type: string, employeeClass: string) {
     if (type !== "" && employeeClass !== "all") {
@@ -144,8 +144,8 @@ export const useBrrowDataStore = defineStore("insigniaBrrow", () => {
   };
 
   /**
-   * function convert สถานภาพ
-   * @param val สถานภาพ
+   * function convert ประเภทตำแหน่ง
+   * @param val ประเภทตำแหน่ง
    */
   function profileType(val: string) {
     const newVal = val.toLocaleLowerCase();
diff --git a/src/modules/07_insignia/storeResult.ts b/src/modules/07_insignia/storeResult.ts
index 70d04be62..df90b2bee 100644
--- a/src/modules/07_insignia/storeResult.ts
+++ b/src/modules/07_insignia/storeResult.ts
@@ -172,8 +172,8 @@ export const useResultDataStore = defineStore("insigniaResult", () => {
   }
 
   /**
-   * function convert สถานภาพ
-   * @param val สถานภาพ
+   * function convert ประเภทตำแหน่ง
+   * @param val ประเภทตำแหน่ง
    */
   function profileType(val: string) {
     const newVal = val.toLocaleLowerCase();
diff --git a/src/modules/07_insignia/views/03_ResultMain.vue b/src/modules/07_insignia/views/03_ResultMain.vue
index 2164b9252..e6b65b1b6 100644
--- a/src/modules/07_insignia/views/03_ResultMain.vue
+++ b/src/modules/07_insignia/views/03_ResultMain.vue
@@ -109,7 +109,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "employeeType",
     align: "left",
-    label: "สถานภาพ",
+    label: "ประเภทตำแหน่ง",
     field: "employeeType",
     sortable: true,
     sort: (a: string, b: string) =>
@@ -811,7 +811,7 @@ onMounted(() => {
               outlined
               lazy-rules
               hide-bottom-space
-              :label="`${'สถานภาพ'}`"
+              :label="`${'ประเภทตำแหน่ง'}`"
               emit-value
               map-options
               use-input
diff --git a/src/modules/07_insignia/views/05_BorrowMain.vue b/src/modules/07_insignia/views/05_BorrowMain.vue
index 5885d0ecd..1a6e226c4 100644
--- a/src/modules/07_insignia/views/05_BorrowMain.vue
+++ b/src/modules/07_insignia/views/05_BorrowMain.vue
@@ -85,7 +85,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "employeeType",
     align: "left",
-    label: "สถานภาพ",
+    label: "ประเภทตำแหน่ง",
     field: "employeeType",
     sortable: true,
     headerStyle: "font-size: 14px",
@@ -616,7 +616,7 @@ onMounted(async () => {
                 outlined
                 lazy-rules
                 hide-bottom-space
-                :label="`${'สถานภาพ'}`"
+                :label="`${'ประเภทตำแหน่ง'}`"
                 emit-value
                 use-input
                 hide-selected