Merge branch 'develop' into dev-tee

This commit is contained in:
setthawutttty 2023-09-08 10:54:38 +07:00
commit b25fab71a4
4 changed files with 58 additions and 7 deletions

View file

@ -29,6 +29,7 @@ const position_level = ref<string>("");
const organization = ref<string>("");
const probation_status = ref<string>("");
const probation_statusold = ref<string>("");
const avatarprofile = ref<string>("");
const visibleColumns = ref<string[]>([
"no",
@ -152,12 +153,14 @@ const getpersonalList = async () => {
.get(config.API.personal(personalId.value))
.then((res) => {
const data = res.data.data;
// console.log(data);
name.value = data.name;
position_line.value = data.position_line;
position_level.value = data.position_level;
organization.value = data.organization;
probation_status.value = data.probation_status;
probation_statusold.value = data.probation_status;
avatarprofile.value = data.avatar;
})
.catch(() => {})
.finally(() => {
@ -250,7 +253,8 @@ const paginationLabel = (start: string, end: string, total: string) => {
<div class="row col-12 q-pa-md">
<div class="col-12 row bg-white q-col-gutter-md">
<div class="col-xs-3 col-sm-2 col-md-1 row">
<q-img src="@/assets/avatar_user.jpg" />
<q-img :src="avatarprofile" v-if="avatarprofile !== null" />
<q-img src="@/assets/avatar_user.jpg" v-else />
</div>
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12 q-pl-md">