Merge branch 'develop' into devTee

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>

src/modules/17_acting/interface/response/Main.ts

@@ -13,6 +13,7 @@ interface DataTree {
 }
 
 interface PosMaster {
+  posNo: string;
   fullNameCurrentHolder: string;
   orgLevel: number;
   orgTreeId: string;

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>