Merge branch 'master' into 'UC-190'

# Conflicts:
#   src/pages/schedule/components/FormChangeShift.vue
This commit is contained in:
Vasiliy Gavrilin
2022-12-29 14:44:08 +00:00
42 changed files with 614 additions and 381 deletions

View File

@@ -2,12 +2,8 @@
.wrapper-bar.flex.flex-col.gap-y-4
.flex.px-5.py-5.w-full.justify-around.gap-x-4
.time-wrapper.flex.justify-between
.flex.flex-col.items-center.py-14px.px-4.gap-y-14px
.text.text-smm Начало
base-input-time.select(v-model:value="times.start_time")
.flex.flex-col.items-center.py-14px.px-4.gap-y-14px
.text.span.text-smm Конец
base-input-time.select(v-model:value="times.end_time")
base-input-time.py-14px.px-4(v-model="times.start_time", label="Начало")
base-input-time.py-14px.px-4(v-model="times.end_time", label="Конец")
.status-wrapper.flex.flex-col
.flex.justify-center.items-center.h-10
span.font-semibold Статусы
@@ -138,9 +134,4 @@ export default {
.graph-template
width: 218px
height: 40px
.select
height: 40px
border: 1.5px solid var(--border-light-grey-color)
border-radius: 4px
</style>