WIP Частично заменила инпуты

2023-07-14 18:17:57 +03:00
parent ee3c828a22
commit 27f25a8826
12 changed files with 347 additions and 225 deletions
--- a/src/pages/clients/components/ClientsTableHat.vue
+++ b/src/pages/clients/components/ClientsTableHat.vue
@@ -2,16 +2,15 @@
  .flex.justify-between.w-full.h-fit
    .flex.gap-2.w-fit.h-fit
      .input
-        base-input(
-          :with-icon="true",
-          icon-position="left",
+        base-input.search(
          v-model="searchClient",
          placeholder="Введите фамилию",
          @keyup.enter="searchLastName",
-          outlined
+          size="M",
+          :width="280",
+          :icon-left="!searchClient"
        )
-          .flex.items-center.cursor-pointer
-            .icon-search
+          q-icon(name="app:search", size="18px", v-if="!searchClient")
      base-button(
        v-if="createdClientName === ''",
        @click="searchLastName",
@@ -42,8 +41,8 @@

 <script>
 import ClientsTableHeaderActions from "@/pages/clients/components/ClientsTableHeaderActions";
-import BaseInput from "@/components/base/BaseInput";
 import BaseButton from "@/components/base/BaseButton.vue";
+import BaseInput from "@/components/BaseInput.vue";

 export default {
  name: "ClientsTableHat",
@@ -97,4 +96,6 @@ export default {
  min-width: 280px
 .on-left
  margin-right: 10px
+.search :deep(.q-field__prepend)
+  padding-right: 6px !important
 </style>
--- a/src/pages/clients/components/FormCreateAddresses.vue
+++ b/src/pages/clients/components/FormCreateAddresses.vue
@@ -5,66 +5,60 @@
        v-model="addresses.full_address",
        placeholder="Введите адрес целиком",
        label="Полный адрес",
-        outlined
+        size="M"
      )
      .flex.items-center.justify-center.relative
        .line.absolute
        span.text-sm.separator.px-2 или
      .grid.grid-cols-2.gap-y-6.gap-x-4
        base-input(
-          disabled,
-          filled,
-          placeholder="Введите город",
          v-model="addresses.city",
          label="Город",
-          outlined
+          placeholder="Введите город",
+          disabled,
+          size="M"
        )
        base-input(
-          disabled,
-          filled,
-          placeholder="Введите область",
          v-model="addresses.region",
          label="Область",
-          outlined
+          placeholder="Введите область",
+          disabled,
+          size="M"
        )
        base-input(
-          disabled,
-          filled,
-          placeholder="Введите улицу",
          v-model="addresses.street",
          label="Улица",
-          outlined
+          placeholder="Введите улицу",
+          disabled,
+          size="M"
        )
        base-input(
-          disabled,
-          filled,
-          placeholder="Номер дома",
          v-model="addresses.house_number",
          label="Дом",
-          outlined
+          placeholder="Номер дома",
+          disabled,
+          size="M"
        )
        base-input(
-          disabled,
-          filled,
-          placeholder="Номер квартиры",
          v-model="addresses.apartment_number",
          label="Квартира",
-          outlined
+          placeholder="Номер квартиры",
+          disabled,
+          size="M"
        )
        base-input(
-          disabled,
-          filled,
-          placeholder="000000",
-          mask="######",
          v-model="addresses.zip_code",
          label="Индекс",
-          outlined
+          mask="######",
+          placeholder="000000",
+          disabled,
+          size="M"
        )
 </template>

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

 export default {
  name: "FormCreateAddresses",
@@ -79,7 +73,7 @@ export default {

 <style lang="sass" scoped>
 .wrapper-addresses
-  height: 368px
+  height: 380px
  overflow-y: auto
  &::-webkit-scrollbar
    width: 4px
--- a/src/pages/clients/components/FormCreateBasicInfo.vue
+++ b/src/pages/clients/components/FormCreateBasicInfo.vue
@@ -7,27 +7,27 @@
        v-model="basicInfo.priority",
        label="Приоритет"
      )
-      base-input(
-        type="date"
+      base-input-date(
        v-model="basicInfo.birth_date",
+        size="M",
+        important,
        label="Дата рождения",
-        outlined,
-        important
+        placeholder="Дата рождения"
      )
      base-input(
        v-model="phone.username",
        placeholder="+7 (915) 644–92–23",
        mask="+7 (###) ###-##-##",
        label="Номер телефона",
-        outlined,
+        size="M",
        important
      )
      base-input(
        v-model="email.username",
        placeholder="user@yandex.ru",
        label="Email",
-        outlined,
-        important
+        important,
+        size="M",
      )
      .flex.flex-col.col-start-1.col-end-3.w-100(class="gap-y-1.5")
        span.text-sm.font-semibold.opacity-40.input-info Ссылки на соцсети
@@ -43,9 +43,10 @@
 </template>

 <script>
-import BaseInput from "@/components/base/BaseInput";
 import BaseAddingNetwork from "@/components/base/BaseAddingNetwork";
 import BaseSelect from "@/components/base/BaseSelect";
+import BaseInput from "@/components/BaseInput.vue";
+import BaseInputDate from "@/components/base/BaseInputDate.vue";

 export default {
  name: "FormCreateBasicInfo",
@@ -53,6 +54,7 @@ export default {
    BaseInput,
    BaseAddingNetwork,
    BaseSelect,
+    BaseInputDate,
  },
  props: {
    priorityList: Array,
--- a/src/pages/clients/components/FormCreateIdentityDocuments.vue
+++ b/src/pages/clients/components/FormCreateIdentityDocuments.vue
@@ -4,59 +4,59 @@
      span.title-info.text-base.font-bold Паспортные данные
      .grid.grid-cols-2.gap-x-4.gap-y-6
        base-input(
-          mask="#### ######",
          v-model="identityDocument.pass.series_number",
+          mask="#### ######",
          placeholder="0000 000000",
          label="Серия и номер",
-          outlined
+          size="M"
        )
        base-input(
          v-model="identityDocument.pass.issued_by_org",
          placeholder="Точно как в паспорте",
          label="Кем выдан",
-          outlined
+          size="M"
        )
        base-input(
-          mask="###-###",
          v-model="identityDocument.pass.issued_by_org_code",
+          mask="###-###",
          placeholder="000–000",
          label="Код подразделения",
-          outlined
+          size="M"
        )
-        base-input(
-          type="date"
+        base-input-date(
          v-model="identityDocument.pass.issued_by_date",
          placeholder="Дата",
          label="Дата выдачи",
-          outlined
+          size="M"
        )
    .flex.flex-col.gap-y-6
      span.title-info.text-base.font-bold СНИЛС и ИНН
      .grid.grid-cols-2.gap-x-4.gap-y-6
        base-input(
-          disabled,
-          filled,
-          mask="###-###-### ##",
          v-model="identityDocument.snils.number",
+          mask="###-###-### ##",
          placeholder="000–000–000 00",
-          label="Номер СНИЛС"
+          label="Номер СНИЛС",
+          disabled,
+          size="M"
        )
        base-input(
-          disabled,
-          filled,
-          mask="############",
          v-model="identityDocument.inn.number",
          placeholder="000000000000",
-          label="Номер ИНН"
+          mask="############",
+          label="Номер ИНН",
+          disabled,
+          size="M"
        )
 </template>

 <script>
-import BaseInput from "@/components/base/BaseInput";
+import BaseInput from "@/components/BaseInput.vue";
+import BaseInputDate from "@/components/base/BaseInputDate.vue";

 export default {
  name: "FormCreateIdentityDocuments",
-  components: { BaseInput },
+  components: { BaseInput, BaseInputDate },
  props: {
    identityDocument: Object,
    saveClient: Function,
--- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolCreateModal.vue
+++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolCreateModal.vue
@@ -6,18 +6,14 @@
        label="Дата осмотра",
        placeholder="Выберите дату"
        :width="202",
-        type="date",
-        textColor="var(--font-dark-blue-color)"
-        outlined,
+        size="M"
      )
      base-input-time(
        v-model="protocolData.startTime"
        label="Время осмотра",
        :width="202",
-        outlined,
-        type="time",
-        textColor="var(--font-dark-blue-color)",
-        placeholder="Выберите время"
+        placeholder="Выберите время",
+        size="M"
      )
    .flex.flex-col.gap-y-6px
      span.color-grey.line-height.text-sm.font-semibold Врач
@@ -70,8 +66,8 @@ export default {
  data() {
    return {
      protocolData: {
-        date: new Date(),
-        startTime: moment().format("HH:mm"),
+        date: null,
+        startTime: null,
      },
    };
  },