From 1db2ca21133461740918b7e2246cad5a2fbd9398 Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Fri, 2 Dec 2022 15:15:56 +0300
Subject: [PATCH] =?UTF-8?q?WIP=20=D0=9D=D0=B0=D0=BB=D0=B0=D0=B4=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=B0=20=D1=82=D0=B0=D0=B9=D0=BC=D0=B5=D1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base/BaseClientFormCreate.vue     |  2 +-
 src/pages/clients/components/ClientsTable.vue    |  6 ++++--
 src/pages/clients/components/ClientsTableRow.vue | 15 ++++++++++-----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/components/base/BaseClientFormCreate.vue b/src/components/base/BaseClientFormCreate.vue
index bf2a897..e50033b 100644
--- a/src/components/base/BaseClientFormCreate.vue
+++ b/src/components/base/BaseClientFormCreate.vue
@@ -392,7 +392,7 @@ export default {
       }
       if (this.infoClient.basic.full_name.split(" ").length < 3) {
         this.addErrrorNotification(
-          "Не корректное ФИО клиента",
+          "Некорректное ФИО клиента",
           "Пожалуйста, введите ФИО клиента правильно"
         );
         return false;
diff --git a/src/pages/clients/components/ClientsTable.vue b/src/pages/clients/components/ClientsTable.vue
index 158d94d..616e49f 100644
--- a/src/pages/clients/components/ClientsTable.vue
+++ b/src/pages/clients/components/ClientsTable.vue
@@ -93,8 +93,10 @@ export default {
   },
   methods: {
     updateDataClient() {
-      if (this.dataClients.length === 1) this.currentTablePage -= 1;
-      else this.fetchDataClients();
+      if (this.dataClients.find(({ id }) => id === this.deletedRowId)) {
+        if (this.dataClients.length === 1) this.currentTablePage -= 1;
+        else this.fetchDataClients();
+      }
     },
     saveDataClients(data) {
       this.dataClients = data.results;
diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue
index 8e09ca9..9398895 100644
--- a/src/pages/clients/components/ClientsTableRow.vue
+++ b/src/pages/clients/components/ClientsTableRow.vue
@@ -189,8 +189,10 @@ export default {
     },
     changeCountdown() {
       if (this.countdown === 0) {
-        this.stopTimer();
-        this.deleteClient().then(() => this.updateDataClient());
+        this.deleteClient().then(() => {
+          this.updateDataClient();
+          this.stopTimer();
+        });
       } else {
         this.countdown -= 1;
       }
@@ -483,9 +485,12 @@ export default {
       photo: this.client.photo,
     };
   },
-  /*beforeUnmount() {
-    this.stopTimer();
-  },*/
+  beforeUnmount() {
+    if (this.timer) {
+      this.deleteClient().then(() => this.updateDataClient());
+      this.stopTimer();
+    }
+  },
 };
 </script>