From aad08aba0e7b04aaa0d299668af9b851f8232ed4 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 5 Nov 2024 15:11:36 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=A3=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=81=E0=B8=A9=E0=B8=B2=E0=B8=81=E0=B8=B2=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../15_development/components/scholarship/DetailView.vue  | 6 +++---
 src/modules/17_acting/interface/response/Main.ts          | 1 +
 src/modules/17_acting/views/main.vue                      | 8 +++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/modules/15_development/components/scholarship/DetailView.vue b/src/modules/15_development/components/scholarship/DetailView.vue
index 47afaebaa..5b77c706d 100644
--- a/src/modules/15_development/components/scholarship/DetailView.vue
+++ b/src/modules/15_development/components/scholarship/DetailView.vue
@@ -10,7 +10,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import type {
   DataOption,
   DataPerson,
-  PersonData
+  PersonData,
 } from "@/modules/15_development/interface/index/Main";
 import type { FormsSholarship } from "@/modules/15_development/interface/request/Scholarship";
 import type { DataSholarship } from "@/modules/15_development/interface/response/Scholarship";
@@ -621,7 +621,7 @@ onMounted(() => {
                 <div class="col-8 text-weight-medium">
                   {{ dataPerson.position }}
                 </div>
-                <div class="col-4 text-grey">ประเภทตำแหน่ง</div>
+                <div class="col-4 text-grey">ตำแหน่งประเภท</div>
                 <div class="col-8 text-weight-medium">
                   {{ dataPerson.type }}
                 </div>
@@ -1149,7 +1149,7 @@ onMounted(() => {
                       <div class="col-8 text-weight-medium">
                         {{ dataGuarantor.position }}
                       </div>
-                      <div class="col-4 text-grey">ประเภท</div>
+                      <div class="col-4 text-grey">ตำแหน่งประเภท</div>
                       <div class="col-8 text-weight-medium">
                         {{ dataGuarantor.type }}
                       </div>
diff --git a/src/modules/17_acting/interface/response/Main.ts b/src/modules/17_acting/interface/response/Main.ts
index 8a8c012be..94e70ab0c 100644
--- a/src/modules/17_acting/interface/response/Main.ts
+++ b/src/modules/17_acting/interface/response/Main.ts
@@ -13,6 +13,7 @@ interface DataTree {
 }
 
 interface PosMaster {
+  posNo: string;
   fullNameCurrentHolder: string;
   orgLevel: number;
   orgTreeId: string;
diff --git a/src/modules/17_acting/views/main.vue b/src/modules/17_acting/views/main.vue
index 43d65d707..234474dd8 100644
--- a/src/modules/17_acting/views/main.vue
+++ b/src/modules/17_acting/views/main.vue
@@ -364,7 +364,13 @@ onMounted(() => {
                     @click.stop="updateSelected(col)"
                   >
                     <q-item-section>
-                      {{ col.fullNameCurrentHolder }}
+                      {{
+                        `${col.posNo} ${
+                          col.fullNameCurrentHolder
+                            ? " (" + col.fullNameCurrentHolder + ")"
+                            : ""
+                        }`
+                      }}
                     </q-item-section>
                   </q-item>
                 </q-list>