WIP Удалены BaseButtons

2023-01-19 18:18:54 +03:00
parent 76ca19ff4e
commit b53c433771
25 changed files with 224 additions and 147 deletions
--- a/src/components/Notifications/TheNotificationProvider.vue
+++ b/src/components/Notifications/TheNotificationProvider.vue
@@ -17,12 +17,11 @@

 <script>
 import { notifications } from "@/components/Notifications/notificationContext";
-import BaseButton from "@/components/base/BaseButton";
 import NotificationItem from "@/components/Notifications/NotificationItem";

 export default {
  name: "TheNotificationProvider",
-  components: { NotificationItem, BaseButton },
+  components: { NotificationItem },

  data() {
    return {
--- a/src/components/base/BaseClientFormCreate.vue
+++ b/src/components/base/BaseClientFormCreate.vue
@@ -415,17 +415,6 @@ export default {
        icon: "icon-tg",
      });
    },
-    /*selectTab(event) {
-      this.listInfoTitle.forEach((el) => {
-        if (el.key === event.target.id) {
-          el.active = true;
-          this.$refs[el.key].style.display = "block";
-        } else {
-          el.active = false;
-          this.$refs[el.key].style.display = "none";
-        }
-      });
-    },*/
    selectForm(componentName) {
      this.currentForm = this.forms.find(
        (elem) => elem.component === componentName
--- a/src/pages/clients/components/ClientDetailInfoSection.vue
+++ b/src/pages/clients/components/ClientDetailInfoSection.vue
@@ -5,30 +5,40 @@
    .section-header.flex.items-center.justify-between.pl-4.pr-3(:class="{small:settings[section].rowFlex}")
      span.text-sm.font-semibold.whitespace-nowrap {{settings[section]?.title}}
      .flex.items-center.gap-x-8
-        base-button(
+        q-btn(
          v-if="isChange && (this.isData || this.isAddress || this.isAttachments || this.isNotes)",
          @click.stop="changeDoc",
-          confirm,
-          rounded,
-          outlined,
-          :size="20"
+          icon="app:icon-ok",
+          size="8px",
+          class="ok-button",
+          round,
+          dense,
+          no-caps,
+          padding="4px 3px 2px 3px"
        )
-          .icon-ok.text-xsm(class="pt-[3px]")
-        .edit.cursor-pointer(
+        q-btn(
          v-if="!isChange && (this.isData || this.isAddress || this.isAttachments || this.isNotes)",
-          @click="changeClientData"
+          @click="changeClientData",
+          icon="app:icon-edit",
+          size="12px",
+          color="primary",
+          flat,
+          round,
+          dense,
+          no-caps,
+          padding="4px 3px 2px 3px"
        )
-          .icon-edit.text-base.mt-2px
        .flex.relative
-          base-button(
+          q-btn(
+            icon="add",
+            size="16px",
+            class="add-button",
            v-if="settings[section].addFile",
            @click="openAddingWrap",
-            :rounded="true",
-            :outlined="true",
-            :added="true",
-            :size="20"
+            round,
+            no-caps,
+            padding="0px"
          )
-            .icon-plus.text-sm(class="pt-[2px]")
          base-popup.right-3.top-5(
            v-if="section === 'docs' && isOpenAddingWrap",
            v-click-outside="closePopup",
@@ -53,7 +63,7 @@
              :close-modal="changeShowModal",
              v-click-outside="closeAddDocs"
            )
-            //-- table-create-package-doc(v-if="isOpenPackage")
+            //table-create-package-doc(v-if="isOpenPackage")
            stepper-create-agreement(v-if="isOpenPackage")

          base-popup.right-3.top-5(
@@ -173,7 +183,6 @@
 <script>
 //TODO: Разбить на несколько компонент
 import ClientDetailInput from "@/pages/clients/components/ClientDetailInput";
-import BaseButton from "@/components/base/BaseButton";
 import TableAddingNewDoc from "@/pages/clients/components/TableAddingNewDoc";
 import TableAddingNewAdditional from "@/pages/clients/components/TableAddingNewAdditional";
 import TableCreatePackageDoc from "@/pages/clients/components/TableCreatePackageDoc";
@@ -194,7 +203,6 @@ import StepperCreateAgreement from "./StepperCreateAgreement";
 export default {
  name: "ClientDetailInfoSection",
  components: {
-    BaseButton,
    BaseInput,
    BasePopup,
    BaseModal,
@@ -525,4 +533,27 @@ export default {
  width: 38px
  z-index: 1
  background: var(--light-grey-bg-color)
+
+.ok-button
+  color: var(--btn-blue-color)
+  border: 2px solid var(--btn-blue-color)
+  &:hover
+    background-color: var(--btn-blue-color)
+    color: var(--default-white)
+  &:active
+    background-color: var(--btn-light-green-color)
+    color: var(--btn-green-color)
+    border-color: var(--btn-light-green-color)
+
+.add-button
+  width: 20px
+  height: 20px
+  display: flex
+  justify-content: center
+  align-items: center
+  border: 2px solid var(--btn-blue-color)
+  color: var(--btn-blue-color)
+  &:hover
+    background-color: var(--btn-blue-color)
+    color: var(--default-white)
 </style>
--- a/src/pages/clients/components/ClientTableModal.vue
+++ b/src/pages/clients/components/ClientTableModal.vue
@@ -21,12 +21,8 @@
 </template>

 <script>
-import BaseButton from "@/components/base/BaseButton.vue";
 export default {
  name: "ClientTableModal",
-  components: {
-    BaseButton,
-  },
  props: {
    confirmTitle: String,
    bodyText: String,
--- a/src/pages/clients/components/ClientsActionPopup.vue
+++ b/src/pages/clients/components/ClientsActionPopup.vue
@@ -1,18 +1,19 @@
 <template lang="pug">
  q-menu(anchor="bottom middle")
    .popup-wrapper.flex.flex-col.gap-y-3.w-10.h-10.p-4.font-medium.text-sm.cursor-pointer
-      .button.keep-redaction.flex.gap-x-3(@click="openChangeData")
+      .button.keep-redaction.flex.gap-x-3(@click="openChangeData", v-close-popup)
        .icon-edit.icon
        span Редактировать
      .button.keep-redaction.flex.gap-x-3
        .icon-star-off.icon
        span На ведение
-      .button.keep-redaction.flex.gap-x-3(@click="createMedicalCard")
+      .button.keep-redaction.flex.gap-x-3(@click="createMedicalCard", v-close-popup)
        .icon-star-off.icon
        span Мед. карта
      .button.delete.flex.gap-x-3(
        @click="transmitDeleteClient",
-        :style="{'opacity': disabledDelete && '0.7'}"
+        :style="{'opacity': disabledDelete && '0.7'}",
+        v-close-popup
      )
        .icon-basket.icon-delete
        span Удалить
--- a/src/pages/clients/components/ClientsTableHat.vue
+++ b/src/pages/clients/components/ClientsTableHat.vue
@@ -51,13 +51,11 @@
 <script>
 import ClientsTableHeaderActions from "@/pages/clients/components/ClientsTableHeaderActions";
 import BaseInput from "@/components/base/BaseInput";
-import BaseButton from "@/components/base/BaseButton";
 export default {
  name: "ClientsTableHat",
  components: {
    BaseInput,
    ClientsTableHeaderActions,
-    BaseButton,
  },
  props: {
    openForm: Function,
--- a/src/pages/clients/components/ClientsTableRow.vue
+++ b/src/pages/clients/components/ClientsTableRow.vue
@@ -12,18 +12,12 @@
        :class="{'row-overlay-color': rowOverlay}"
      )
        .dots-wrapper.flex.items-center.px-2
-          //.relative.dots-button.icon-dots.cursor-pointer.leading-6.text-center(
-            v-show="!isOpenChange && !rowOverlay",
-            :tabindex="1",
-            @click="(e) => openPopup(e)",
-            @blur="handleUnFocusPopup"
-          //)
          q-btn(
            icon="app:icon-dots",
            size="12px",
            class="dots-button",
            @click.stop,
-            v-show="!isOpenChange && !rowOverlay",
+            v-if="!isOpenChange && !rowOverlay",
            round,
            dense,
            no-caps,
@@ -35,17 +29,17 @@
              @delete-client="transmitDeleteClient",
              :create-medical-card="transmitMedicalCard"
            )
-          .flex.z-10(
+          q-btn(
+            icon="app:icon-ok",
+            size="8px",
+            class="ok-button",
            v-if="isOpenChange && !rowOverlay",
-          )
-            base-button(
            @click="closeChangeData",
-              confirm,
-              rounded,
-              outlined,
-              :size="20"
+            round,
+            dense,
+            no-caps,
+            padding="4px 3px 2px 3px"
          )
-              .icon-ok.text-xsm(class="pt-[3px]")
        //- .check-box.flex.justify-center.items-center(
        //-   :class="{'row-opacity': rowOverlay}"
        //- )
@@ -134,7 +128,6 @@ import TableCellBodyName from "@/pages/clients/components/cells/TableCellBodyNam
 import ClientsActionPopup from "@/pages/clients/components/ClientsActionPopup";
 import ClientsTableCheckbox from "@/pages/clients/components/ClientsTableCheckbox";
 import ClientDetailInfoWrapper from "@/pages/clients/components/ClientDetailInfoWrapper";
-import BaseButton from "@/components/base/BaseButton";
 import { fetchWrapper } from "@/shared/fetchWrapper";
 import { column } from "@/pages/clients/utils/tableConfig";
 import TheNotificationProvider from "@/components/Notifications/TheNotificationProvider";
@@ -144,7 +137,6 @@ import * as moment from "moment";
 export default {
  name: "ClientsTableRow",
  components: {
-    BaseButton,
    ClientsTableCheckbox,
    ClientsActionPopup,
    TableCellBodyName,
@@ -777,6 +769,16 @@ export default {
  &:hover
    background-color: var(--btn-blue-color)
    color: var(--default-white)
+.ok-button
+  color: var(--btn-blue-color)
+  border: 2px solid var(--btn-blue-color)
+  &:hover
+    background-color: var(--btn-blue-color)
+    color: var(--default-white)
+  &:active
+    background-color: var(--btn-light-green-color)
+    color: var(--btn-green-color)
+    border-color: var(--btn-light-green-color)
 .row-opacity
  opacity: 0.5
 .row-overlay
--- a/src/pages/clients/components/FormCreateAddresses.vue
+++ b/src/pages/clients/components/FormCreateAddresses.vue
@@ -63,13 +63,12 @@
 </template>

 <script>
-import BaseButton from "@/components/base/BaseButton";
 import BaseInput from "@/components/base/BaseInput";
 import BaseCustomSelect from "@/components/base/BaseCustomSelect";

 export default {
  name: "FormCreateAddresses",
-  components: { BaseInput, BaseButton, BaseCustomSelect },
+  components: { BaseInput, BaseCustomSelect },
  props: {
    addresses: Object,
    saveClient: Function,
--- a/src/pages/clients/components/FormCreateBasicInfo.vue
+++ b/src/pages/clients/components/FormCreateBasicInfo.vue
@@ -43,7 +43,6 @@
 </template>

 <script>
-import BaseButton from "@/components/base/BaseButton";
 import BaseInput from "@/components/base/BaseInput";
 import BaseAddingNetwork from "@/components/base/BaseAddingNetwork";
 import { column } from "@/pages/clients/utils/tableConfig";
@@ -54,7 +53,6 @@ export default {
  components: {
    BaseInput,
    BaseAddingNetwork,
-    BaseButton,
    BaseCustomSelect,
  },
  props: {
--- a/src/pages/clients/components/FormCreateIdentityDocuments.vue
+++ b/src/pages/clients/components/FormCreateIdentityDocuments.vue
@@ -54,12 +54,11 @@
 </template>

 <script>
-import BaseButton from "@/components/base/BaseButton";
 import BaseInput from "@/components/base/BaseInput";

 export default {
  name: "FormCreateIdentityDocuments",
-  components: { BaseInput, BaseButton },
+  components: { BaseInput },
  props: {
    identityDocument: Object,
    saveClient: Function,
--- a/src/pages/clients/components/FormCreateMedicalCard.vue
+++ b/src/pages/clients/components/FormCreateMedicalCard.vue
@@ -13,28 +13,37 @@
      )
    .flex.justify-between
      .flex
-        base-button.font-semibold(
-            :size="40",
+        q-btn(
          @click="prevStep",
          v-if="currentStep !== 0",
-            outlined,
-          ) Назад
+          outline,
+          no-caps,
+          label="Назад",
+          color="primary",
+          padding="8px 24px"
+        )
      .flex
-        base-button.font-semibold(
-          :size="40",
+        q-btn(
          @click="nextStep",
          v-if="currentStep < steps.length-1",
-        ) Далее
-        base-button.font-semibold(
-          :size="40",
+          no-caps,
+          label="Далее",
+          color="primary",
+          padding="8px 24px"
+        )
+        q-btn(
          @click="finish",
-          v-if="currentStep === steps.length-1"
-        ) Создать медицинскую карту
+          v-if="currentStep === steps.length-1",
+          no-caps,
+          label="Создать медицинскую карту",
+          style="width: 272px",
+          color="primary",
+          padding="8px 24px"
+        )
 </template>

 <script>
 import BaseInput from "@/components/base/BaseInput";
-import BaseButton from "@/components/base/BaseButton";
 import BaseSelect from "@/components/base/BaseSelect";
 import MedicalBaseData from "@/pages/medicalCard/components/MedicalBaseData";
 import MedicalIdentityDocuments from "@/pages/medicalCard/components/MedicalIdentityDocuments";
@@ -46,7 +55,6 @@ export default {
  name: "FormCreateMedicalCard",
  components: {
    BaseInput,
-    BaseButton,
    BaseSelect,
    MedicalBaseData,
    MedicalIdentityDocuments,
--- a/src/pages/clients/components/StepperCreateAgreement.vue
+++ b/src/pages/clients/components/StepperCreateAgreement.vue
@@ -10,27 +10,35 @@
      component(v-bind:is="currentTabComponent")     
    .flex.justify-between
      .flex
-        base-button(
-            :size="40",
+        q-btn(
          @click="prevStep",
          v-if="currentStep !== 0",
-            outlined,
-          ) Назад
+          outline,
+          no-caps,
+          label="Назад",
+          color="primary",
+          padding="8px 24px"
+        )
      .flex
-        base-button(
-          :size="40",
+        q-btn(
          @click="nextStep",
          v-if="currentStep < steps.length-1",
-        ) Далее
-        base-button(
-          :size="40",
+          no-caps,
+          label="Далее",
+          color="primary",
+          padding="8px 24px"
+        )
+        q-btn(
          @click="finish",
-          v-if="currentStep === steps.length-1"
-        ) Завершить
+          v-if="currentStep === steps.length-1",
+          no-caps,
+          label="Завершить",
+          color="primary",
+          padding="8px 24px"
+        )
 </template>

 <script>
-import BaseButton from "@/components/base/BaseButton";
 import BaseStepper from "@/components/base/BaseStepper";
 import AgreementCommon from "./FormsAgreementCreate/AgreementCommon";
 import AgreementPerson from "./FormsAgreementCreate/AgreementPerson";
@@ -39,7 +47,6 @@ import AgreementServices from "./FormsAgreementCreate/AgreementServices";
 export default {
  name: "StepperCreateAgreement",
  components: {
-    BaseButton,
    BaseStepper,
    AgreementCommon,
    AgreementPerson,
--- a/src/pages/clients/components/TableAddingNewAdditional.vue
+++ b/src/pages/clients/components/TableAddingNewAdditional.vue
@@ -13,16 +13,21 @@
          span Загрузите элемент
            label.label.cursor-pointer(for="file-upload")  с компьютера
            span  или перетащите их сюда
-      base-button(@click="saveAdditional" :size="40")
-        span.font-semibold Добавить
+      q-btn(
+        @click="saveAdditional",
+        color="primary",
+        label="Добавить",
+        no-caps,
+        padding="8px 24px",
+        style="height: 40px; width: 124px"
+      )
 </template>

 <script>
 import BaseInput from "@/components/base/BaseInput";
-import BaseButton from "@/components/base/BaseButton";
 export default {
  name: "TableAddingNewAdditional",
-  components: { BaseInput, BaseButton },
+  components: { BaseInput },
  props: {
    addNewAdditional: Function,
    saveAdditional: Function,
--- a/src/pages/clients/components/TableAddingNewDoc.vue
+++ b/src/pages/clients/components/TableAddingNewDoc.vue
@@ -9,15 +9,19 @@
            span  или перетащите его в это поле
      .flex.flex-col
        span.name-doc.py-2.px-3(v-for="doc in newDocs") {{doc.name}}
-    base-button(@click="closeModal", :size="40", :style="{width: '124px'}")
-      span.font-semibold Добавить
+    q-btn(
+      @click="closeModal",
+      color="primary",
+      label="Добавить",
+      no-caps,
+      padding="8px 24px",
+      style="height: 40px; width: 124px"
+    )
 </template>

 <script>
-import BaseButton from "@/components/base/BaseButton";
 export default {
  name: "TableAddingNewDoc",
-  components: { BaseButton },
  props: {
    addNewDoc: Function,
    newDocs: Array,
--- a/src/pages/clients/components/TableCreateNote.vue
+++ b/src/pages/clients/components/TableCreateNote.vue
@@ -9,17 +9,22 @@
        placeholder="Описание",
        v-model="description"
      )
-    .flex
-      base-button(:size="40", @click="sendNote") Добавить
+    q-btn(
+      label="Добавить",
+      no-caps,
+      color="primary",
+      padding="4px 24px",
+      @click="sendNote",
+      style="font-weight: 500; height: 40px; width: 122px"
+    )
 </template>

 <script>
-import BaseButton from "@/components/base/BaseButton";
 import BaseInput from "@/components/base/BaseInput";

 export default {
  name: "TableCreateNote",
-  components: { BaseButton, BaseInput },
+  components: { BaseInput },
  props: {
    createNote: Function,
    closePopup: Function,
--- a/src/pages/clients/components/TableCreatePackageDoc.vue
+++ b/src/pages/clients/components/TableCreatePackageDoc.vue
@@ -71,15 +71,22 @@
                )
                .flex.p-2(:style="{width: '358px'}") {{service.name}}
              .counter {{service.type}}
-  base-button.custom-button(
+  q-btn(
    v-if="!isServices",
+    @click="changeServices",
    :disabled="disabledButton",
-    :size="40",
-    @click="changeServices"
+    label="Далее",
+    color="primary",
+    padding="8px 24px",
+    no-caps
+  )
+  q-btn(
+    v-else,
+    label="Создать пакет документов",
+    color="primary",
+    padding="8px 24px",
+    no-caps
  )
-    span.font-semibold Далее
-  base-button.custom-button(:size="40", v-else)
-    span.font-semibold Создать пакет документов
 </template>

 <script>
--- a/src/pages/clients/components/cells/TableCellBodyNetworks.vue
+++ b/src/pages/clients/components/cells/TableCellBodyNetworks.vue
@@ -10,16 +10,18 @@
          :id="network.kind",
          @click.stop="(e) => deleteNetwork(e)"
        )
-    .flex.relative.px-0.pl-0(class="pl-[46px]")
-      base-button(
+    .flex.relative
+      q-btn(
+        icon="add",
+        size="14px",
+        class="add-button"
        v-if="isOpenChange && settings.settings.length !== getNetworks.length",
        @click.stop="openPopupAdding",
-        :rounded="true",
-        :outlined="true",
-        :added="true",
-        :size="24"
+        round,
+        dense,
+        no-caps,
+        padding="1px"
      )
-        .icon-plus(class="pt-[2px]")
      base-popup.right-3.top-6.z-20(
        v-if="isOpenPopupAdding",
        @click.stop,
@@ -33,21 +35,24 @@
          :choose-network="chooseNetwork"
        )
        .w-fit
-          base-button(:size="40", @click="saveNetwork")
-            span.font-semibold Добавить
+          q-btn(
+            color="primary",
+            label="Добавить",
+            no-caps,
+            @click="saveNetwork",
+            padding="8px 24px"
+          )
 </template>

 <script>
 import BaseAddingNetwork from "@/components/base/BaseAddingNetwork";
 import BasePopup from "@/components/base/BasePopup";
-import BaseButton from "@/components/base/BaseButton";
 import { column } from "@/pages/clients/utils/tableConfig";
 export default {
  name: "TableCellBodyNetworks",
  components: {
    BasePopup,
    BaseAddingNetwork,
-    BaseButton,
  },
  props: {
    networks: {
@@ -116,9 +121,17 @@ export default {
  column-gap: 2px
 .icon
  color: var(--btn-blue-color)
+  &:last-child
+    padding-right: 46px
 .delete
  border-radius: 50%
  background-color: var(--btn-red-color)
  color: var(--default-white)
  font-size: 8px
+.add-button
+  border: 2px solid var(--btn-blue-color)
+  color: var(--btn-blue-color)
+  &:hover
+    background-color: var(--btn-blue-color)
+    color: var(--default-white)
 </style>
--- a/src/pages/login/TheLogin.vue
+++ b/src/pages/login/TheLogin.vue
@@ -35,7 +35,13 @@
          .flex.items-center.gap-x-8px
            q-checkbox(@click="persist", v-model="isView", type="checkbox")
            .flex.non-italic.font-medium.base Запомнить меня
-        base-button.font-semibold(:disabled="disabledButton", :size="48", @click="login") Войти в аккаунт
+        q-btn(
+          :disable="disabledButton",
+          @click="login",
+          label="Войти в аккаунт",
+          color="primary",
+          no-caps
+        )
      .absolute.left-12.bottom-12 2022 © Астра
    .right-col.flex.items-center.justify-center.relative
 </template>
@@ -43,12 +49,11 @@
 <script>
 import { fetchWrapper } from "@/shared/fetchWrapper";
 import BaseInput from "@/components/base/BaseInput";
-import BaseButton from "@/components/base/BaseButton";
 import logoMark from "@/assets/images/logoMark.svg";

 export default {
  name: "TheLogin",
-  components: { BaseInput, BaseButton },
+  components: { BaseInput },
  data() {
    return {
      underTextColor: "var(--font-grey-color)",
--- a/src/pages/medicalCard/components/MedicalBaseData.vue
+++ b/src/pages/medicalCard/components/MedicalBaseData.vue
@@ -63,7 +63,6 @@
 <script>
 import BaseInput from "@/components/base/BaseInput";
 import BaseSelect from "@/components/base/BaseSelect";
-import BaseButton from "@/components/base/BaseButton";
 import BaseRadioButtonsGroup from "@/components/base/BaseRadioButtonsGroup.vue";
 import { medicalDetailConfig } from "@/pages/medicalCard/utils/medicalConfig.js";

@@ -72,7 +71,6 @@ export default {
  components: {
    BaseInput,
    BaseSelect,
-    BaseButton,
    BaseRadioButtonsGroup,
  },
  props: {
--- a/src/pages/medicalCard/components/MedicalCardHeader.vue
+++ b/src/pages/medicalCard/components/MedicalCardHeader.vue
@@ -1,17 +1,27 @@
 <template lang="pug">
  .flex.w-full
    .flex.w-full.text-lgx.font-bold.items-center.justify-center Медицинская карта №{{numberCard}}
-    .flex.gap-x-2
-      base-button(left-icon="icon-download", :icon-left-size="16", :size="40", :outlined="true")
-      base-button(left-icon="icon-plus", :icon-left-size="13", :size="40")
-        span.font-semibold Создать
+    .flex.h-10.gap-x-2
+      q-btn(
+        outline,
+        icon="icon-download",
+        color="primary",
+        size="12px",
+        padding="8px 24px",
+      )
+      q-btn(
+        color="primary",
+        icon="add",
+        label="Создать",
+        style="width: 146px"
+        padding="6px 24px",
+        no-caps
+      )
 </template>

 <script>
-import BaseButton from "@/components/base/BaseButton.vue";
 export default {
  name: "MedicalCardHeader",
-  components: { BaseButton },
  props: {
    numberCard: String,
  },
--- a/src/pages/medicalCard/components/MedicalCardWrapper.vue
+++ b/src/pages/medicalCard/components/MedicalCardWrapper.vue
@@ -88,8 +88,12 @@
            medical-dental-formula(v-if="key === 'dental_formula'" :formula-data="dentalIndications[key]")
            base-input(v-model="dentalIndications[key]", outlined, v-else)
        .flex.justify-center
-          base-button.w-fit(:icon-left-size="13", :size="40")
-            span.font-semibold Сохранить
+          q-btn(
+            color="primary",
+            label="Сохранить",
+            padding="8px 24px",
+            no-caps
+          )
 </template>

 <script>
@@ -101,14 +105,12 @@ import { formulaDataMap } from "@/pages/medicalCard/utils/medicalConfig";
 import { medicalDetailConfig } from "@/pages/medicalCard/utils/medicalConfig";
 import { fetchWrapper } from "@/shared/fetchWrapper";
 import BaseInput from "@/components/base/BaseInput.vue";
-import BaseButton from "@/components/base/BaseButton.vue";
 import ClientDetailInput from "@/pages/clients/components/ClientDetailInput.vue";
 export default {
  name: "MedicalCardWrapper",
  components: {
    ClientDetailInput,
    BaseInput,
-    BaseButton,
    BaseDetailInfo,
    BaseDetailInput,
    MedicalCardHeader,
--- a/src/pages/medicalCard/components/MedicalIdentityDocuments.vue
+++ b/src/pages/medicalCard/components/MedicalIdentityDocuments.vue
@@ -33,11 +33,10 @@
 <script>
 import BaseInput from "@/components/base/BaseInput";
 import BaseSelect from "@/components/base/BaseSelect";
-import BaseButton from "@/components/base/BaseButton";

 export default {
  name: "MedicalIdentityDocuments",
-  components: { BaseInput, BaseSelect, BaseButton },
+  components: { BaseInput, BaseSelect },
  props: {
    changeIdentityDoc: Function,
    clientDetail: Object,
--- a/src/pages/schedule/components/FormChangeShift.vue
+++ b/src/pages/schedule/components/FormChangeShift.vue
@@ -25,17 +25,21 @@
          outlined
        )
      .flex.justify-center
-        base-button.font-semibold(:size="40") Сохранить
+        q-btn(
+          label="Сохранить",
+          color="primary",
+          padding="8px 24px",
+          no-caps
+        )
 </template>

 <script>
 import BaseCustomSelect from "@/components/base/BaseCustomSelect.vue";
 import BaseInput from "@/components/base/BaseInput.vue";
-import BaseButton from "@/components/base/BaseButton.vue";

 export default {
  name: "FormChangeShift",
-  components: { BaseCustomSelect, BaseInput, BaseButton },
+  components: { BaseCustomSelect, BaseInput },
  props: { closeForm: Function, timesShift: Object },
  data() {
    return {
--- a/src/pages/schedule/components/ScheduleHeader.vue
+++ b/src/pages/schedule/components/ScheduleHeader.vue
@@ -37,6 +37,7 @@
            color="primary",
            no-caps,
            padding="8px 24px",
+            style="width: 174px"
            @click="changeShowTime",
          )
          q-btn(
@@ -50,12 +51,11 @@

 <script>
 import * as moment from "moment";
-import BaseButton from "@/components/base/BaseButton.vue";
 import FormChangeShift from "@/pages/schedule/components/FormChangeShift.vue";

 export default {
  name: "ScheduleHeader",
-  components: { BaseButton, FormChangeShift },
+  components: { FormChangeShift },
  props: {
    startMonth: Object,
    timesShift: Object,
--- a/src/pages/schedule/components/ScheduleTable.vue
+++ b/src/pages/schedule/components/ScheduleTable.vue
@@ -27,7 +27,6 @@
 <script>
 import * as moment from "moment";
 import BaseModal from "@/components/base/BaseModal.vue";
-import BaseButton from "@/components/base/BaseButton.vue";
 import ScheduleTableHeader from "@/pages/schedule/components/ScheduleTableHeader.vue";
 import ScheduleTableBody from "@/pages/schedule/components/ScheduleTableBody.vue";
 import ScheduleTableSelect from "@/pages/schedule/components/ScheduleTableSelect.vue";
@@ -36,7 +35,6 @@ export default {
  name: "ScheduleTable",
  components: {
    BaseModal,
-    BaseButton,
    ScheduleTableHeader,
    ScheduleTableBody,
    ScheduleTableSelect,