diff --git a/src/components/HeaderInputs.vue b/src/components/HeaderInputs.vue index 80bb2ec..bd379c1 100644 --- a/src/components/HeaderInputs.vue +++ b/src/components/HeaderInputs.vue @@ -13,7 +13,13 @@ .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.p-4(type="text", square, placeholder="Искать ...", borderless) + base-input.p-4( + type="text", + placeholder="Искать ...", + text-color="var(--btn-blue-color)", + borderless, + square + ) - - diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue index f0035cc..c8da0ae 100644 --- a/src/pages/calendar/components/CalendarFormAddEvent.vue +++ b/src/pages/calendar/components/CalendarFormAddEvent.vue @@ -7,7 +7,7 @@ .flex.pt-2 .icon-cancel.close-icon.tesxt-xs.cursor-pointer(@click="clearForm") .flex.flex-col.gap-y-8 - base-custom-select( + base-select( v-if="selectedEventData.id" v-model="status", :items="eventStatuses", @@ -20,13 +20,13 @@ label="Статус приема", outlined ) - base-custom-select( + base-select( :items="ownersList", v-model="employees.employee", placeholder="Выберите сотрудника" label="Сотрудник" ) - base-custom-select( + base-select( :items="membersList", v-model="members.person", placeholder="Выберите клиента", @@ -79,7 +79,6 @@ import { addNotification } from "@/components/Notifications/notificationContext" import { fetchWrapper } from "@/shared/fetchWrapper.js"; import BaseInput from "@/components/base/BaseInput.vue"; import BaseSelect from "@/components/base/BaseSelect.vue"; -import BaseCustomSelect from "@/components/base/BaseCustomSelect.vue"; import * as moment from "moment/moment"; import { statusesDictionary } from "../utils/statusesDictionary.js"; @@ -88,7 +87,6 @@ export default { components: { BaseSelect, BaseInput, - BaseCustomSelect, TheNotificationProvider, }, emits: ["clear-selected-event-data", "close-change-form"], diff --git a/src/pages/clients/components/FormCreateBasicInfo.vue b/src/pages/clients/components/FormCreateBasicInfo.vue index 18d66e7..12efb74 100644 --- a/src/pages/clients/components/FormCreateBasicInfo.vue +++ b/src/pages/clients/components/FormCreateBasicInfo.vue @@ -1,7 +1,7 @@