diff --git a/src/components/HeaderInputs.vue b/src/components/HeaderInputs.vue index 8513af0..80bb2ec 100644 --- a/src/components/HeaderInputs.vue +++ b/src/components/HeaderInputs.vue @@ -13,7 +13,7 @@ .icon-wrapper.mr-2.flex.justify-center .icon-ok.text-xs.flex.justify-center.items-center(v-if="filter === selectedFilter") .flex.items-center {{ filter }} - base-input(type="text", square, placeholder="Искать ...") + base-input.p-4(type="text", square, placeholder="Искать ...", borderless) diff --git a/src/components/base/BaseSearchSelect.vue b/src/components/base/BaseSearchSelect.vue deleted file mode 100644 index e21f556..0000000 --- a/src/components/base/BaseSearchSelect.vue +++ /dev/null @@ -1,146 +0,0 @@ - - - - - diff --git a/src/components/kit/KitLongList.vue b/src/components/kit/KitLongList.vue index 9ab4ee1..9aacd68 100644 --- a/src/components/kit/KitLongList.vue +++ b/src/components/kit/KitLongList.vue @@ -1,7 +1,7 @@ diff --git a/src/pages/clients/components/ClientsTableHat.vue b/src/pages/clients/components/ClientsTableHat.vue index bcc4443..0318921 100644 --- a/src/pages/clients/components/ClientsTableHat.vue +++ b/src/pages/clients/components/ClientsTableHat.vue @@ -7,7 +7,8 @@ icon-position="left", v-model="searchClient", placeholder="Введите фамилию", - @keyup.enter="searchLastName" + @keyup.enter="searchLastName", + outlined ) .flex.items-center.cursor-pointer .icon-search diff --git a/src/pages/clients/components/FormCreateAdditional.vue b/src/pages/clients/components/FormCreateAdditional.vue deleted file mode 100644 index cb2537f..0000000 --- a/src/pages/clients/components/FormCreateAdditional.vue +++ /dev/null @@ -1,68 +0,0 @@ - - - - - diff --git a/src/pages/clients/components/FormCreateAddresses.vue b/src/pages/clients/components/FormCreateAddresses.vue index 5abbdbf..ecf1873 100644 --- a/src/pages/clients/components/FormCreateAddresses.vue +++ b/src/pages/clients/components/FormCreateAddresses.vue @@ -4,7 +4,8 @@ base-input( v-model="addresses.full_address", placeholder="Введите адрес целиком", - label="Полный адрес" + label="Полный адрес", + outlined ) .flex.items-center.justify-center.relative .line.absolute @@ -15,35 +16,40 @@ filled, placeholder="Введите город", v-model="addresses.city", - label="Город" + label="Город", + outlined ) base-input( disabled, filled, placeholder="Введите область", v-model="addresses.region", - label="Область" + label="Область", + outlined ) base-input( disabled, filled, placeholder="Введите улицу", v-model="addresses.street", - label="Введите улицу" + label="Введите улицу", + outlined ) base-input( disabled, filled, placeholder="Номер дома", v-model="addresses.house_number", - label="Дом" + label="Дом", + outlined ) base-input( disabled, filled, placeholder="Номер квартиры", v-model="addresses.apartment_number", - label="Квартира" + label="Квартира", + outlined ) base-input( disabled, @@ -51,7 +57,8 @@ placeholder="000000", mask="######", v-model="addresses.zip_code", - label="Индекс" + label="Индекс", + outlined ) diff --git a/src/pages/clients/components/FormCreateBasicInfo.vue b/src/pages/clients/components/FormCreateBasicInfo.vue index 8049929..42d4c64 100644 --- a/src/pages/clients/components/FormCreateBasicInfo.vue +++ b/src/pages/clients/components/FormCreateBasicInfo.vue @@ -10,18 +10,21 @@ base-input( type="date" v-model="basicInfo.birth_date", - label="Дата рождения" + label="Дата рождения", + outlined ) base-input( v-model="phone.username", placeholder="+7 (915) 644–92–23", mask="+7 (###) ###-##-##", - label="Номер телефона" + label="Номер телефона", + outlined ) base-input( v-model="email.username", placeholder="user@yandex.ru", - label="Email" + label="Email", + outlined ) .flex.flex-col.col-start-1.col-end-3.w-100(class="gap-y-1.5") span.text-sm.font-semibold.opacity-40.input-info Ссылки на соцсети diff --git a/src/pages/clients/components/FormCreateIdentityDocuments.vue b/src/pages/clients/components/FormCreateIdentityDocuments.vue index 7550721..e5f9c1c 100644 --- a/src/pages/clients/components/FormCreateIdentityDocuments.vue +++ b/src/pages/clients/components/FormCreateIdentityDocuments.vue @@ -7,24 +7,28 @@ mask="#### ######", v-model="identityDocument.pass.series_number", placeholder="0000 000000", - label="Серия и номер" + label="Серия и номер", + outlined ) base-input( v-model="identityDocument.pass.issued_by_org", placeholder="Точно как в паспорте", - label="Кем выдан" + label="Кем выдан", + outlined ) base-input( mask="###-###", v-model="identityDocument.pass.issued_by_org_code", placeholder="000–000", - label="Код подразделения" + label="Код подразделения", + outlined ) base-input( type="date" v-model="identityDocument.pass.issued_by_date", placeholder="Дата", - label="Дата выдачи" + label="Дата выдачи", + outlined ) .flex.flex-col.gap-y-6 span.title-info.text-base.font-bold СНИЛС и ИНН @@ -35,7 +39,8 @@ mask="###-###-### ##", v-model="identityDocument.snils.number", placeholder="000–000–000 00", - label="Номер СНИЛС" + label="Номер СНИЛС", + outlined ) base-input( disabled, @@ -43,7 +48,8 @@ mask="############", v-model="identityDocument.inn.number", placeholder="000000000000", - label="Номер ИНН" + label="Номер ИНН", + outlined ) diff --git a/src/pages/clients/components/FormsAgreementCreate/AgreementCommon.vue b/src/pages/clients/components/FormsAgreementCreate/AgreementCommon.vue index 73907b6..cfc859d 100644 --- a/src/pages/clients/components/FormsAgreementCreate/AgreementCommon.vue +++ b/src/pages/clients/components/FormsAgreementCreate/AgreementCommon.vue @@ -11,17 +11,20 @@ base-input( type="date", v-model="signedDate", - label="Дата подписания" + label="Дата подписания", + outlined ) base-input( type="date", v-model="startDate", label="Начало оказания услуг" + outlined ) base-input( type="date", v-model="endDate", label="Окончание оказания услуг" + outlined ) base-custom-select( placeholder="Поручить", diff --git a/src/pages/clients/components/FormsAgreementCreate/AgreementPerson.vue b/src/pages/clients/components/FormsAgreementCreate/AgreementPerson.vue index 8328737..246b4a2 100644 --- a/src/pages/clients/components/FormsAgreementCreate/AgreementPerson.vue +++ b/src/pages/clients/components/FormsAgreementCreate/AgreementPerson.vue @@ -5,6 +5,7 @@ label="ФИО пациента", v-model="patientFullName", disabled + outlined ) //-.flex.justify-between base-custom-select.w-80( diff --git a/src/pages/clients/components/FormsAgreementCreate/AgreementServices.vue b/src/pages/clients/components/FormsAgreementCreate/AgreementServices.vue index 7d03e3f..8c968a2 100644 --- a/src/pages/clients/components/FormsAgreementCreate/AgreementServices.vue +++ b/src/pages/clients/components/FormsAgreementCreate/AgreementServices.vue @@ -12,16 +12,19 @@ type="date", v-model="signedDate", label="Дата подписания" + outlined ) base-input( type="date", v-model="startDate", label="Начало оказания услуг" + outlined ) base-input( type="date", v-model="endDate", label="Окончание оказания услуг" + outlined ) base-custom-select( placeholder="Поручить", diff --git a/src/pages/clients/components/TableCreateNote.vue b/src/pages/clients/components/TableCreateNote.vue index bce01fb..076a246 100644 --- a/src/pages/clients/components/TableCreateNote.vue +++ b/src/pages/clients/components/TableCreateNote.vue @@ -1,7 +1,7 @@ diff --git a/src/pages/clients/components/cells/TableCellBodyEmail.vue b/src/pages/clients/components/cells/TableCellBodyEmail.vue index 53a9a1d..814c06e 100644 --- a/src/pages/clients/components/cells/TableCellBodyEmail.vue +++ b/src/pages/clients/components/cells/TableCellBodyEmail.vue @@ -12,7 +12,8 @@ v-if="isOpenChange", @click.stop, v-model="value.email.username", - :placeholder="value.email.username" + :placeholder="value.email.username", + outlined ) diff --git a/src/pages/clients/components/cells/TableCellBodyName.vue b/src/pages/clients/components/cells/TableCellBodyName.vue index 572812f..0b26af7 100644 --- a/src/pages/clients/components/cells/TableCellBodyName.vue +++ b/src/pages/clients/components/cells/TableCellBodyName.vue @@ -10,7 +10,8 @@ base-input( @click.stop, v-model="value.fullName", - placeholder="Фамилия Имя Отчество" + placeholder="Фамилия Имя Отчество", + outlined ) diff --git a/src/pages/clients/components/cells/TableCellBodyNetworks.vue b/src/pages/clients/components/cells/TableCellBodyNetworks.vue index 3dfd94f..0191050 100644 --- a/src/pages/clients/components/cells/TableCellBodyNetworks.vue +++ b/src/pages/clients/components/cells/TableCellBodyNetworks.vue @@ -10,7 +10,7 @@ :id="network.kind", @click.stop="(e) => deleteNetwork(e)" ) - .flex.relative.pb-2(class="pl-[46px]") + .flex.relative.px-0.pl-0(class="pl-[46px]") base-button( v-if="isOpenChange && settings.settings.length !== getNetworks.length", @click.stop="openPopupAdding", diff --git a/src/pages/clients/components/cells/TableCellBodyPhone.vue b/src/pages/clients/components/cells/TableCellBodyPhone.vue index f0b2cc5..5868f00 100644 --- a/src/pages/clients/components/cells/TableCellBodyPhone.vue +++ b/src/pages/clients/components/cells/TableCellBodyPhone.vue @@ -8,7 +8,8 @@ @click.stop, v-model="value.phone.username", :placeholder="value.phone.username", - mask="+7 (###) ###-##-##" + mask="+7 (###) ###-##-##", + outlined ) @@ -25,8 +26,3 @@ export default { }, }; - - diff --git a/src/pages/login/TheLogin.vue b/src/pages/login/TheLogin.vue index fbefbb8..4d20387 100644 --- a/src/pages/login/TheLogin.vue +++ b/src/pages/login/TheLogin.vue @@ -15,13 +15,15 @@ v-model="user.username", placeholder="Введите ваш логин", label="Логин" + outlined ) base-input( :rule="[wrongData => !!wrongData]", v-model="user.password", :type="changeType", placeholder="Введите ваш пароль", - label="Пароль" + label="Пароль", + outlined ) .flex.items-center.cursor-pointer q-icon( @@ -30,8 +32,8 @@ @click="changeView" ) span.font-medium(:style="{color: this.redColor}", v-if="wrongData") Неверный логин или пароль - .flex.items-center.gap-x-11px - input.w-4.h-4.checkbox.cursor-pointer(@click="persist", type="checkbox") + .flex.items-center.gap-x-8px + q-checkbox(@click="persist", v-model="isView", type="checkbox") .flex.non-italic.font-medium.base Запомнить меня base-button.font-semibold(:disabled="disabledButton", :size="48", @click="login") Войти в аккаунт .absolute.left-12.bottom-12 2022 © Астра @@ -43,6 +45,7 @@ import { fetchWrapper } from "@/shared/fetchWrapper"; import BaseInput from "@/components/base/BaseInput"; import BaseButton from "@/components/base/BaseButton"; import logoMark from "@/assets/images/logoMark.svg"; + export default { name: "TheLogin", components: { BaseInput, BaseButton }, diff --git a/src/pages/medicalCard/components/MedicalBaseData.vue b/src/pages/medicalCard/components/MedicalBaseData.vue index 3125f11..f07e1f3 100644 --- a/src/pages/medicalCard/components/MedicalBaseData.vue +++ b/src/pages/medicalCard/components/MedicalBaseData.vue @@ -6,7 +6,8 @@ base-input.w-full( placeholder="ФИО*", v-model="clientDetail.fullName", - disabled + disabled, + outlined ) base-radio-buttons-group( :items="gendersList", @@ -20,6 +21,7 @@ type="date", label="Дата рождения", v-model="clientDetail.birth_date", + outlined ) .input base-input( @@ -27,15 +29,18 @@ mask="###-###-### ##", label="СНИЛС", v-model="clientDetail.insurance_number", + outlined ) .flex.flex-col.gap-y-6 base-input( label="Адрес регистрации", - placeholder="Введите полный адрес" + placeholder="Введите полный адрес", + outlined ) base-input( label="Фактический адрес места жительства", - placeholder="Введите полный адрес" + placeholder="Введите полный адрес", + outlined ) .flex.gap-x-4 .input @@ -44,12 +49,14 @@ placeholder="+7 (915) 644–92–23", mask="+7 (###) ###-##-##", v-model="clientDetail.phone", + outlined ) .input base-input( label="Email", placeholder="user@yandex.ru" v-model="clientDetail.email", + outlined ) diff --git a/src/pages/medicalCard/components/MedicalCardWrapper.vue b/src/pages/medicalCard/components/MedicalCardWrapper.vue index f17e9d6..113094d 100644 --- a/src/pages/medicalCard/components/MedicalCardWrapper.vue +++ b/src/pages/medicalCard/components/MedicalCardWrapper.vue @@ -86,7 +86,7 @@ .flex.flex-col.gap-y-2(v-for="(key, index) in Object.keys(dentalIndications)") span.font-bold.text-xsx {{`${index+1}. ${configData.dental_indications[key]}`}} medical-dental-formula(v-if="key === 'dental_formula'" :formula-data="dentalIndications[key]") - base-input(v-model="dentalIndications[key]" v-else) + base-input(v-model="dentalIndications[key]", outlined, v-else) .flex.justify-center base-button.w-fit(:icon-left-size="13", :size="40") span.font-semibold Сохранить diff --git a/src/pages/medicalCard/components/MedicalIdentityDocuments.vue b/src/pages/medicalCard/components/MedicalIdentityDocuments.vue index 624ec10..3ab289e 100644 --- a/src/pages/medicalCard/components/MedicalIdentityDocuments.vue +++ b/src/pages/medicalCard/components/MedicalIdentityDocuments.vue @@ -6,23 +6,27 @@ base-input( label="Серия и номер", placeholder="0000 000000", - v-model="clientDetail.identity_documents.number" + v-model="clientDetail.identity_documents.number", + outlined ) base-input( label="Кем выдан", placeholder="Точно как в паспорте", - v-model="clientDetail.identity_documents.issued_by_org" + v-model="clientDetail.identity_documents.issued_by_org", + outlined ) .flex.gap-x-4 base-input( label="Код подразделения", placeholder="000-000", - v-model="clientDetail.identity_documents.issued_by_org_code" + v-model="clientDetail.identity_documents.issued_by_org_code", + outlined ) base-input( type="date", label="Дата выдачи", - v-model="clientDetail.identity_documents.issued_by_date" + v-model="clientDetail.identity_documents.issued_by_date", + outlined ) diff --git a/src/pages/medicalCard/components/MedicalPolicyDocuments.vue b/src/pages/medicalCard/components/MedicalPolicyDocuments.vue index 283113f..43c8ae1 100644 --- a/src/pages/medicalCard/components/MedicalPolicyDocuments.vue +++ b/src/pages/medicalCard/components/MedicalPolicyDocuments.vue @@ -4,7 +4,7 @@ base-radio-buttons-group( :items="policiesList", v-model="policy", - rowGap="gap-x-[182px]", + :columnGap="152", inline ) .flex.gap-x-4 @@ -14,12 +14,14 @@ placeholder="000000 0000000000", v-model="clientDetail.OMSPolicy.number", mask="###### ##########", - :disabled="!selectedOMSPolicy" + :disabled="!selectedOMSPolicy", + outlined ) base-input.input( label="Страховая организация полиса ОМС", v-model="clientDetail.OMSPolicy.organization", - :disabled="!selectedOMSPolicy" + :disabled="!selectedOMSPolicy", + outlined ) .flex.flex-col.gap-y-4 base-input.input( @@ -27,25 +29,30 @@ placeholder="000000 0000000000", v-model="clientDetail.DMSPolicy.number", mask="###### ##########", - :disabled="selectedOMSPolicy" + :disabled="selectedOMSPolicy", + outlined ) base-input.input( label="Страховая организация полиса ДМС", v-model="clientDetail.DMSPolicy.organization", - :disabled="selectedOMSPolicy" + :disabled="selectedOMSPolicy", + outlined ) base-input( label="Код категории льготы", placeholder="000", - v-model="clientDetail.benefit_code", + v-model="clientDetail.benefit_code",, + outlined ) base-input( label="К кому обращаться в случае необходимости", - placeholder="ФИО*" + placeholder="ФИО*", + outlined ) base-input( label="Номер телефона", - placeholder="+7 (915) 644–92–23" + placeholder="+7 (915) 644–92–23", + outlined ) diff --git a/src/pages/schedule/components/FormChangeShift.vue b/src/pages/schedule/components/FormChangeShift.vue index 5f7d6e8..ad545ef 100644 --- a/src/pages/schedule/components/FormChangeShift.vue +++ b/src/pages/schedule/components/FormChangeShift.vue @@ -7,13 +7,23 @@ .flex.pt-2 .icon-cancel.close-icon.tesxt-xs.cursor-pointer(@click="closeForm") .flex.flex-col.gap-y-6 - base-input(label="Дата", type="date") + base-input(label="Дата", type="date", outlined) base-custom-select(v-model="currentEmployee", label="Текущий сотрудник") base-custom-select(v-model="currentEmployee", label="Замена сотрудника") .time-wrapper.flex.justify-center.gap-x-6 - base-input(type="time", label="Начало", v-model="timesShift.start_time") + base-input( + type="time", + label="Начало", + v-model="timesShift.start_time", + outlined + ) .flex.items-center.mt-4 — - base-input(type="time", label="Конец", v-model="timesShift.end_time") + base-input( + type="time", + label="Конец", + v-model="timesShift.end_time", + outlined + ) .flex.justify-center base-button.font-semibold(:size="40") Сохранить diff --git a/src/pages/schedule/components/ScheduleBar.vue b/src/pages/schedule/components/ScheduleBar.vue index f384895..1e8d822 100644 --- a/src/pages/schedule/components/ScheduleBar.vue +++ b/src/pages/schedule/components/ScheduleBar.vue @@ -5,13 +5,15 @@ base-input( type="time", v-model="times.start_time", - label="Начало" + label="Начало", + outlined ) .flex.items-center.mt-6 — base-input( type="time", v-model="times.end_time", - label="Конец" + label="Конец", + outlined ) .status-wrapper.flex.flex-col.gap-y-3.p-3 .flex.justify-center.items-center.h-10 @@ -40,7 +42,8 @@ mask="#/#", placeholder="0/0", label="Введите график", - v-model="template.item.label" + v-model="template.item.label", + outlined ) .flex.justify-center.gap-x-6.h-10 q-btn(