Merge branch 'master' into 'UC-190'

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

src/pages/calendar/components/CalendarFormAddEvent.vue

@@ -7,54 +7,45 @@
       .flex.pt-2
         .icon-cancel.close-icon.tesxt-xs.cursor-pointer(@click="clearForm")
     .flex.flex-col.gap-y-8
-      .flex.flex-col.gap-y-2
-        span.text-xxs.opacity-40.font-bold.leading-3 Статус приема
-        base-custom-select.select(
-          v-if="selectedEventData.id"
-          v-model="status",
-          :items="eventStatuses",
-          placeholder="Статус приема"
+      base-custom-select(
+        v-if="selectedEventData.id"
+        v-model="status",
+        :items="eventStatuses",
+        label="Статус приема"
+      )
+      base-input(
+        v-else,
+        disabled,
+        v-model="status.label",
+        label="Статус приема"
+      )
+      base-custom-select(
+        :items="ownersList",
+        v-model="employees.employee",
+        placeholder="Выберите сотрудника"
+        label="Сотрудник"
+      )
+      base-custom-select(
+        :items="membersList",
+        v-model="members.person",
+        placeholder="Выберите клиента",
+        label="Клиент"
+      )
+    .flex.gap-x-4
+      base-input-date(
+        v-model="eventDate",
+        label="Дата"
+      )
+      .flex.gap-x-2.items-center
+        base-input-time.item-input.text-base(
+          v-model="startTime",
+          label="Начало"
         )
-        base-input(
-          v-else,
-          disabled,
-          v-model:value="status.label"
+        span.mt-4 —
+        base-input-time.item-input.text-base(
+          v-model="endTime",
+          label="Конец"
         )
-      .flex.flex-col(class="gap-y-1.5")
-        span.text-xxs.opacity-40.font-bold Сотрудник
-        base-custom-select.select(
-          :items="ownersList",
-          v-model="employees.employee",
-          placeholder="Выберите сотрудника"
-        )
-        
-      .flex.flex-col(class="gap-y-1.5")
-        span.text-xxs.opacity-40.font-bold Клиент
-        base-custom-select.select(
-          :items="membersList",
-          v-model="members.person",
-          placeholder="Выберите клиента",
-        )
-    .flex.flex-col.gap-y-8
-      .flex.gap-x-4
-        .flex.gap-x-2
-          .flex.flex-col(class="gap-y-1.5")
-            span.text-xxs.opacity-40.font-bold.leading-3.font-bold Дата
-            base-input-date.h-10(v-model="eventDate")
-        .flex.gap-x-2.items-center
-          .flex.flex-col(class="gap-y-1.5")
-            span.text-xxs.opacity-40.font-bold.leading-3.font-bold Начало
-            base-input-time.item-input.text-base.select(
-              v-model:value="startTime",
-              :width-input="72"
-            )
-          span.mt-4 —
-          .flex.flex-col(class="gap-y-1.5")
-            span.text-xxs.opacity-40.font-bold.leading-3.font-bold Конец
-            base-input-time.item-input.text-base.select(
-              v-model:value="endTime",
-              :width-input="72"
-            )
     base-button.create-button.text-base.font-semibold(
       v-if="!selectedEventData.id",
       :size="40",
@@ -597,7 +588,6 @@ export default {
 
 <style lang="sass" scoped>
 .event-form
-  height: fit-content
   width: 634px
   background-color: var(--default-white)
   box-shadow: var(--default-shadow)
@@ -613,18 +603,12 @@ export default {
   appearance: none
   border: none
   outline: none
-  height: 40px
   &::-webkit-calendar-picker-indicator
     display: none
     -webkit-appearance: none
   &::placeholder
     color: var(--font-black-color-1)
 
-.time-input
-  width: 72px
-  border-radius: 4px
-  background-color: var(--default-white)
-
 .date-input
   width: 174px
   border-radius: 4px
@@ -644,7 +628,6 @@ export default {
   width: 183px
 
 .select
-  height: 40px
   border: 1.5px solid var(--border-light-grey-color)
   border-radius: 4px
 

src/pages/clients/components/ClientDetailInfoSection.vue

@@ -106,7 +106,7 @@
             client-detail-input.text-sm.w-max-fit(
               v-if="section!=='docs' && section!=='additional' && isChange && settings[section].options[key] !== 'Дата выдачи'",
               :style="{fontWeight:key === 'number'&&600}",
-              v-model:value="sectionInfo[key]",
+              v-model="sectionInfo[key]",
               :rows="section ==='pass' ? 2 : 1",
               :placeholder="settings[section].placeholder[key] || settings[section].placeholder"
               :sharp="settings[section].sharps[key] && section === 'pass' ? settings[section].sharps[key] : ''"
@@ -138,7 +138,7 @@
               client-detail-input.text-sm.w-max-fit.pr-12.relative(
                 :maxLength="40",
                 :style="{fontWeight:key === 'number'&&600}",
-                v-model:value="sectionInfo[key].title",
+                v-model="sectionInfo[key].title",
                 placeholder="Заголовок"
               )
                 .text.flex.absolute.text-xsx.top-18px(
@@ -149,7 +149,7 @@
               client-detail-input.text-sm.w-max-fit(
                 :maxLength="40",
                 :style="{fontWeight:key === 'number'&&600}",
-                v-model:value="sectionInfo[key].description",
+                v-model="sectionInfo[key].description",
                 placeholder="Описание"
               )
             .flex.items-center(v-if="item?.title && section !== 'additional'")
@@ -250,7 +250,7 @@ export default {
         pdf: pdfIcon,
         xls: exelIcon,
       },
-      isOpenPackage: true,
+      isOpenPackage: false,
       isOpenAddDoc: false,
       showModal: false,
     };

src/pages/clients/components/ClientDetailInput.vue

@@ -3,16 +3,14 @@
     textarea.place-input.w-full.outline-0.not-italic.resize-none.font-medium(
       v-if="!sharp"
       :rows="textareaRows",
-      :value="value",
+      v-model="value",
       :cols="24",
-      @input="$emit('update:value', $event.target.value)",
       :placeholder="placeholder",
       :maxLength="maxLength"
     )
     input.w-full.outline-0.not-italic.font-medium(
       v-else,
-      :value="value",
-      @input="$emit('update:value', $event.target.value)",
+      v-model="value",
       :placeholder="placeholder",
       v-mask="sharp"
     ) 
@@ -23,15 +21,14 @@
 import { mask } from "vue-the-mask";
 export default {
   name: "ClientDetailInput",
+  emits: ["update:modelValue"],
   props: {
-    value: String,
+    modelValue: String,
     width: Number,
     sharp: String,
-    placeholder: {
-      default: "Поиск",
-    },
     rows: Number,
     maxLength: Number,
+    placeholder: String,
   },
   directives: { mask },
   computed: {
@@ -42,6 +39,14 @@ export default {
       if (this.value.length <= 22) return this.rows;
       return Math.ceil(this.value.length / 22);
     },
+    value: {
+      get() {
+        return this.modelValue;
+      },
+      set(value) {
+        this.$emit("update:modelValue", value);
+      },
+    },
   },
 };
 </script>

src/pages/clients/components/ClientDetailSectionAddress.vue

@@ -14,7 +14,7 @@
       base-input.text-sm.input-info(
         disabled,
         placeholder="Введите область",
-        v-model:value="dopeAddress.region",
+        v-model="dopeAddress.region",
         :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
       )
     .flex.flex-col(class="gap-y-1.5")
@@ -22,7 +22,7 @@
       base-input.text-sm.input-info(
         disabled,
         placeholder="Введите улицу",
-        v-model:value="dopeAddress.street",
+        v-model="dopeAddress.street",
         :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
       )
     .flex.gap-x-4
@@ -31,7 +31,7 @@
         base-input.text-sm.input-info(
           disabled,
           placeholder="Дом",
-          v-model:value="dopeAddress.house",
+          v-model="dopeAddress.house",
           :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
         )
       .flex.flex-col(class="gap-y-1.5")
@@ -39,7 +39,7 @@
         base-input.text-sm.input-info(
           disabled,
           placeholder="Квартира",
-          v-model:value="dopeAddress.flat",
+          v-model="dopeAddress.flat",
           :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
         )
     .flex.flex-col(class="gap-y-1.5")
@@ -48,7 +48,7 @@
         disabled,
         v-mask="'######'",
         placeholder="000000",
-        v-model:value="dopeAddress.index",
+        v-model="dopeAddress.index",
         :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
       )
 </template>

src/pages/clients/components/ClientsActionPopup.vue

@@ -8,7 +8,7 @@
       .button.keep-redaction.flex.gap-x-3
         .icon-star-off.icon
         span На ведение
-      .button.keep-redaction.flex.gap-x-3(@click="createMedicalCard(clientId)")
+      .button.keep-redaction.flex.gap-x-3(@click="createMedicalCard")
         .icon-star-off.icon
         span Мед. карта
       .button.delete.flex.gap-x-3(

src/pages/clients/components/ClientsTable.vue

@@ -271,9 +271,7 @@ export default {
       }
       if (action === "medical") {
         if (id) {
-          fetchWrapper
-            .get(`medical_card/medical_history/${id}/detail/`)
-            .then((res) => this.saveDataMedicalHistory(res));
+          localStorage.setItem("medicalId", id);
           this.$router.push("medical-card");
         } else {
           this.titleModal = "Создать мед.карту";

src/pages/clients/components/ClientsTableHat.vue

@@ -5,7 +5,7 @@
         base-input(
           :with-icon="true",
           icon-position="left",
-          v-model:value="searchClient",
+          v-model="searchClient",
           placeholder="Введите фамилию",
           @keyup.enter="searchLastName"
         )

src/pages/clients/components/ClientsTableRow.vue

@@ -21,7 +21,6 @@
             clients-action-popup(
               v-if="isOpenPopup",
               :open-change-data="openChangeData",
-              :client-id="client.id",
               :disabled-delete="!!deletedClientId && !rowOverlay",
               @delete-client="transmitDeleteClient",
               :create-medical-card="transmitMedicalCard"

src/pages/clients/components/FormCreateAdditional.vue

@@ -3,7 +3,7 @@
     .flex.flex-col.gap-y-6.w-full.px-4
       .flex.flex-col.gap-y-4.w-full(v-for="info in additionalInfo" :key="info.id")
         .flex.flex-col.gap-y-1
-          base-input(v-model:value="info.header" placeholder="Заголовок")
+          base-input(v-model="info.header" placeholder="Заголовок")
           .flex.px-4.py-3.description
             textarea.w-full.h-full.outline-0.resize-none(:value="info.description" @input="$emit('update:info.description', $event.target.value)" placeholder="Описание" style="py-10")
         .upload-wrapper.flex.flex-col.justify-center.items-center

src/pages/clients/components/FormCreateAddresses.vue

@@ -1,67 +1,52 @@
 <template lang="pug">
   .wrapper-addresses.flex.flex-col.flex-auto.h-full.gap-y-8.justify-between
     .flex.flex-col.gap-y-6.px-4
-      .flex.flex-col.col-start-1.col-end-3(class="gap-y-1.5")
-        span.text-sm.font-semibold Полный адрес
-        base-input.input-info(
-          v-model:value="addresses.full_address",
-          placeholder="Введите адрес целиком"
-        )
+      base-input.input-info(
+        v-model="addresses.full_address",
+        placeholder="Введите адрес целиком",
+        label="Полный адрес"
+      )
       .flex.items-center.justify-center.relative
         .line.absolute
         span.text-sm.separator.px-2 или
       .grid.grid-cols-2.gap-y-6.gap-x-4
-        .flex.flex-col(class="gap-y-1.5")
-          .text-info.text-xxs.font-semibold Город
-          base-input.input-info(
-            disabled,
-            placeholder="Введите город",
-            v-model:value="addresses.city",
-            :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
-          )
-        .flex.flex-col(class="gap-y-1.5")
-          span.text-sm.font-semibold Область
-          base-input.input-info(
-            disabled,
-            placeholder="Введите область",
-            v-model:value="addresses.region",
-
-            :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
-          )
-        .flex.flex-col(class="gap-y-1.5")
-          span.text-sm.font-semibold Улица
-          base-input.input-info(
-            disabled,
-            placeholder="Введите улицу",
-            v-model:value="addresses.street",
-
-            :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
-          )
-        .flex.flex-col(class="gap-y-1.5")
-          span.text-sm.font-semibold Дом
-          base-input.input-info(
-            disabled,
-            placeholder="Номер дома",
-            v-model:value="addresses.house_number",
-            :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
-          )
-        .flex.flex-col(class="gap-y-1.5")
-          span.text-sm.font-semibold Квартира
-          base-input.input-info(
-            disabled,
-            placeholder="Номер квартиры",
-            v-model:value="addresses.apartment_number",
-            :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
-          )
-        .flex.flex-col(class="gap-y-1.5")
-          span.text-sm.font-semibold Индекс
-          base-input.input-info(
-            disabled,
-            placeholder="000000",
-            v-mask="'######'",
-            v-model:value="addresses.zip_code",
-            :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
-          )
+        base-input.input-info(
+          disabled,
+          placeholder="Введите город",
+          v-model="addresses.city",
+          label="Город"
+        )
+        base-input.input-info(
+          disabled,
+          placeholder="Введите область",
+          v-model="addresses.region",
+          label="Область"
+        )
+        base-input.input-info(
+          disabled,
+          placeholder="Введите улицу",
+          v-model="addresses.street",
+          label="Введите улицу"
+        )
+        base-input.input-info(
+          disabled,
+          placeholder="Номер дома",
+          v-model="addresses.house_number",
+          label="Дом"
+        )
+        base-input.input-info(
+          disabled,
+          placeholder="Номер квартиры",
+          v-model="addresses.apartment_number",
+          label="Квартира"
+        )
+        base-input.input-info(
+          disabled,
+          placeholder="000000",
+          v-mask="'######'",
+          v-model="addresses.zip_code",
+          label="Индекс"
+        )
     .px-4
       base-button(@click="saveClient" :size="40")
         span.font-semibold Создать клиента

src/pages/clients/components/FormCreateBasicInfo.vue

@@ -1,35 +1,29 @@
 <template lang="pug">
   .wrapper-info.flex.flex-col.flex-auto.h-full.gap-y-8.justify-between
     .grid.grid-cols-2.gap-x-4.gap-y-6.px-4
-      .flex.flex-col(class="gap-y-1.5")
-        span.text-sm Приоритет
-        base-custom-select(
-          :items="priorityList",
-          placeholder="Приоритет клиента",
-          v-model="basicInfo.priority"
-        )
-      .flex.flex-col(class="gap-y-1.5")
-        span.text-sm Дата рождения
-        base-input-date.input-info(
-          v-model="basicInfo.birth_date",
-        )
-      .flex.flex-col(class="gap-y-1.5")
-        span.text-sm Номер телефона
-        base-input.input-info(
-          v-model:value="phone.username",
-          placeholder="+7 (915) 644–92–23",
-          v-mask="'+7 (###) ###-##-##'",
-          :width-input="277"
-        )
-      .flex.flex-col(class="gap-y-1.5")
-        span.text-sm Email
-        base-input.input-info(
-          v-model:value="email.username",
-          placeholder="user@yandex.ru",
-          :width-input="277"
-        )
+      base-custom-select.input-info(
+        :items="priorityList",
+        placeholder="Приоритет клиента",
+        v-model="basicInfo.priority",
+        label="Приоритет"
+      )
+      base-input-date.input-info(
+        v-model="basicInfo.birth_date",
+        label="Дата рождения"
+      )
+      base-input.input-info(
+        v-model="phone.username",
+        placeholder="+7 (915) 644–92–23",
+        v-mask="'+7 (###) ###-##-##'",
+        label="Номер телефона"
+      )
+      base-input.input-info(
+        v-model="email.username",
+        placeholder="user@yandex.ru",
+        label="Email"
+      )
       .flex.flex-col.col-start-1.col-end-3.w-100(class="gap-y-1.5")
-        span.text-sm Ссылки на соцсети
+        span.text-sm.font-semibold.opacity-40.input-info Ссылки на соцсети
         .flex(class="gap-x-1.5" v-for="network in basicInfo.contacts" :key="network.id")
           base-adding-network(
             :list-adding-networks="networks.settings",
@@ -100,7 +94,6 @@ export default {
     background-color: var(--btn-blue-color)
 .input-info
   color: var(--font-dark-blue-color)
-  height: 40px
 .obligatory
   color: var(--font-obligatory-color)
 .add-network

src/pages/clients/components/FormCreateIdentityDocuments.vue

@@ -3,59 +3,45 @@
     .flex.flex-col.gap-y-6.px-4
       span.title-info.text-base.font-bold Паспортные данные
       .grid.grid-cols-2.gap-x-4.gap-y-6
-        .flex.flex-col(class="gap-y-1.5")
-          span.text-sm Серия и номер
-          base-input.input-info(
-            v-mask="'#### ######'",
-            v-model:value="identityDocument.pass.series_number",
-            placeholder="0000 000000",
-            :width-input="277"
-          )
-        .flex.flex-col(class="gap-y-1.5")
-          span.text-sm Кем выдан
-          base-input.input-info(
-            v-model:value="identityDocument.pass.issued_by_org",
-            placeholder="Точно как в паспорте",
-            :width-input="277"
-          )
-        .flex.flex-col(class="gap-y-1.5")
-          span.text-sm Код подразделения
-          base-input.input-info(
-            v-mask="'###-###'",
-            v-model:value="identityDocument.pass.issued_by_org_code",
-            placeholder="000–000",
-            :width-input="277"
-          )
-        .flex.flex-col(class="gap-y-1.5")
-          span.text-sm Дата выдачи
-          base-input-date.input-info.h-10(
-            v-model="identityDocument.pass.issued_by_date",
-            placeholder="Дата",
-            :width-input="277"
-          )
+        base-input.input-info(
+          v-mask="'#### ######'",
+          v-model="identityDocument.pass.series_number",
+          placeholder="0000 000000",
+          label="Серия и номер"
+        )
+        base-input.input-info(
+          v-model="identityDocument.pass.issued_by_org",
+          placeholder="Точно как в паспорте",
+          label="Кем выдан"
+        )
+        base-input.input-info(
+          v-mask="'###-###'",
+          v-model="identityDocument.pass.issued_by_org_code",
+          placeholder="000–000",
+          label="Код подразделения"
+        )
+        base-input-date.input-info.h-10(
+          v-model="identityDocument.pass.issued_by_date",
+          placeholder="Дата",
+          label="Дата выдачи"
+        )
     .flex.flex-col.gap-y-6.px-4
       span.title-info.text-base.font-bold СНИЛС и ИНН
       .grid.grid-cols-2.gap-x-4.gap-y-6
-        .flex.flex-col(class="gap-y-1.5")
-          span.text-sm Номер СНИЛС
-          base-input.input-info(
-            disabled,
-            v-mask="'###-###-### ##'",
-            v-model:value="identityDocument.snils.number",
-            placeholder="000–000–000 00",
-            :width-input="277",
-            :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
-          )
-        .flex.flex-col(class="gap-y-1.5")
-          span.text-sm Номер ИНН
-          base-input.input-info(
-            disabled,
-            v-mask="'############'",
-            v-model:value="identityDocument.inn.number",
-            placeholder="000000000000",
-            :width-input="277",
-            :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
-          )
+        base-input.input-info(
+          disabled,
+          v-mask="'###-###-### ##'",
+          v-model="identityDocument.snils.number",
+          placeholder="000–000–000 00",
+          label="Номер СНИЛС"
+        )
+        base-input.input-info(
+          disabled,
+          v-mask="'############'",
+          v-model="identityDocument.inn.number",
+          placeholder="000000000000",
+          label="Номер ИНН"
+        )
     .px-4
       base-button(@click="saveClient" :size="40")
         span.font-semibold Создать клиента

src/pages/clients/components/FormCreateMedicalCard.vue

@@ -51,9 +51,6 @@ export default {
     MedicalPolicyDocuments,
     BaseStepper,
   },
-  props: {
-    selectedClientId: String,
-  },
   data() {
     return {
       isBaseData: true,

src/pages/clients/components/FormsAgreementCreate/AgreementPerson.vue

@@ -4,7 +4,7 @@
       .font-semibold.text-smm ФИО пациента 
       base-input(
         :width-input="200",
-        v-model:value="patient.full_name"
+        v-model="patient.full_name"
       )
     .flex
       .flex-col
@@ -17,7 +17,7 @@
       .flex-col
         .font-semibold.text-smm Серия и номер
         base-input(
-          v-model:value="patient.seriesAndNumber", 
+          v-model="patient.seriesAndNumber", 
           disabled,                  
         )
     .flex
@@ -37,7 +37,7 @@
       .font-semibold.text-smm ФИО Заказчика 
       base-input(
         :width-input="200",
-        v-model:value="patient.full_name"
+        v-model="patient.full_name"
       )
     .flex
       .flex-col
@@ -50,7 +50,7 @@
       .flex-col
         .font-semibold.text-smm Серия и номер
         base-input(
-          v-model:value="patient.seriesAndNumber", 
+          v-model="patient.seriesAndNumber", 
           disabled,                  
         )
     .flex
@@ -80,9 +80,15 @@ export default {
     return {
       patient: {
         full_name: "",
-        doc_type: "",
+        doc_type: {
+          id: null,
+          label: "",
+        },
         seriesAndNumber: "2354 125423",
-        phone: {},
+        phone: {
+          id: null,
+          label: "",
+        },
       },
     };
   },

src/pages/clients/components/FormsAgreementCreate/AgreementServices.vue

@@ -15,21 +15,21 @@
           .input-date.flex.h-10.justify-center
             base-input-date(
               :width-input="200",
-              v-model:value="signedDate"
+              v-model="signedDate"
             )
         .flex-col
           .font-semibold.text-smm Начало оказания услуг
           .input-date.flex.h-10.justify-center
             base-input-date(
               :width-input="200",
-              v-model:value="startDate"
+              v-model="startDate"
             )
         .flex-col
           .font-semibold.text-smm Окончание оказания услуг
           .input-date.flex.h-10.justify-center
             base-input-date(
               :width-input="200",
-              v-model:value="endDate"
+              v-model="endDate"
             )
       
       .flex-col.w-full.my-6

src/pages/clients/components/StepperCreateAgreement.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-  .flex.flex-col.gap-y-6.justify-between(style="height: 500px")
+  .flex.flex-col.gap-y-6.justify-between
     .flex.flex-col.gap-y-6
       span.font-bold.text-xl Договор
       .flex.self-center

src/pages/clients/components/TableAddingNewAdditional.vue

@@ -3,7 +3,7 @@
     .corner
     .wrap.flex.flex-col.p-4.gap-y-4
       .flex.flex-col.gap-y-1
-        base-input(:with-icon="true" v-model:value="newAdditionalData.header" icon-position="right" :max-length="140" placeholder="Заголовок")
+        base-input(:with-icon="true" v-model="newAdditionalData.header" icon-position="right" :max-length="140" placeholder="Заголовок")
           span.counter {{`${newAdditionalData.header.length}/140`}}
         .description.flex.px-4.py-3
           textarea.w-full.h-full.outline-0.resize-none(:value="newAdditionalData.value" @input="$emit('update:newAdditionalData.value', $event.target.value)" placeholder="Описание" style="py-10")

src/pages/clients/components/TableCreateNote.vue

@@ -1,7 +1,7 @@
 <template lang="pug">
   .flex.flex-col.gap-y-3
     .flex.flex-col.gap-y-3.relative
-      base-input.text-smm(placeholder="Заголовок", v-model:value="title", :maxLength="40")
+      base-input.text-smm(placeholder="Заголовок", v-model="title", :maxLength="40")
       .text.flex.absolute.text-xsx.right-7.top-3 {{`${changeValue}/40`}}
     .input-wrapper.flex.gap-x-2.px-4.box-border.w-max-fit.text-smm(class="py-2.5")
       textarea.place-input.w-full.outline-0.not-italic.resize-none(

src/pages/clients/components/TableCreatePackageDoc.vue

@@ -16,7 +16,7 @@
         .flex.flex-col(class="gap-y-1.5")
           .counter.font-semibold.text-smm ФИО
           base-input(
-            v-model:value="patient",
+            v-model="patient",
             placeholder="Введите название для пакета документов"
           )
             span.counter 

src/pages/clients/components/cells/ClientsTableCellHeader.vue

@@ -1,6 +1,6 @@
 <template lang="pug">
   .flex.box-border.justify-between.items-center(
-    :style="{ minWidth : width + 'px', maxWidth: width + 'px', padding: generateWidth ? '0px 16px' : '0px 10px' }",
+    :style="{ width : width + 'px', padding: generateWidth ? '0px 16px' : '0px 10px' }",
     :class="{width:generateWidth}"
   )
     span.text-sm(v-if="title") {{title}}

src/pages/clients/components/cells/TableCellBodyBirthday.vue

@@ -1,6 +1,6 @@
 <template lang="pug">
   .flex.box-border.px-4.items-center.w-full.text-sm(
-    :style="{ minWidth : width + 'px', maxWidth : width + 'px' }"
+    :style="{ width : width + 'px'}"
   )
     span(v-if="!isOpenChange") {{ birthday }}
     base-input-date.input.h-10(

src/pages/clients/components/cells/TableCellBodyEmail.vue

@@ -7,13 +7,13 @@
       @mouseover="changeHover",
       @mouseleave="changeHover"
     ) {{maxValue}}
-    base-input(
-      v-if="isOpenChange",
-      :width-input="234",
-      @click.stop,
-      v-model:value="value.email.username",
-      :placeholder="value.email.username"
-    )
+    .email
+      base-input(
+        v-if="isOpenChange",
+        @click.stop,
+        v-model="value.email.username",
+        :placeholder="value.email.username"
+      )
 </template>
 
 <script>
@@ -45,3 +45,8 @@ export default {
   },
 };
 </script>
+
+<style lang="sass" scoped>
+.email
+  width: 234px
+</style>

src/pages/clients/components/cells/TableCellBodyName.vue

@@ -1,19 +1,17 @@
 <template lang="pug">
   .flex.box-border.px-4.items-center.gap-x-3.w-full.text-sm(
-    :style="{ minWidth : width + 'px', maxWidth : width + 'px' }",
+    :style="{ width : width + 'px'}",
   )
     base-avatar(:size="36", :color="avatarColor", v-if="!photo") {{avatar}}
     base-avatar(:size="36", v-else)
       img.h-full.object-cover(:src="url + photo")
     span.font-semibold(v-if="!isOpenChange") {{value.fullName}}
-    base-input(
-      v-if="isOpenChange",
-      @click.stop,
-      type="text",
-      v-model:value="value.fullName",
-      :width-input="300",
-      placeholder="Фамилия Имя Отчество"
-    )
+    .name(v-if="isOpenChange")
+      base-input(
+        @click.stop,
+        v-model="value.fullName",
+        placeholder="Фамилия Имя Отчество"
+      )
 </template>
 
 <script>
@@ -41,4 +39,6 @@ export default {
   border-radius: 50%
   background-color: var(--font-grey-color)
   color: var(--font-dark-blue-color)
+.name
+  width: 300px
 </style>

src/pages/clients/components/cells/TableCellBodyNetworks.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-  .network-cell.flex.box-border.px-4.items-center.w-full(:style="{ minWidth: width + 'px', maxWidth: width + 'px' }")
+  .network-cell.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",

src/pages/clients/components/cells/TableCellBodyPhone.vue

@@ -1,16 +1,15 @@
 <template lang="pug">
-  .flex.box-border.px-4.items-center.w-full.text-sm(:style="{ minWidth : width + 'px', maxWidth : width + 'px' }")
+  .flex.box-border.px-4.items-center.w-full.text-sm(:style="{ width : width + 'px' }")
     span.text-sm(
       v-if="!isOpenChange"
     ) {{value.phone.username.replace(/\+7(\d{3})(\d{3})(\d{2})(\d{2})/, '+7 ($1) $2-$3-$4')}}
-    base-input(
-      v-if="isOpenChange",
-      @click.stop,
-      :width-input="154",
-      v-model:value="value.phone.username",
-      :placeholder="value.phone.username",
-      v-mask="'+7 (###) ###-##-##'"
-    )
+    .phone(v-if="isOpenChange")
+      base-input(
+        @click.stop,
+        v-model="value.phone.username",
+        :placeholder="value.phone.username",
+        v-mask="'+7 (###) ###-##-##'"
+      )
 </template>
 
 <script>
@@ -27,3 +26,8 @@ export default {
   directives: { mask },
 };
 </script>
+
+<style lang="sass" scoped>
+.phone
+  width: 158px
+</style>

src/pages/clients/components/cells/TableCellBodyPriority.vue

@@ -1,10 +1,15 @@
 <template lang="pug">
-  .flex.box-border.px-4.items-center.w-full.gap-x-2(:style="{ minWidth : width + 'px', maxWidth : width + 'px' }")
+  .flex.box-border.px-4.items-center.w-full.gap-x-2(:style="{ width : width + 'px'}")
     .flex.gap-x-2.items-center(v-if="!isOpenChange")
       .dot.w-2.h-2(:style="{ backgroundColor: prioritySettings.settings.find((el) => el.text == value.priority).color }")
       span.text-sm(:style="{ color: prioritySettings.settings.find((el) => el.text == value.priority).color }") {{value.priority}}
     .flex.gap-x-2.text-sm(class="w-[164px]")
-      base-select(v-if="isOpenChange", @click.stop :items="getPriorityList", v-model="value.priority")
+      base-select(
+        v-if="isOpenChange",
+        @click.stop :items="getPriorityList",
+        v-model="value.priority",
+        textStyle="text-sm"
+      )
 </template>
 
 <script>

src/pages/clients/utils/tableConfig.js

@@ -53,7 +53,7 @@ export const column = [
     name: "phone",
     title: "Телефон",
     iconHead: false,
-    width: 170,
+    width: 200,
   },
   {
     name: "email",

src/pages/login/TheLogin.vue

@@ -9,19 +9,17 @@
           .text-under.flex.not-italic.font-medium.text-base(
             :style="{color: this.underTextColor}") Войдите в аккаунт, чтобы начать пользоваться сервисом «Астра».
         .flex.flex-col.gap-y-5
-          .flex.flex-col.gap-y-6px
-            .flex.non-italic.font-semibold.text-xss Логин
-            base-input.h-12.font-medium(
-              :style="{borderColor: wrongData ? this.redColor : ''}",
-              v-model:value="user.username",
-              type="text",
-              placeholder="Введите ваш логин"
-            )
+          base-input.font-medium(
+            :borderError="wrongData",
+            v-model="user.username",
+            placeholder="Введите ваш логин",
+            label="Логин"
+          )
           .flex.flex-col.gap-y-6px.relative
-            .flex.non-italic.font-semibold.text-xss Пароль
-            base-input.h-12(
-              :style="{borderColor: wrongData ? this.redColor : ''}",
-              v-model:value="user.password",
+            .flex.non-italic.font-semibold.text-sm.opacity-40 Пароль
+            base-input(
+              :borderError="wrongData",
+              v-model="user.password",
               :type="changeType",
               placeholder="Введите ваш пароль"
             )

src/pages/medicalCard/components/MedicalCardWrapper.vue

@@ -1,10 +1,96 @@
 <template lang="pug">
   .wrapper.flex.w-full.relative.mx-2
     .wrapper-medical.relative.flex.flex-col.px-6.py-6.h-full.w-full
+      base-detail-info(:title="configData.identity_document.title" :height="configData.identity_document.height")
+      .flex.flex-col.gap-30px
+        base-detail-info(:title="configData.registration_address.title" :height="configData.registration_address.height")
+        base-detail-info(:title="configData.temporary_address.title" :height="configData.temporary_address.height")
+      .flex.flex-col.gap-2
+        base-detail-info(:title="configData.snils.title" :height="configData.snils.height")
+        base-detail-info(:title="configData.policy_number_series.title" :height="configData.policy_number_series.height")
+      base-detail-info(:title="configData.policy_organization.title" :height="configData.policy_organization.height")
+      .flex.flex-col.gap-4
+        base-detail-info(:title="configData.additional.title" :height="configData.additional.height")
+        base-detail-info(:title="configData.agreement_form.title" :height="configData.agreement_form.height")
 </template>
 
 <script>
-export default { name: "MedicalCardWrapper" };
+import BaseDetailInfo from "@/components/base/BaseDetailInfo.vue";
+import { medicalDetailConfig } from "@/pages/medicalCard/utils/medicalConfig";
+import { fetchWrapper } from "@/shared/fetchWrapper";
+import BaseInput from "@/components/base/BaseInput.vue";
+import ClientDetailInput from "@/pages/clients/components/ClientDetailInput.vue";
+export default {
+  name: "MedicalCardWrapper",
+  components: { ClientDetailInput, BaseInput, BaseDetailInfo },
+  data() {
+    return {
+      configData: medicalDetailConfig,
+      medicalDataInit: {},
+    };
+  },
+  methods: {
+    saveDataMedical(data) {
+      const confidant = data ? data["confidant"] : undefined;
+      const pass = data
+        ? data?.person?.identity_document?.find((el) => el.kind === "PASSPORT")
+        : null;
+      this.medicalDataInit = {
+        ...data,
+        identity_document: {
+          ...pass,
+          number_series: `${pass.series} ${pass.number}`,
+        },
+        registration_address: {
+          registration_address: data?.person?.address?.find(
+            (el) => !el["registration_flg"]
+          )?.join_adress,
+        },
+        temporary_address: {
+          temporary_address: data?.person?.address?.find(
+            (el) => !el["temporary_registration_flg"]
+          )?.join_adress,
+        },
+        snils: {
+          ...data?.person["insurance_number"],
+        },
+        policy: {
+          ...data?.person["insurance_policy"][0],
+        },
+        policy_organization: {
+          ...data?.person["insurance_policy"][0],
+        },
+        additional: {
+          name_confidant: confidant
+            ? `${confidant?.last_name} ${confidant?.last_name} ${confidant?.patronymic}`
+            : null,
+          phone_confidant: confidant?.contacts?.find(
+            (el) => el?.kind === "PHONE"
+          ),
+        },
+        benefit_code: {
+          benefit_code: data?.benefit_code,
+        },
+        agreement_form: {
+          agreement: data?.agreement,
+          agreement_date: null,
+        },
+      };
+    },
+    async fetchDataMedicalCard() {
+      await fetchWrapper
+        .get(
+          `medical_card/medical_history/${localStorage.getItem(
+            "medicalId"
+          )}/detail/`
+        )
+        .then((res) => this.saveDataMedical(res));
+    },
+  },
+  mounted() {
+    this.fetchDataMedicalCard();
+  },
+};
 </script>
 
 <style lang="sass" scoped>
@@ -15,4 +101,17 @@ export default { name: "MedicalCardWrapper" };
 .wrapper-medical
   background-color: var(--default-white)
   height: calc(100vh - 64px)
+  display: grid
+  grid-template-columns: 280px 292px 180px 360px 463px
+  gap: 16px
+  overflow: auto
+  &::-webkit-scrollbar
+    height: 4px
+    width: 4px
+  &::-webkit-scrollbar-track
+    background-color: rgba(211, 212, 220, 0.5)
+    border-radius: 8px
+  &::-webkit-scrollbar-thumb
+    border-radius: 8px
+    background-color: var(--btn-blue-color)
 </style>

src/pages/medicalCard/utils/medicalConfig.js

@@ -0,0 +1,128 @@
+export const medicalDetailConfig = {
+  identity_document: {
+    height: 366,
+    title: "Паспортные данные",
+    fields: [
+      {
+        label: "number_series",
+        title: "Серия и номер",
+        type: "input",
+        copy: true,
+      },
+      {
+        label: "issued_by_org",
+        title: "Выдан",
+        type: "input",
+      },
+      {
+        label: "issued_by_org_code",
+        title: "Код подразделения",
+        type: "input",
+      },
+      {
+        label: "issued_by_date",
+        title: "Дата выдачи",
+        type: "data",
+      },
+    ],
+  },
+  registration_address: {
+    height: 130,
+    title: "Адреес регистрации",
+    fields: [
+      {
+        label: "registration_address",
+        title: "Полный адрес",
+        type: "input",
+      },
+    ],
+  },
+  temporary_address: {
+    height: 130,
+    title: "Адреес проживания",
+    fields: [
+      {
+        label: "temporary_address",
+        title: "Полный адрес",
+        type: "input",
+      },
+    ],
+  },
+  snils: {
+    height: 108,
+    title: "СНИЛС",
+    fields: [
+      {
+        label: "insurance_number",
+        title: "Номер",
+        type: "input",
+        copy: true,
+      },
+    ],
+  },
+  policy_number_series: {
+    height: 170,
+    title: "ПОЛИС",
+    fields: [
+      {
+        label: "series",
+        title: "Серия",
+        type: "input",
+      },
+      {
+        label: "number",
+        title: "Номер",
+        type: "input",
+      },
+    ],
+  },
+  policy_organization: {
+    height: 111,
+    title: "Страховая организация",
+    fields: [
+      {
+        label: "organization",
+        title: "Название",
+        type: "input",
+      },
+    ],
+  },
+  additional: {
+    height: 202,
+    title: "Дополнительная информация",
+    fields: [
+      {
+        label: "name_confidant",
+        title: "Доверенное лицо",
+        type: "input",
+      },
+      {
+        label: "phone_confidant",
+        title: "",
+        type: "input",
+      },
+      {
+        label: "benefit_code",
+        title: "Код категории льготы",
+        type: "input",
+      },
+    ],
+  },
+  agreement_form: {
+    height: 163,
+    title:
+      "Информированное добровольное согласие на виды медицинских вмешательств, включенные в Перечень определенных видов медицинских вмешательств:",
+    fields: [
+      {
+        label: "agreement",
+        title: "Получено",
+        type: "check_box",
+      },
+      {
+        label: "agreement_date",
+        title: "Дата",
+        type: "date",
+      },
+    ],
+  },
+};

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>

src/pages/schedule/components/ScheduleBar.vue

@@ -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>