diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass
index e456214..b96acdc 100644
--- a/src/assets/sass/variables.sass
+++ b/src/assets/sass/variables.sass
@@ -17,6 +17,7 @@
   --btn-blue-color-4: rgba(65, 105, 225, 0.8)
   --bg-btn-icons-color: rgba(215, 217, 255, 0.6)
   --font-grey-color: #9294a7
+  --font-grey-color-0: #85858b
   --border-light-grey-color: #d3d4dc
   --row-overlay-color: #f5f6ff
   --default-shadow: 4px 4px 8px rgba(9, 10, 21, 0.1), -4px -4px 8px rgba(9, 10, 21, 0.1)
diff --git a/src/components/base/BaseCustomSelect.vue b/src/components/base/BaseCustomSelect.vue
index 7c3e403..4d3853b 100644
--- a/src/components/base/BaseCustomSelect.vue
+++ b/src/components/base/BaseCustomSelect.vue
@@ -108,7 +108,7 @@ export default {
   overflow-y: auto
 .placeholder
   color: #090A15
-  opacity: 0.5
+  opacity: 0.4
   text-overflow: ellipsis
   overflow: hidden
 .item
diff --git a/src/components/base/BaseInput.vue b/src/components/base/BaseInput.vue
index 4cfb358..9adb94c 100644
--- a/src/components/base/BaseInput.vue
+++ b/src/components/base/BaseInput.vue
@@ -7,6 +7,7 @@
     )
       input.input.w-full.outline-0.not-italic(
         v-model="value",
+        :style="{'color': disabled && 'var(--font-grey-color-0)'}"
         :placeholder="placeholder",
         :disabled="disabled",
         :type="type"
diff --git a/src/components/base/BaseInputDate.vue b/src/components/base/BaseInputDate.vue
index c344d6d..e94ca5a 100644
--- a/src/components/base/BaseInputDate.vue
+++ b/src/components/base/BaseInputDate.vue
@@ -1,7 +1,7 @@
 <template lang="pug">
   .flex.flex-col.gap-y-2
     .label(v-if="!!label") {{label}}
-    .field
+    .field(:class="{'placeholder-color': !modelValue}")
       input(
         v-model="value",
         type="date",      
@@ -52,10 +52,11 @@ export default {
     &::-webkit-calendar-picker-indicator
       opacity: 0
       cursor: pointer
-
 .label
   font-weight: 600
   font-size: 14px
   line-height: 16px
   opacity: 0.4
+.placeholder-color
+  color: var(--font-grey-color)
 </style>
diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue
index f4a42bc..ac88424 100644
--- a/src/pages/calendar/components/CalendarFormAddEvent.vue
+++ b/src/pages/calendar/components/CalendarFormAddEvent.vue
@@ -523,8 +523,8 @@ export default {
             schedules: [
               {
                 date: elem.date,
-                end_time: elem.end_time.slice(0, elem.end_time.length - 3),
-                start_time: elem.start_time.slice(
+                end_time: elem.end_time?.slice(0, elem.end_time.length - 3),
+                start_time: elem.start_time?.slice(
                   0,
                   elem.start_time.length - 3
                 ),
@@ -536,8 +536,8 @@ export default {
         } else {
           foundedElem.schedules.push({
             date: elem.date,
-            end_time: elem.end_time.slice(0, elem.end_time.length - 3),
-            start_time: elem.start_time.slice(0, elem.start_time.length - 3),
+            end_time: elem.end_time?.slice(0, elem.end_time.length - 3),
+            start_time: elem.start_time?.slice(0, elem.start_time.length - 3),
             status: elem.status,
             id: elem.id,
           });
diff --git a/src/pages/clients/components/FormsAgreementCreate/AgreementCommon.vue b/src/pages/clients/components/FormsAgreementCreate/AgreementCommon.vue
index 741a00a..21b7cf0 100644
--- a/src/pages/clients/components/FormsAgreementCreate/AgreementCommon.vue
+++ b/src/pages/clients/components/FormsAgreementCreate/AgreementCommon.vue
@@ -1,53 +1,43 @@
 <template lang="pug">
-  .flex-col
+  .flex.flex-col.gap-y-6
     span.font-bold Общая информация
-    .flex-col
-      .flex-col.my-6
-        .counter.font-semibold.text-smm Категория
-        base-custom-select.select.text-sm(
-          placeholder="Категория договора",
-          v-model="category",
-          :items="categories",            
-        )
-      .flex.justify-between.w-full.gap-4
-        base-input-date(
-          v-model="signedDate",
-          label="Дата подписания"
-        )        
-        base-input-date(
-          v-model="startDate",
-          label="Начало оказания услуг"
-        )        
-        base-input-date(
-          v-model="endDate",
-          label="Окончание оказания услуг"
-        )
-      
-      .flex-col.w-full.my-6
-        .font-semibold.text-smm Исполнитель             
-        base-custom-select.select.text-sm(
-          placeholder="Поручить",
-          v-model="employee",
-          :items="employees",
-        )
+    base-custom-select(
+      placeholder="Категория договора",
+      v-model="category",
+      :items="categories",
+      label="Категория"          
+    )
+    .flex.justify-between.gap-4
+      base-input-date.w-48(
+        v-model="signedDate",
+        label="Дата подписания"
+      )        
+      base-input-date.w-48(
+        v-model="startDate",
+        label="Начало оказания услуг"
+      )        
+      base-input-date.w-48(
+        v-model="endDate",
+        label="Окончание оказания услуг"
+      )         
+    base-custom-select(
+      placeholder="Поручить",
+      v-model="employee",
+      :items="employees",
+      label="Исполнитель"
+    )
 </template>
 
 <script>
-import BaseButton from "@/components/base/BaseButton";
 import BaseStepper from "@/components/base/BaseStepper";
-import BaseSelect from "@/components/base/BaseSelect";
 import BaseInputDate from "@/components/base/BaseInputDate";
-import BaseInput from "@/components/base/BaseInput";
 import BaseCustomSelect from "@/components/base/BaseCustomSelect.vue";
 
 export default {
   name: "AgreementCommon",
   components: {
-    BaseButton,
     BaseStepper,
-    BaseSelect,
     BaseInputDate,
-    BaseInput,
     BaseCustomSelect,
   },
   data() {
@@ -72,5 +62,3 @@ export default {
   },
 };
 </script>
-
-<style lang="sass" scoped></style>
diff --git a/src/pages/clients/components/FormsAgreementCreate/AgreementPerson.vue b/src/pages/clients/components/FormsAgreementCreate/AgreementPerson.vue
index e69b10b..bef81ab 100644
--- a/src/pages/clients/components/FormsAgreementCreate/AgreementPerson.vue
+++ b/src/pages/clients/components/FormsAgreementCreate/AgreementPerson.vue
@@ -1,81 +1,72 @@
 <template lang="pug">
-  .flex-col
-    .flex-col
-      .font-semibold.text-smm ФИО пациента 
-      base-input(
-        :width-input="200",
-        v-model="patient.full_name"
+  .flex.flex-col.gap-y-6
+    base-input(
+      label="ФИО пациента",
+      v-model="patient.full_name"
+    )
+    .flex.justify-between
+      base-custom-select.w-80(
+        placeholder="Тип документа",
+        v-model="patient.doc_type",
+        :items="patentIdentityDocumentTypes",
+        label="Документ, удостоверяющий личность"            
       )
-    .flex
-      .flex-col
-        .font-semibold.text-smm Документ, удостоверяющий личность
-        base-custom-select.select.text-sm(
-          placeholder="Тип документа",
-          v-model="patient.doc_type",
-          :items="patentIdentityDocumentTypes",            
-        )
-      .flex-col
-        .font-semibold.text-smm Серия и номер
-        base-input(
-          v-model="patient.seriesAndNumber", 
-          disabled,                  
-        )
-    .flex
-      .flex-col
-        .font-semibold.text-smm Телефон
-        base-custom-select.select.text-sm(
-          v-model="patient.phone",
-          :items="patentIdentityDocumentTypes",            
-        )
-      .flex-col
-        .font-semibold.text-smm Адрес
-        base-custom-select.select.text-sm(
-          v-model="patient.phone",
-          :items="patentIdentityDocumentTypes"    
-        )
-    .flex-col
-      .font-semibold.text-smm ФИО Заказчика 
       base-input(
-        :width-input="200",
-        v-model="patient.full_name"
+        v-model="patient.seriesAndNumber", 
+        disabled,
+        v-mask="'#### ######'"  
+        label="Серия и номер" 
+      )
+    .flex.justify-between
+      base-input.w-80(
+        v-model="patient.address",
+        label="Адрес"  
+      )
+      base-input(
+        v-model="patient.phone",
+        v-mask="'+7 (###) ###-##-##'",
+        label="Телефон" 
+      )
+    base-input(
+      v-model="patient.full_name"
+      label="ФИО Заказчика",
+    )
+    .flex.justify-between
+      base-custom-select.w-80(
+        placeholder="Тип документа",
+        v-model="patient.doc_type",
+        :items="patentIdentityDocumentTypes",
+        label="Документ, удостоверяющий личность"            
+      )
+      base-input(
+        v-model="patient.seriesAndNumber", 
+        disabled,
+        v-mask="'#### ######'"  
+        label="Серия и номер" 
+      )
+    .flex.justify-between
+      base-input.w-80(
+        v-model="patient.address",
+        label="Адрес"  
+      )
+      base-input(
+        v-model="patient.phone",
+        v-mask="'+7 (###) ###-##-##'",
+        label="Телефон" 
       )
-    .flex
-      .flex-col
-        .font-semibold.text-smm Документ, удостоверяющий личность
-        base-custom-select.select.text-sm(
-          placeholder="Тип документа",
-          v-model="patient.doc_type",
-          :items="patentIdentityDocumentTypes",            
-        )
-      .flex-col
-        .font-semibold.text-smm Серия и номер
-        base-input(
-          v-model="patient.seriesAndNumber", 
-          disabled,                  
-        )
-    .flex
-      .flex-col
-        .font-semibold.text-smm Телефон
-        base-custom-select.select.text-sm(
-          v-model="patient.phone",
-          :items="patentIdentityDocumentTypes",            
-        )
-      .flex-col
-        .font-semibold.text-smm Адрес
-        base-custom-select.select.text-sm(
-          v-model="patient.phone",
-          :items="patentIdentityDocumentTypes" )
 </template>
 
 <script>
 import BaseInput from "@/components/base/BaseInput";
 import BaseCustomSelect from "@/components/base/BaseCustomSelect.vue";
+import { mask } from "vue-the-mask";
 export default {
   name: "AgreementPerson",
   components: {
     BaseInput,
     BaseCustomSelect,
   },
+  directives: { mask },
   data() {
     return {
       patient: {
@@ -85,10 +76,8 @@ export default {
           label: "",
         },
         seriesAndNumber: "2354 125423",
-        phone: {
-          id: null,
-          label: "",
-        },
+        phone: "",
+        address: "",
       },
     };
   },
diff --git a/src/pages/clients/components/FormsAgreementCreate/AgreementServices.vue b/src/pages/clients/components/FormsAgreementCreate/AgreementServices.vue
index fe7151b..bc3f60c 100644
--- a/src/pages/clients/components/FormsAgreementCreate/AgreementServices.vue
+++ b/src/pages/clients/components/FormsAgreementCreate/AgreementServices.vue
@@ -1,62 +1,41 @@
 <template lang="pug">
-  .flex-col
+  .flex.flex-col.gap-y-6
     span.font-bold Общая информация
-    .flex-col
-      .flex-col.my-6
-        .counter.font-semibold.text-smm Категория
-        base-custom-select.select.text-sm(
-          placeholder="Категория договора",
-          v-model="category",
-          :items="categories",            
-        )
-      .flex.w-full.my-6
-        .flex-col
-          .font-semibold.text-smm Дата подписания 
-          .input-date.flex.h-10.justify-center
-            base-input-date(
-              :width-input="200",
-              v-model="signedDate"
-            )
-        .flex-col
-          .font-semibold.text-smm Начало оказания услуг
-          .input-date.flex.h-10.justify-center
-            base-input-date(
-              :width-input="200",
-              v-model="startDate"
-            )
-        .flex-col
-          .font-semibold.text-smm Окончание оказания услуг
-          .input-date.flex.h-10.justify-center
-            base-input-date(
-              :width-input="200",
-              v-model="endDate"
-            )
-      
-      .flex-col.w-full.my-6
-        .font-semibold.text-smm Исполнитель             
-        base-custom-select.select.text-sm(
-          placeholder="Поручить",
-          v-model="employee",
-          :items="employees",
-        )
+    base-custom-select(
+      placeholder="Категория договора",
+      v-model="category",
+      :items="categories",
+      label="Категория"   
+    )
+    .flex.gap-x-4
+      base-input-date.w-48(
+        v-model="signedDate",
+        label="Дата подписания"
+      )
+      base-input-date.w-48(
+        v-model="startDate",
+        label="Начало оказания услуг"
+      )
+      base-input-date.w-48(
+        v-model="endDate",
+        label="Окончание оказания услуг"
+      )         
+    base-custom-select(
+      placeholder="Поручить",
+      v-model="employee",
+      :items="employees",
+      label="Исполнитель"
+    )
 </template>
 
 <script>
-import BaseButton from "@/components/base/BaseButton";
-import BaseStepper from "@/components/base/BaseStepper";
-import BaseSelect from "@/components/base/BaseSelect";
 import BaseInputDate from "@/components/base/BaseInputDate";
-import BaseInput from "@/components/base/BaseInput";
 import BaseCustomSelect from "@/components/base/BaseCustomSelect.vue";
 
 export default {
   name: "AgreementServices",
   components: {
-    BaseButton,
-    BaseStepper,
-    BaseSelect,
     BaseInputDate,
-    BaseInput,
     BaseCustomSelect,
   },
   data() {
diff --git a/src/pages/medicalCard/components/MedicalBaseData.vue b/src/pages/medicalCard/components/MedicalBaseData.vue
index bced744..ac8b23b 100644
--- a/src/pages/medicalCard/components/MedicalBaseData.vue
+++ b/src/pages/medicalCard/components/MedicalBaseData.vue
@@ -10,34 +10,35 @@
           v-model="gender",
         )
         .flex.gap-x-4
-          .flex.flex-col.gap-y-2
-            .counter.font-semibold.text-smm Дата рождения
-            base-input-date.input-date.h-10(:width-input="277")
-          .flex.flex-col.gap-y-2
-            .counter.font-semibold.text-smm СНИЛС
+          .input
+            base-input-date(label="Дата рождения")
+          .input
             base-input(
-              :width-input="277",
               placeholder="000–000–000 00",
-              v-mask="'###-###-### ##'"
+              v-mask="'###-###-### ##'",
+              label="СНИЛС"
             )
         .flex.flex-col.gap-y-6
-          .flex.flex-col.gap-y-2
-            .counter.font-semibold.text-smm Адрес регистрации
-            base-input(:width-input="277", placeholder="Введите полный адрес")
-          .flex.flex-col.gap-y-2
-            .counter.font-semibold.text-smm Фактический адрес места жительства
-            base-input(:width-input="277", placeholder="Введите полный адрес")
+          base-input(
+            label="Адрес регистрации",
+            placeholder="Введите полный адрес"
+          )
+          base-input(
+            label="Фактический адрес места жительства",
+            placeholder="Введите полный адрес"
+          )
         .flex.gap-x-4
-          .flex.flex-col.gap-y-2
-            .counter.font-semibold.text-smm Номер телефона
+          .input
             base-input(
-              :width-input="277",
+              label="Номер телефона",
               placeholder="+7 (915) 644–92–23",
               v-mask="'+7 (###) ###-##-##'"
             )
-          .flex.flex-col.gap-y-2
-            .counter.font-semibold.text-smm Email
-            base-input(:width-input="277", placeholder="user@yandex.ru")
+          .input
+            base-input(
+              label="Email",
+              placeholder="user@yandex.ru"
+            )
 </template>
 
 <script>
@@ -79,10 +80,6 @@ export default {
 </script>
 
 <style lang="sass" scoped>
-.input-date
-  border: 1.5px solid var(--border-light-grey-color)
-  border-radius: 4px
-
-.counter
-  color: var(--font-grey-color)
+.input
+  width: 277px
 </style>
diff --git a/src/pages/medicalCard/components/MedicalIdentityDocuments.vue b/src/pages/medicalCard/components/MedicalIdentityDocuments.vue
index c3a4978..6fac737 100644
--- a/src/pages/medicalCard/components/MedicalIdentityDocuments.vue
+++ b/src/pages/medicalCard/components/MedicalIdentityDocuments.vue
@@ -4,19 +4,22 @@
       span.font-bold Паспортные данные
       .flex.flex-col.gap-y-6
         .flex.gap-x-4
-          .flex.flex-col.gap-y-2
-            .counter.font-semibold.text-smm Серия и номер
-            base-input(:width-input="277", placeholder="0000 000000")
-          .flex.flex-col.gap-y-2
-            .counter.font-semibold.text-smm Дата выдачи
-            base-input-date.input-date.h-10(:width-input="277")
+          .input
+            base-input(
+              label="Серия и номер",
+              placeholder="0000 000000"
+            )
+          .input
+            base-input-date(label="Дата выдачи")
         .flex.flex-col.gap-y-6
-          .flex.flex-col.gap-y-2
-            .counter.font-semibold.text-smm Кем выдан
-            base-input(:width-input="277", placeholder="Точно как в паспорте")
-          .flex.flex-col.gap-y-2
-            .counter.font-semibold.text-smm Страховая оганизация
-            base-input(:width-input="277", placeholder="Введите название организации")
+          base-input(
+            label="Кем выдан",
+            placeholder="Точно как в паспорте"
+          )
+          base-input(
+            label="Страховая оганизация",
+            placeholder="Введите название организации"
+          )
 </template>
 
 <script>
@@ -37,10 +40,6 @@ export default {
 </script>
 
 <style lang="sass" scoped>
-.input-date
-  border: 1.5px solid var(--border-light-grey-color)
-  border-radius: 4px
-
-.counter
-  color: var(--font-grey-color)
+.input
+  width: 277px
 </style>
diff --git a/src/pages/medicalCard/components/MedicalPolicyDocuments.vue b/src/pages/medicalCard/components/MedicalPolicyDocuments.vue
index 7955ce1..6e5e109 100644
--- a/src/pages/medicalCard/components/MedicalPolicyDocuments.vue
+++ b/src/pages/medicalCard/components/MedicalPolicyDocuments.vue
@@ -4,25 +4,25 @@
       .flex.flex-col.gap-y-6
         span.font-bold Полис
         .flex.gap-x-6
-          .flex.flex-col.gap-y-2
-            .counter.font-semibold.text-smm Серия и номер полиса ОМС
-            base-input(:width-input="277", placeholder="0000 000000")
-          .flex.flex-col.gap-y-2
-            .counter.font-semibold.text-smm Серия и номер полиса ДМС
-            base-input(:width-input="277", placeholder="0000 000000")
-    .flex.flex-col.gap-y-2
-      .counter.font-semibold.text-smm Код категории льготы
-      base-input(:width-input="277", placeholder="000")
-    .flex.flex-col.gap-y-6
-      .flex.flex-col.gap-y-2
-        .counter.font-semibold.text-smm К кому обращаться в случае необходимости 
-        base-input.w-full(placeholder="ФИО*")
-      .flex.flex-col.gap-y-2
-        .counter.font-semibold.text-smm Номер телефона
-        base-input(
-          :width-input="277",
-          placeholder="+7 (915) 644–92–23"
-        )
+          .input
+            base-input(
+              label="Серия и номер полиса ОМС",
+              placeholder="0000 000000"
+            )
+          .input
+            base-input(
+              label="Серия и номер полиса ДМС",
+              placeholder="0000 000000"
+            )
+    base-input(label="Код категории льготы", placeholder="000")
+    base-input(
+      label="К кому обращаться в случае необходимости",
+      placeholder="ФИО*"
+    )
+    base-input(
+      label="Номер телефона",
+      placeholder="+7 (915) 644–92–23"
+    )
 </template>
 
 <script>
@@ -40,10 +40,6 @@ export default {
 </script>
 
 <style lang="sass" scoped>
-.input-date
-  border: 1.5px solid var(--border-light-grey-color)
-  border-radius: 4px
-
-.counter
-  color: var(--font-grey-color)
+.input
+  width: 277px
 </style>