From 56d1bacc090fdbc2025d0037540b8918c1fb31b9 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Thu, 19 Dec 2024 16:38:20 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B9=80?=
 =?UTF-8?q?=E0=B9=80=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=9C=E0=B8=A5=20?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B1=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../11_discipline/components/1_Complaint/EditPage.vue       | 6 +++---
 src/modules/11_discipline/components/PopupSendToNext.vue    | 2 +-
 src/modules/11_discipline/store/Main.ts                     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/modules/11_discipline/components/1_Complaint/EditPage.vue b/src/modules/11_discipline/components/1_Complaint/EditPage.vue
index 68e0a98aa..067a12b9a 100644
--- a/src/modules/11_discipline/components/1_Complaint/EditPage.vue
+++ b/src/modules/11_discipline/components/1_Complaint/EditPage.vue
@@ -132,11 +132,11 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
   {
-    name: "positionLevel",
+    name: "posLevelName",
     align: "left",
     label: "ระดับ",
     sortable: true,
-    field: "positionLevel",
+    field: "posLevelName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -171,7 +171,7 @@ const visibleColumns = ref<string[]>([
   "name",
   "posNo",
   "position",
-  "positionLevel",
+  "posLevelName",
   "salary",
   "organization",
 ]);
diff --git a/src/modules/11_discipline/components/PopupSendToNext.vue b/src/modules/11_discipline/components/PopupSendToNext.vue
index 8e0b28f57..c527c9f7d 100644
--- a/src/modules/11_discipline/components/PopupSendToNext.vue
+++ b/src/modules/11_discipline/components/PopupSendToNext.vue
@@ -223,7 +223,7 @@ watch(
                   }}
                 </div>
                 <div v-else>
-                  {{ col.value }}
+                  {{ col.value ? col.value:'-' }}
                 </div>
               </q-td>
             </q-tr>
diff --git a/src/modules/11_discipline/store/Main.ts b/src/modules/11_discipline/store/Main.ts
index 5bf475a8b..5266ce6cb 100644
--- a/src/modules/11_discipline/store/Main.ts
+++ b/src/modules/11_discipline/store/Main.ts
@@ -201,11 +201,11 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
       style: "font-size: 14px",
     },
     {
-      name: "positionLevel",
+      name: "posLevelName",
       align: "left",
       label: "ระดับ",
       sortable: true,
-      field: "positionLevel",
+      field: "posLevelName",
       headerStyle: "font-size: 14px",
       style: "font-size: 14px",
       format(val, row) {
@@ -248,7 +248,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
     "name",
     "posNo",
     "position",
-    "positionLevel",
+    "posLevelName",
     "salary",
     "organization",
   ]);