[WIP] Заменил селекты, попровил стили

This commit is contained in:
megavrilinvv
2023-01-20 17:46:26 +03:00
parent 739e94fc00
commit 611558597a
10 changed files with 58 additions and 145 deletions

View File

@@ -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"],

View File

@@ -1,7 +1,7 @@
<template lang="pug">
.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,

View File

@@ -1,10 +1,10 @@
<template lang="pug">
.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,

View File

@@ -1,5 +1,5 @@
<template lang="pug">
.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 {
</script>
<style lang="sass" scoped>
.network-cell
column-gap: 2px
.icon
color: var(--btn-blue-color)
&:last-child

View File

@@ -6,9 +6,10 @@
.flex.gap-x-2.text-sm(class="w-[164px]")
base-select(
v-if="isOpenChange",
@click.stop :items="getPriorityList",
@click.stop,
:items="getPriorityList",
v-model="value.priority",
textStyle="text-sm"
:placeholder="value.priority"
)
</template>
@@ -32,7 +33,7 @@ export default {
computed: {
getPriorityList() {
return this.prioritySettings.settings.map((el) => {
return { label: el.text, id: el.id };
return el.text;
});
},
},

View File

@@ -8,8 +8,16 @@
.icon-cancel.close-icon.tesxt-xs.cursor-pointer(@click="closeForm")
.flex.flex-col.gap-y-6
base-input(label="Дата", type="date", outlined)
base-custom-select(v-model="currentEmployee", label="Текущий сотрудник")
base-custom-select(v-model="currentEmployee", label="Замена сотрудника")
base-select(
v-model="currentEmployee",
label="Текущий сотрудник",
placeholder="Выберите сотрудника"
)
base-select(
v-model="currentEmployee",
label="Замена сотрудника",
placeholder="Выберите сотрудника"
)
.time-wrapper.flex.justify-center.gap-x-6
base-input(
type="time",
@@ -34,12 +42,12 @@
</template>
<script>
import BaseCustomSelect from "@/components/base/BaseCustomSelect.vue";
import BaseSelect from "@/components/base/BaseSelect.vue";
import BaseInput from "@/components/base/BaseInput.vue";
export default {
name: "FormChangeShift",
components: { BaseCustomSelect, BaseInput },
components: { BaseSelect, BaseInput },
props: { closeForm: Function, timesShift: Object },
data() {
return {

View File

@@ -31,9 +31,8 @@
style="width: 200px"
)
.graph-template.flex.flex-col.items-center.gap-y-4
base-custom-select(
base-select(
:items="templateList",
center,
v-model="template.item",
placeholder="Шаблоны графиков"
)
@@ -65,14 +64,14 @@
</template>
<script>
import BaseCustomSelect from "@/components/base/BaseCustomSelect.vue";
import BaseSelect from "@/components/base/BaseSelect.vue";
import BaseInput from "@/components/base/BaseInput.vue";
export default {
name: "ScheduleBar",
components: {
BaseInput,
BaseCustomSelect,
BaseSelect,
},
props: {
buttons: Array,

View File

@@ -18,12 +18,11 @@
:style="{color: 'var(--btn-blue-color)'}"
)
// TODO: какая-то странная хуйня с v-model, передается пропса
base-custom-select(
base-select(
v-if="!selectEmployee.label",
:items="ownersList",
v-model="selectEmployee",
placeholder="Добавить сотрудника",
:style="{border: 'none', justifyContent: 'center'}"
placeholder="Добавить сотрудника"
)
.flex.justify-center(v-else) {{selectEmployee.label}}
.row.flex
@@ -39,11 +38,11 @@
</template>
<script>
import BaseCustomSelect from "@/components/base/BaseCustomSelect.vue";
import BaseSelect from "@/components/base/BaseSelect.vue";
export default {
name: "ScheduleTableSelect",
components: { BaseCustomSelect },
components: { BaseSelect },
props: {
selectEmployee: Object,
result: Array,