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] 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