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

Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-01-19 16:11:41 +07:00
commit 942cd8e7c3
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue
View file

@ -43,7 +43,7 @@ const data = reactive<dataDetail>({
id: "", id: "",
personId: "", personId: "",
citizenId: "", citizenId: "",
avataPath: "", avatar: "",
name: "", name: "",
prefix: "", prefix: "",
firstName: "", firstName: "",
@ -72,6 +72,7 @@ async function getData(){
const dataGet = res.data.result; const dataGet = res.data.result;
data.id = dataGet.id; data.id = dataGet.id;
data.personId = dataGet.personId; data.personId = dataGet.personId;
data.personId = dataGet.personId;
data.citizenId = dataGet.citizenId; data.citizenId = dataGet.citizenId;
data.name = `${dataGet.prefix}${dataGet.firstName} ${dataGet.lastName}`; data.name = `${dataGet.prefix}${dataGet.firstName} ${dataGet.lastName}`;
data.prefix = dataGet.prefix; data.prefix = dataGet.prefix;
@ -234,7 +235,7 @@ onMounted(async () => {
<div class="row col-12 q-pa-md"> <div class="row col-12 q-pa-md">
<div class="col-12 row bg-white q-col-gutter-md"> <div class="col-12 row bg-white q-col-gutter-md">
<div class="col-xs-3 col-sm-2 col-md-1 row"> <div class="col-xs-3 col-sm-2 col-md-1 row">
<q-img :src="data.avataPath" v-if="data.avataPath !== ''" /> <q-img :src="data.avatar" v-if="data.avatar !== ''" />
<q-img src="@/assets/avatar_user.jpg" v-else /> <q-img src="@/assets/avatar_user.jpg" v-else />
</div> </div>
<div class="col-xs-6 col-sm-3 row items-center"> <div class="col-xs-6 col-sm-3 row items-center">

2
src/modules/11_discipline/interface/response/suspend.ts
View file

@ -47,7 +47,7 @@ interface dataDetail {
id: string; id: string;
personId: string; personId: string;
citizenId: string; citizenId: string;
avataPath: string; avatar: string;
name: string; name: string;
prefix: string; prefix: string;
firstName: string; firstName: string;