hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

แก้รักษาการ

Browse source
This commit is contained in:
Warunee Tamkoo 2024-11-05 15:11:36 +07:00
parent 6c0f4530ab
commit aad08aba0e
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/15_development/components/scholarship/DetailView.vue
View file

@ -10,7 +10,7 @@ import { useCounterMixin } from "@/stores/mixin";
import type { import type {
DataOption, DataOption,
DataPerson, DataPerson,
PersonData PersonData,
} from "@/modules/15_development/interface/index/Main"; } from "@/modules/15_development/interface/index/Main";
import type { FormsSholarship } from "@/modules/15_development/interface/request/Scholarship"; import type { FormsSholarship } from "@/modules/15_development/interface/request/Scholarship";
import type { DataSholarship } from "@/modules/15_development/interface/response/Scholarship"; import type { DataSholarship } from "@/modules/15_development/interface/response/Scholarship";
@ -621,7 +621,7 @@ onMounted(() => {
<div class="col-8 text-weight-medium"> <div class="col-8 text-weight-medium">
{{ dataPerson.position }} {{ dataPerson.position }}
</div> </div>
<div class="col-4 text-grey">ประเภทตำแหน่ง</div> <div class="col-4 text-grey">ตำแหน่งประเภท</div>
<div class="col-8 text-weight-medium"> <div class="col-8 text-weight-medium">
{{ dataPerson.type }} {{ dataPerson.type }}
</div> </div>
@ -1149,7 +1149,7 @@ onMounted(() => {
<div class="col-8 text-weight-medium"> <div class="col-8 text-weight-medium">
{{ dataGuarantor.position }} {{ dataGuarantor.position }}
</div> </div>
<div class="col-4 text-grey">ประเภท</div> <div class="col-4 text-grey">ตำแหน่งประเภท</div>
<div class="col-8 text-weight-medium"> <div class="col-8 text-weight-medium">
{{ dataGuarantor.type }} {{ dataGuarantor.type }}
</div> </div>

1
src/modules/17_acting/interface/response/Main.ts
View file

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

8
src/modules/17_acting/views/main.vue
View file

@ -364,7 +364,13 @@ onMounted(() => {
@click.stop="updateSelected(col)" @click.stop="updateSelected(col)"
> >
<q-item-section> <q-item-section>
{{ col.fullNameCurrentHolder }} {{
`${col.posNo} ${
col.fullNameCurrentHolder
? " (" + col.fullNameCurrentHolder + ")"
: ""
}`
}}
</q-item-section> </q-item-section>
</q-item> </q-item>
</q-list> </q-list>