Merge branch 'master' into 'UC-190'

# Conflicts:
#   src/pages/schedule/components/FormChangeShift.vue

src/pages/schedule/components/FormChangeShift.vue

@@ -7,28 +7,12 @@
       .flex.pt-2
         .icon-cancel.close-icon.tesxt-xs.cursor-pointer(@click="closeForm")
     .flex.flex-col.gap-y-6
-      .flex.flex-col.gap-y-2
-        span.text-smm.font-semibold Дата
-        base-input-date
-      .flex.flex-col(class="gap-y-1.5")
-        span.text-smm.font-semibold Текущий сотрудник
-        base-custom-select.h-10(v-model="currentEmployee")
-      .flex.flex-col(class="gap-y-1.5")
-        span.text-smm.font-semibold Замена сотрудника
-        base-custom-select.h-10(v-model="currentEmployee")
+      base-input-date(label="Дата")
+      base-custom-select(v-model="currentEmployee", label="Текущий сотрудник")
+      base-custom-select(v-model="currentEmployee", label="Замена сотрудника")
       .time-wrapper.flex.justify-center
-        .flex.flex-col.py-14px.px-4.gap-y-14px.items-center
-          .text-xxs.opacity-40.font-bold Начало
-          base-input-time.item-input.text-base.select(
-            :width-input="40",
-            v-model:value="timesShift.start_time"
-          )
-        .flex.flex-col.py-14px.px-4.gap-y-14px.items-center
-          .text-xxs.opacity-40.font-bold Конец
-          base-input-time.item-input.text-base.select(
-            :width-input="40",
-            v-model:value="timesShift.end_time"
-          )
+        base-input-time.px-4.item-input.text-base(label="Начало", v-model="timesShift.start_time")
+        base-input-time.px-4.item-input.text-base(label="Конец", v-model="timesShift.end_time")
       .flex.justify-center
         base-button.font-semibold(:size="40") Сохранить
 </template>
@@ -59,9 +43,4 @@ export default {
   box-shadow: var(--default-shadow)
   border-radius: 4px
   z-index: 5
-
-.select
-  height: 40px
-  border: 1.5px solid var(--border-light-grey-color)
-  border-radius: 4px
 </style>