diff --git a/src/pages/medcards/components/MedicalCardSearchList.vue b/src/pages/medcards/components/MedicalCardSearchList.vue index dc3f44a..2b54358 100644 --- a/src/pages/medcards/components/MedicalCardSearchList.vue +++ b/src/pages/medcards/components/MedicalCardSearchList.vue @@ -40,7 +40,7 @@ export default { methods: { headerStyle(field) { return { - width: field.width, + ...field, "justify-content": field.title === "Do" ? "center" : "", }; }, diff --git a/src/pages/medcards/components/MedicalCardSearchRow.vue b/src/pages/medcards/components/MedicalCardSearchRow.vue index 4a7d5a6..e721353 100644 --- a/src/pages/medcards/components/MedicalCardSearchRow.vue +++ b/src/pages/medcards/components/MedicalCardSearchRow.vue @@ -8,22 +8,15 @@ span.font-semibold.text-dark {{patientName}} .field(:style="headerStyle(headerConfig[1])") span.text-dark {{ convertDate(medcardInfo?.person?.birth_date) }} г. - .field.gap-x-2(:style="headerStyle(headerConfig[2])") - .rounded-full.h-2.w-2(:style="{background: patientPriority?.color}") - span(:style="{color: patientPriority?.color}") {{ patientPriority?.text }} - .field(:style="headerStyle(headerConfig[3])") + .field(:style="headerStyle(headerConfig[2])") .medcard-number.rounded.h-7.py-1.pl-3.pr-2.flex.items-center.justify-between.w-full.cursor-pointer( @click="copyValue(medcardInfo?.number)" ) span.text-dark.cursor-pointer {{ medcardInfo?.number }} q-icon.copy(size="18px", name="app:copy") - .field(:style="headerStyle(headerConfig[4])") + .field(:style="headerStyle(headerConfig[3])") span.text-dark {{ convertDate(medcardInfo?.created_at) }} г. - .field.gap-x-3(:style="headerStyle(headerConfig[5])") - .track.h-2.flex-1.rounded - .thumb.h-full.rounded(:style="thumbStyle") - span.grey-color {{ medcardInfo?.filling_percentage || 0 }}% - .field(:style="{...headerStyle(headerConfig[6])}") + .field(:style="{...headerStyle(headerConfig[4])}") q-icon.medcard.cursor-pointer(name="app:medcard", size="20px", @click="openMedicalCard") diff --git a/src/pages/medcards/utils/medcardsConfig.js b/src/pages/medcards/utils/medcardsConfig.js index d3ac0ac..f7eb568 100644 --- a/src/pages/medcards/utils/medcardsConfig.js +++ b/src/pages/medcards/utils/medcardsConfig.js @@ -1,31 +1,24 @@ export const searchListConfig = [ { title: "ФИО", - width: "550px", + width: "100%", + minWidth: "350px", }, { title: "Дата рождения", - width: "220px", - }, - { - title: "Приоритет", - width: "220px", + minWidth: "220px", }, { title: "№ медкарты", - width: "280px", + minWidth: "280px", }, { title: "Дата создания", - width: "215px", - }, - { - title: "Процент заполнения", - width: "295px", + minWidth: "215px", }, { title: "Do", - width: "60px", + minWidth: "60px", }, ]; diff --git a/src/pages/newMedicalCard/components/BasicDataForms/BasicDataForm.vue b/src/pages/newMedicalCard/components/BasicDataForms/BasicDataForm.vue index 542f37a..ad11a02 100644 --- a/src/pages/newMedicalCard/components/BasicDataForms/BasicDataForm.vue +++ b/src/pages/newMedicalCard/components/BasicDataForms/BasicDataForm.vue @@ -1,5 +1,6 @@