[WIP] Fixed bugs

This commit is contained in:
megavrilinvv
2023-08-01 12:57:31 +03:00
parent ef479d7f11
commit ee9a8fae54
3 changed files with 13 additions and 7 deletions

View File

@@ -3,7 +3,7 @@
title="Пациенты на сегодня", title="Пациенты на сегодня",
:quantity="patientsData.length", :quantity="patientsData.length",
:link="redirectCalendar", :link="redirectCalendar",
title-link="Календарь" title-link="В календарь"
) )
.form-wrapper.flex.flex-col.overflow-y-auto( .form-wrapper.flex.flex-col.overflow-y-auto(
@scroll="scrollTo", @scroll="scrollTo",
@@ -19,7 +19,7 @@
img.h-11.w-11.object-cover.rounded-full(:src="patient.avatar") img.h-11.w-11.object-cover.rounded-full(:src="patient.avatar")
.flex.flex-col.justify-center.gap-y-1 .flex.flex-col.justify-center.gap-y-1
.name.flex.relative {{trimName(patient.last_name, patient.first_name, patient.patronymic)}} .name.flex.relative {{trimName(patient.last_name, patient.first_name, patient.patronymic)}}
.grey-color.text-smm {{patient.birthday}} .grey-color.text-smm {{trimBirthday(patient.birthday)}}
.flex.flex-col.justify-center.w-full(:style="{width: '140px'}") .flex.flex-col.justify-center.w-full(:style="{width: '140px'}")
.text-m.font-bold {{patient.time.from + " - " + patient.time.to}} .text-m.font-bold {{patient.time.from + " - " + patient.time.to}}
.grey-color.font-medium.text-smm( .grey-color.font-medium.text-smm(
@@ -62,6 +62,9 @@ export default {
}; };
}, },
methods: { methods: {
trimBirthday(birthday) {
return moment(birthday, "DD MM YYYY").format("DD MMMM YYYY") + " г.";
},
trimName(last, first, patronymic) { trimName(last, first, patronymic) {
let fullName = last + " " + first + " " + patronymic; let fullName = last + " " + first + " " + patronymic;
if (fullName.length > 30) return fullName.slice(0, 30); if (fullName.length > 30) return fullName.slice(0, 30);
@@ -140,7 +143,7 @@ export default {
margin-right: 0px margin-right: 0px
border-right: none border-right: none
&:last-child &:last-child
border-bottom: 1px solid var(--gray-scondary) border-bottom: 1px solid var(--gray-secondary)
.default-form .default-form
margin-right: 0px margin-right: 0px
@@ -155,7 +158,7 @@ export default {
left: 0 left: 0
.btn .btn
border: 1px solid var(--gray-scondary) border: 1px solid var(--gray-secondary)
color: var(--font-grey-color) color: var(--font-grey-color)
background: var(--bg-light-grey) background: var(--bg-light-grey)

View File

@@ -52,7 +52,7 @@
) )
template(v-slot:iconLeft) template(v-slot:iconLeft)
q-icon.input-icon(name="app:search", size="16px") q-icon.input-icon(name="app:search", size="16px")
q-btn.ml-2( q-btn.ml-2.sort-icon(
@click="sortPerson(elem.data)", @click="sortPerson(elem.data)",
:class="sortingClass", :class="sortingClass",
:style="{width: '32px', height: '32px'}", :style="{width: '32px', height: '32px'}",
@@ -411,4 +411,7 @@ export default {
.icon-patients :deep(path) .icon-patients :deep(path)
fill: var(--btn-blue-color) fill: var(--btn-blue-color)
.sort-icon :deep(path)
fill: var(--font-grey-color)
</style> </style>

View File

@@ -240,8 +240,8 @@ export const patientList = [
check: false, check: false,
view: false, view: false,
viewDate: "", viewDate: "",
reception: "26.07.2023", reception: "01.08.2023",
time: { from: "20:00", to: "21:00" }, time: { from: "15:00", to: "21:00" },
priority: 1, priority: 1,
phone: "+7 (910) 6233223", phone: "+7 (910) 6233223",
email: "gaevaia@yandex.ru", email: "gaevaia@yandex.ru",