diff --git a/src/pages/medcards/components/MedicalCardSearch.vue b/src/pages/medcards/components/MedicalCardSearch.vue index 61b1911..6d5bce6 100644 --- a/src/pages/medcards/components/MedicalCardSearch.vue +++ b/src/pages/medcards/components/MedicalCardSearch.vue @@ -21,7 +21,7 @@ export default { medicalCards: [], dataStatus: { title: "no data", - message: "Введите номер карты или ФИО пациента", + message: "Введите данные Пациента для поиска", img: nothingChooseImg, }, }; @@ -31,20 +31,21 @@ export default { if (!value) { this.dataStatus = { title: "no data", - message: "Введите номер карты или ФИО пациента", + message: "Введите ФИО Пациента", img: nothingChooseImg, }; this.medicalCards = []; return; } - const data = await fetchWrapper.get( - "medical_cards?searchstring=" + value - ); + + const data = await fetchWrapper.post("persons/search", { + full_name: value, + }); if (data?.length === 0) { this.medicalCard = []; this.dataStatus = { title: "not found", - message: `По запросу «${value}» не найдено. + message: `По запросу «${value}» Пациентов не найдено. Переформулируйте запрос и попробуйте снова`, img: nothingSearchImg, }; diff --git a/src/pages/medcards/components/MedicalCardSearchHeader.vue b/src/pages/medcards/components/MedicalCardSearchHeader.vue index 80ef26a..2473a36 100644 --- a/src/pages/medcards/components/MedicalCardSearchHeader.vue +++ b/src/pages/medcards/components/MedicalCardSearchHeader.vue @@ -4,15 +4,15 @@ base-input.search( :width="438", size="M", - placeholder="Введите ФИО или номер телефона", + placeholder="ФИО Пациента", icon-left, v-model="filterString" ) template(#iconLeft) q-icon.search-icon(name="app:search", size="20px") - base-button(width="216px", @click="showCreateModal = true") - q-icon.plus.mr-2(name="app:plus", size="24px") - span Создать медкарту + base-button(@click="showCreateModal = true") + q-icon.plus.mr-2(name="app:plus", size="18px") + span Новая медкарта base-modal(v-model="showCreateModal", title="Создать медицинскую карту", modal-padding) patient-creation-form(@close="handleClosePatientForm") @@ -72,7 +72,8 @@ export default { fill: var(--font-grey-color) .search :deep(.q-field__prepend) - padding-right: 4px + padding-right: 12px + .plus :deep(path) fill: var(--default-white) diff --git a/src/pages/medcards/components/MedicalCardSearchList.vue b/src/pages/medcards/components/MedicalCardSearchList.vue index 2b54358..07606dd 100644 --- a/src/pages/medcards/components/MedicalCardSearchList.vue +++ b/src/pages/medcards/components/MedicalCardSearchList.vue @@ -17,7 +17,7 @@ v-for="medcard in medicalCards", :key="medcard.id" :header-style="headerStyle", - :medcard-info="medcard", + :person="medcard", ) @@ -41,7 +41,6 @@ export default { headerStyle(field) { return { ...field, - "justify-content": field.title === "Do" ? "center" : "", }; }, }, diff --git a/src/pages/medcards/components/MedicalCardSearchRow.vue b/src/pages/medcards/components/MedicalCardSearchRow.vue index e721353..bed820c 100644 --- a/src/pages/medcards/components/MedicalCardSearchRow.vue +++ b/src/pages/medcards/components/MedicalCardSearchRow.vue @@ -1,93 +1,69 @@ @@ -122,8 +98,6 @@ span .track background: var(--gray-thirdly) -.thumb - .grey-color color: var(--font-grey-color) diff --git a/src/pages/medcards/utils/medcardsConfig.js b/src/pages/medcards/utils/medcardsConfig.js index f7eb568..c342151 100644 --- a/src/pages/medcards/utils/medcardsConfig.js +++ b/src/pages/medcards/utils/medcardsConfig.js @@ -1,4 +1,8 @@ export const searchListConfig = [ + { + title: "Медкарта", + minWidth: "140px", + }, { title: "ФИО", width: "100%", @@ -9,42 +13,7 @@ export const searchListConfig = [ minWidth: "220px", }, { - title: "№ медкарты", - minWidth: "280px", - }, - { - title: "Дата создания", - minWidth: "215px", - }, - { - title: "Do", - minWidth: "60px", - }, -]; - -export const priorityList = [ - { - priority: 1, - id: 1, - text: "Высокий", - color: "var(--system-color-red)", - }, - { - priority: 2, - id: 2, - text: "Средний", - color: "var(--bg-yellow-warning)", - }, - { - priority: 3, - id: 3, - text: "Низкий", - color: "var(--btn-blue-color)", - }, - { - priority: null, - id: 4, - text: "-", - color: "#9294A7", + title: "Телефон", + minWidth: "220px", }, ];