From d43f6354d20f483434fabb138f853efda0131de7 Mon Sep 17 00:00:00 2001
From: megavrilinvv <vastre@rambler.ru>
Date: Fri, 18 Nov 2022 13:43:18 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=B0=D0=B4=D1=80=D0=B5=D1=81=D0=B0=20=D0=BD=D0=B0=20=D0=BA?=
 =?UTF-8?q?=D0=B0=D1=80=D1=82=D0=BE=D1=87=D0=BA=D0=B5=20=D1=81=D0=BE=D0=B7?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base/BaseInput.vue             |  3 --
 .../clients/components/ClientsTableRow.vue    |  2 +-
 .../components/FormCreateAddresses.vue        | 41 +++++++++++--------
 src/shared/fetchWrapper.js                    |  2 +-
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/components/base/BaseInput.vue b/src/components/base/BaseInput.vue
index d54e399..b55c3f1 100644
--- a/src/components/base/BaseInput.vue
+++ b/src/components/base/BaseInput.vue
@@ -62,7 +62,4 @@ export default {
   border: none
 .input
   background-color: inherit
-.date-input
-  // padding: 8px 12px
-  // max-height: 40px
 </style>
diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue
index 3746249..2471321 100644
--- a/src/pages/clients/components/ClientsTableRow.vue
+++ b/src/pages/clients/components/ClientsTableRow.vue
@@ -342,7 +342,7 @@ export default {
         this.dopeAddress.street &&
         this.dopeAddress.house
       ) {
-        return `${this.dopeAddress.region}.обл, г.${this.dopeAddress.city}, ул.${this.dopeAddress.street}, ${this.dopeAddress.house}, ${this.dopeAddress.flat}, ${this.dopeAddress.index}`;
+        return `${this.dopeAddress.index}, ${this.dopeAddress.region} обл., г.${this.dopeAddress.city}, ул.${this.dopeAddress.street}, д.${this.dopeAddress.house}, кв.${this.dopeAddress.flat}`;
       }
     },
     clearAddress() {
diff --git a/src/pages/clients/components/FormCreateAddresses.vue b/src/pages/clients/components/FormCreateAddresses.vue
index 8daf2b8..f45d9d8 100644
--- a/src/pages/clients/components/FormCreateAddresses.vue
+++ b/src/pages/clients/components/FormCreateAddresses.vue
@@ -13,26 +13,41 @@
       .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-custom-select(
+          base-input.input-info(
             placeholder="Выберите город",
-            :items="cities",
-            v-model="currentCity"
+            v-model:value="addresses.city"
           )
         .flex.flex-col(class="gap-y-1.5")
           span.text-sm.font-semibold Область
-          base-input.input-info(placeholder="Введите область")
+          base-input.input-info(
+            placeholder="Введите область",
+            v-model:value="addresses.region"
+          )
         .flex.flex-col(class="gap-y-1.5")
           span.text-sm.font-semibold Улица
-          base-input.input-info(placeholder="Введите улицу")
+          base-input.input-info(
+            placeholder="Введите улицу",
+            v-model:value="addresses.street"
+          )
         .flex.flex-col(class="gap-y-1.5")
           span.text-sm.font-semibold Дом
-          base-input.input-info(placeholder="Номер дома")
+          base-input.input-info(
+            placeholder="Номер дома",
+            v-model:value="addresses.house_number"
+          )
         .flex.flex-col(class="gap-y-1.5")
           span.text-sm.font-semibold Квартира
-          base-input.input-info(placeholder="Номер квартиры")
+          base-input.input-info(
+            placeholder="Номер квартиры",
+            v-model:value="addresses.apartment_number"
+          )
         .flex.flex-col(class="gap-y-1.5")
           span.text-sm.font-semibold Индекс
-          base-input.input-info(placeholder="000000", v-mask="'######'")
+          base-input.input-info(
+            placeholder="000000",
+            v-mask="'######'",
+            v-model:value="addresses.zip_code"
+          )
     .px-4
       base-button(@click="saveClient" :size="40")
         span.font-semibold Создать клиента
@@ -52,16 +67,6 @@ export default {
     saveFile: Function,
   },
   directives: { mask },
-  data() {
-    return {
-      currentCity: { id: null, label: "" },
-      cities: [
-        { id: 1, label: "Владивосток" },
-        { id: 2, label: "Москва" },
-        { id: 3, label: "Тула" },
-      ],
-    };
-  },
 };
 </script>
 
diff --git a/src/shared/fetchWrapper.js b/src/shared/fetchWrapper.js
index 1e62fdc..b193eb2 100644
--- a/src/shared/fetchWrapper.js
+++ b/src/shared/fetchWrapper.js
@@ -12,7 +12,7 @@ function handleRequest(method, url, headers, attempts, body) {
     })();
   })
     .then((res) => {
-      if (res._bodyText) return res.json();
+      if (res) return res.json();
     })
     .catch((err) => {
       console.log(err);