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(() => {
{{ dataPerson.position }}
-
ประเภทตำแหน่ง
+
ตำแหน่งประเภท
{{ dataPerson.type }}
@@ -1149,7 +1149,7 @@ onMounted(() => {
{{ dataGuarantor.position }}
-
ประเภท
+
ตำแหน่งประเภท
{{ dataGuarantor.type }}
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)" > - {{ col.fullNameCurrentHolder }} + {{ + `${col.posNo} ${ + col.fullNameCurrentHolder + ? " (" + col.fullNameCurrentHolder + ")" + : "" + }` + }}