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 @@
.wrapper-info.h-full
.grid.grid-cols-2.gap-x-4.gap-y-6
- base-custom-select.input-info(
+ base-select(
:items="priorityList",
placeholder="Приоритет клиента",
v-model="basicInfo.priority",
@@ -46,14 +46,14 @@
import BaseInput from "@/components/base/BaseInput";
import BaseAddingNetwork from "@/components/base/BaseAddingNetwork";
import { column } from "@/pages/clients/utils/tableConfig";
-import BaseCustomSelect from "@/components/base/BaseCustomSelect";
+import BaseSelect from "@/components/base/BaseSelect";
export default {
name: "FormCreateBasicInfo",
components: {
BaseInput,
BaseAddingNetwork,
- BaseCustomSelect,
+ BaseSelect,
},
props: {
choosePriority: Function,
diff --git a/src/pages/clients/components/cells/TableCellBodyBirthday.vue b/src/pages/clients/components/cells/TableCellBodyBirthday.vue
index aa9cb9f..e2bee0a 100644
--- a/src/pages/clients/components/cells/TableCellBodyBirthday.vue
+++ b/src/pages/clients/components/cells/TableCellBodyBirthday.vue
@@ -1,10 +1,10 @@
- .flex.box-border.px-4.items-center.w-full.text-sm(
+ .flex.box-border.px-2.items-center.w-full.text-sm(
:style="{ width : width + 'px'}"
)
span(v-if="!isOpenChange") {{ birthday }}
base-input(
- :width="130"
+ :width="140"
type="date",
v-if="isOpenChange",
@click.stop,
diff --git a/src/pages/clients/components/cells/TableCellBodyNetworks.vue b/src/pages/clients/components/cells/TableCellBodyNetworks.vue
index 3cd89d5..9bcea45 100644
--- a/src/pages/clients/components/cells/TableCellBodyNetworks.vue
+++ b/src/pages/clients/components/cells/TableCellBodyNetworks.vue
@@ -1,5 +1,5 @@
- .network-cell.flex.box-border.px-4.items-center.w-full(:style="{ width: width + 'px'}")
+ .flex.box-border.px-4.items-center.w-full(:style="{ width: width + 'px'}")
.flex.gap-x-1
.text-xl.icon.relative(
v-for="network in getNetworks",
@@ -117,8 +117,6 @@ export default {