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

---
 src/components/LoggedInLayout.vue                  |  6 +++++-
 src/pages/clients/TheClients.vue                   |  7 ++++++-
 src/pages/clients/components/ClientsTable.vue      | 14 +++++++++++++-
 src/pages/clients/components/ClientsWrapper.vue    |  7 ++++++-
 .../components/cells/TableCellBodyPhone.vue        |  2 +-
 5 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/components/LoggedInLayout.vue b/src/components/LoggedInLayout.vue
index 29cc8f5..4969178 100644
--- a/src/components/LoggedInLayout.vue
+++ b/src/components/LoggedInLayout.vue
@@ -8,7 +8,11 @@
     )
     .flex.flex-auto
       the-sidebar
-      router-view(:open-form="openForm", :current-year="currentYear")
+      router-view(
+        :open-form="openForm",
+        :is-open-form="isOpenForm",
+        :current-year="currentYear"
+      )
 </template>
 
 <script>
diff --git a/src/pages/clients/TheClients.vue b/src/pages/clients/TheClients.vue
index 314fcea..4b4810f 100644
--- a/src/pages/clients/TheClients.vue
+++ b/src/pages/clients/TheClients.vue
@@ -1,5 +1,9 @@
 <template lang="pug">
-  clients-wrapper(:open-form="openForm", :current-year="currentYear")
+  clients-wrapper(
+    :open-form="openForm",
+    :is-open-form="isOpenForm",
+    :current-year="currentYear"
+  )
 </template>
 
 <script>
@@ -10,6 +14,7 @@ export default {
   props: {
     openForm: Function,
     currentYear: Number,
+    isOpenForm: Boolean,
   },
 };
 </script>
diff --git a/src/pages/clients/components/ClientsTable.vue b/src/pages/clients/components/ClientsTable.vue
index 9d92969..d326564 100644
--- a/src/pages/clients/components/ClientsTable.vue
+++ b/src/pages/clients/components/ClientsTable.vue
@@ -13,7 +13,7 @@
           :client="client",
           :fetch-data-clients="fetchDataClients",
           :current-year="currentYear"
-          )
+        )
 </template>
 
 <script>
@@ -35,6 +35,7 @@ export default {
   props: {
     openForm: Function,
     currentYear: Number,
+    isOpenForm: Boolean,
   },
 
   data() {
@@ -74,6 +75,17 @@ export default {
       }
     },
   },
+  watch: {
+    isOpenForm: {
+      immediate: true,
+      handler(newValue) {
+        if (newValue === false) {
+          console.log("work");
+          this.fetchDataClients();
+        }
+      },
+    },
+  },
   mounted() {
     this.fetchDataClients();
   },
diff --git a/src/pages/clients/components/ClientsWrapper.vue b/src/pages/clients/components/ClientsWrapper.vue
index 98796bb..8ee9cb2 100644
--- a/src/pages/clients/components/ClientsWrapper.vue
+++ b/src/pages/clients/components/ClientsWrapper.vue
@@ -1,6 +1,10 @@
 <template lang="pug">
   .wrapper.flex.w-full.relative.mx-6
-    clients-table(:open-form="openForm", :current-year="currentYear")
+    clients-table(
+      :open-form="openForm",
+      :is-open-form="isOpenForm"
+      :current-year="currentYear"
+    )
 </template>
 
 <script>
@@ -11,6 +15,7 @@ export default {
   props: {
     openForm: Function,
     currentYear: Number,
+    isOpenForm: Boolean,
   },
 };
 </script>
diff --git a/src/pages/clients/components/cells/TableCellBodyPhone.vue b/src/pages/clients/components/cells/TableCellBodyPhone.vue
index 5c5c52c..d103605 100644
--- a/src/pages/clients/components/cells/TableCellBodyPhone.vue
+++ b/src/pages/clients/components/cells/TableCellBodyPhone.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
   .flex.box-border.px-4.items-center.w-full.text-sm(:style="{ minWidth : width + 'px' }")
-    span.text-sm(v-if="!isOpenChange") {{value.phone.username}}
+    span.text-sm(v-if="!isOpenChange") {{value.phone.username.replace(/\+7(\d{3})(\d{3})(\d{2})(\d{2})/, '+7 ($1) $2-$3-$4')}}
     base-input(v-if="isOpenChange" :width-input="154" v-model:value="value.phone.username" :placeholder="value.phone.username")
 </template>