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

This commit is contained in:
Warunee Tamkoo 2023-09-26 18:06:10 +07:00
commit 3bbc0df6f0

View file

@ -373,7 +373,7 @@ const dataInfo = reactive({
reason: "",
reliefDoc: "",
});
//
//
const editDetail = (
props: PartialTableName,
action: "disclaim" | "deferment" | "defermentInfo" | "disclaimInfo"
@ -919,7 +919,7 @@ const pagination = ref({
<!-- dialog เพมรายช -->
<q-dialog v-model="modaladdlist">
<q-card style="width: 900px; max-width: 80vw">
<q-card style="width: 950px; max-width: 80vw">
<DialogHeader
tittle="ส่งรายชื่อไปยังหน่วยงาน"
:close="clickCloseSendModal"
@ -1006,7 +1006,28 @@ const pagination = ref({
v-else-if="col.name === 'fullName'"
class="table_ellipsis"
>
<div class="row col-12 text-no-wrap items-center">
<q-item v-ripple style="padding: 0">
<q-item-section avatar>
<img
v-if="props.row.avatar == ''"
src="@/assets/avatar_user.jpg"
class="col-4 img-info"
/>
<img
v-else
:src="props.row.avatar"
class="col-4 img-info"
/>
</q-item-section>
<q-item-section>
<div class="text-weight-medium">{{ props.row.name }}</div>
<div class="text-weight-light">
{{ props.row.idCard }}
</div>
</q-item-section>
</q-item>
<!-- <div class="row col-12 text-no-wrap items-center">
<img
v-if="props.row.avatar == ''"
src="@/assets/avatar_user.jpg"
@ -1023,7 +1044,7 @@ const pagination = ref({
{{ props.row.idCard }}
</div>
</div>
</div>
</div> -->
</template>
<template v-else-if="col.name === 'examNumber'">
<div class="text-weight-medium">