From a4240f3651959db2aa979452e80d0cd6416e3775 Mon Sep 17 00:00:00 2001
From: megavrilinvv <vastre@rambler.ru>
Date: Wed, 7 Dec 2022 14:04:51 +0300
Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20?=
 =?UTF-8?q?placeholder=20=D0=B0=D0=B4=D1=80=D0=B5=D1=81=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/calendar/TheCalendar.vue            |  7 ++++--
 .../components/ClientDetailSectionAddress.vue |  2 +-
 src/pages/clients/components/ClientsTable.vue | 23 ++++++++++++-------
 .../components/FormCreateAddresses.vue        |  2 +-
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue
index fedb14d..2c5e302 100644
--- a/src/pages/calendar/TheCalendar.vue
+++ b/src/pages/calendar/TheCalendar.vue
@@ -104,11 +104,14 @@ export default {
     saveEmployeesData(res) {
       this.employeesData = res.results;
     },
+    logout() {
+      localStorage.removeItem("tokenAccess");
+      this.$router.push("/login");
+    },
     fetchEmployeesData() {
       fetchWrapper.get("general/employee/").then((res) => {
         if (res.type === "client_error") {
-          localStorage.removeItem("tokenAccess");
-          return this.$router.push("/login");
+          this.logout();
         } else this.saveEmployeesData(res);
       });
     },
diff --git a/src/pages/clients/components/ClientDetailSectionAddress.vue b/src/pages/clients/components/ClientDetailSectionAddress.vue
index 8c195f6..3b31f34 100644
--- a/src/pages/clients/components/ClientDetailSectionAddress.vue
+++ b/src/pages/clients/components/ClientDetailSectionAddress.vue
@@ -4,7 +4,7 @@
       .text-info.text-xxs.font-semibold Город
       base-select.cursor-grab(
         disable,
-        placeholder="Выберите город",
+        placeholder="Введите город",
         v-model="dopeAddress.city",
         :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
       )
diff --git a/src/pages/clients/components/ClientsTable.vue b/src/pages/clients/components/ClientsTable.vue
index 909d3b8..f653625 100644
--- a/src/pages/clients/components/ClientsTable.vue
+++ b/src/pages/clients/components/ClientsTable.vue
@@ -118,6 +118,10 @@ export default {
         this.fetchDataClients();
       }
     },
+    logout() {
+      localStorage.removeItem("tokenAccess");
+      this.$router.push("/login");
+    },
     async fetchDataClients() {
       let response = {};
       if (this.textSearch) {
@@ -126,12 +130,16 @@ export default {
             this.limit
           }&offset=${(this.currentTablePage - 1) * this.limit}`
         );
-        this.saveDataClients(response);
-        this.saveFilteredClientsCount(response);
-        this.paginationInfo = {
-          currentPage: this.currentTablePage,
-          length: this.calculatePageCount(this.filteredClientsCount),
-        };
+        if (response.type === "client_error") {
+          this.logout();
+        } else {
+          this.saveDataClients(response);
+          this.saveFilteredClientsCount(response);
+          this.paginationInfo = {
+            currentPage: this.currentTablePage,
+            length: this.calculatePageCount(this.filteredClientsCount),
+          };
+        }
       } else {
         response = await fetchWrapper.get(
           `general/person/?limit=${this.limit}&offset=${
@@ -139,8 +147,7 @@ export default {
           }`
         );
         if (response.type === "client_error") {
-          localStorage.removeItem("tokenAccess");
-          return this.$router.push("/login");
+          this.logout();
         } else {
           this.saveDataClients(response);
           this.saveClientsCount(response);
diff --git a/src/pages/clients/components/FormCreateAddresses.vue b/src/pages/clients/components/FormCreateAddresses.vue
index f30bb5f..7fed5a9 100644
--- a/src/pages/clients/components/FormCreateAddresses.vue
+++ b/src/pages/clients/components/FormCreateAddresses.vue
@@ -15,7 +15,7 @@
           .text-info.text-xxs.font-semibold Город
           base-input.input-info(
             disabled,
-            placeholder="Выберите город",
+            placeholder="Введите город",
             v-model:value="addresses.city",
             :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
           )