From 0786baee42765617ae090b78310eebac80310e8c Mon Sep 17 00:00:00 2001
From: DwCay <duminalexei@gmail.com>
Date: Thu, 3 Nov 2022 10:35:37 +0300
Subject: [PATCH 1/2] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?=
 =?UTF-8?q?=20=D1=81=D0=B5=D0=BB=D0=B5=D0=BA=D1=82=D1=8B=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?BaseSelect?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base/BaseMenu.vue              |  4 +-
 src/components/base/BaseSelect.vue            |  7 +-
 .../clients/components/ClientsFormCreate.vue  | 70 ++++++++++---------
 src/pages/clients/components/ClientsTable.vue |  6 +-
 .../components/FormCreateBasicInfo.vue        |  6 +-
 .../cells/TableCellBodyPriority.vue           | 14 ++--
 src/pages/clients/utils/tableConfig.js        |  4 ++
 src/shared/fetchWrapper.js                    |  2 +-
 8 files changed, 61 insertions(+), 52 deletions(-)

diff --git a/src/components/base/BaseMenu.vue b/src/components/base/BaseMenu.vue
index f640b90..3a28472 100644
--- a/src/components/base/BaseMenu.vue
+++ b/src/components/base/BaseMenu.vue
@@ -21,12 +21,10 @@ export default {
       return {
         left: this.parentSize.left + "px",
         top: this.parentSize.top + this.parentSize.height + "px",
+        minWidth: this.parentSize.width + "px",
       };
     },
   },
-  mounted() {
-    console.log(this.parentSize);
-  },
 };
 </script>
 
diff --git a/src/components/base/BaseSelect.vue b/src/components/base/BaseSelect.vue
index 1d81021..e48fb6b 100644
--- a/src/components/base/BaseSelect.vue
+++ b/src/components/base/BaseSelect.vue
@@ -3,7 +3,7 @@
     .placeholder.text-base {{ itemsMap[value] || placeholder }}
     span.icon-down-arrow.open-icon(:class="{'open': open }")
     base-menu(v-if="open")
-      .items-container(@click="open = false", @mouseleave="fasdfasd")
+      .items-container(@click="open = false", @mouseleave="leaveSelect")
         .item(v-for="item in items", :key="item.id" @click="clickItem(item.id)") {{ item.label }}
 </template>
 
@@ -49,13 +49,10 @@ export default {
     clickItem(id) {
       this.value = id;
     },
-    fasdfasd() {
+    leaveSelect() {
       this.open = false;
     },
   },
-  mounted() {
-    console.log(this.$.appContext.app._container);
-  },
 };
 </script>
 
diff --git a/src/pages/clients/components/ClientsFormCreate.vue b/src/pages/clients/components/ClientsFormCreate.vue
index 3cc862a..0bb2dd1 100644
--- a/src/pages/clients/components/ClientsFormCreate.vue
+++ b/src/pages/clients/components/ClientsFormCreate.vue
@@ -20,7 +20,7 @@
           :save-client="saveClient"
           :choose-option="chooseOptionNetworks"
           :choose-priority="choosePriority"
-          :priority-list="priorityList"
+          :priority-list="getPriorityList"
           )
       .flex(:style="{display :'none'}" ref="doc")
         form-create-identity-documents(:identity-document="infoClient.identity_document" :save-client="saveClient")
@@ -32,6 +32,7 @@
 
 <script>
 import { column } from "@/pages/clients/utils/tableConfig";
+import { fetchWrapper } from "@/shared/fetchWrapper";
 import FormCreateBasicInfo from "@/pages/clients/components/FormCreateBasicInfo";
 import FormCreateIdentityDocuments from "@/pages/clients/components/FormCreateIdentityDocuments";
 import FormCreateAddresses from "@/pages/clients/components/FormCreateAddresses";
@@ -132,54 +133,55 @@ export default {
           active: false,
         },
       ],
-      priorityOption: "Приоритет",
-      priorityList: ["Высокий", "Средний", "Низкий", "-"],
+      priorityList: [
+        {
+          id: "1",
+          label: "Высокий",
+        },
+        {
+          id: "2",
+          label: "Средний",
+        },
+        {
+          id: "3",
+          label: "Низкий",
+        },
+        {
+          id: "4",
+          label: "-",
+        },
+      ],
     };
   },
+  computed: {
+    getPriorityList() {
+      return this.prioritySettings.settings.map((el) => {
+        return { label: el.text, id: el.id };
+      });
+    },
+  },
   methods: {
     createIdentityDocument(id) {
-      fetch("http://45.84.227.122:8080/general/identity_document/create/", {
-        method: "POST",
-        headers: {
-          Accept: "*/*",
-          "Content-Type": "application/json;charset=utf-8",
-        },
-        body: JSON.stringify({
-          ...this.filterDataEmptyProperty(
-            this.infoClient.identity_document.pass
-          ),
-          person_id: id,
-        }),
+      fetchWrapper.post("general/identity_document/create/", {
+        ...this.filterDataEmptyProperty(this.infoClient.identity_document.pass),
+        person_id: id,
       });
     },
     createAddress(id) {
-      fetch("http://45.84.227.122:8080/general/address/create/", {
-        method: "POST",
-        headers: {
-          Accept: "*/*",
-          "Content-Type": "application/json;charset=utf-8",
-        },
-        body: JSON.stringify({
-          ...this.filterDataEmptyProperty(this.infoClient.addresses),
-          person_id: id,
-        }),
+      fetchWrapper.post("general/address/create/", {
+        ...this.filterDataEmptyProperty(this.infoClient.addresses),
+        person_id: id,
       });
     },
     postNewClient() {
-      fetch("http://45.84.227.122:8080/general/person/create/", {
-        method: "POST",
-        headers: {
-          Accept: "*/*",
-          "Content-Type": "application/json;charset=utf-8",
-        },
-        body: JSON.stringify({
+      fetchWrapper
+        .post("general/person/create/", {
           full_name: this.infoClient.basic.full_name,
           birth_date: this.infoClient.basic.birth_date,
           priority: this.prioritySettings.settings.find(
             (el) => el.text === this.infoClient.basic.priority
           ).priority,
-        }),
-      })
+        })
         .then((res) => res.json())
         .then((result) => {
           this.createIdentityDocument(result.id);
diff --git a/src/pages/clients/components/ClientsTable.vue b/src/pages/clients/components/ClientsTable.vue
index 458578e..b620e7b 100644
--- a/src/pages/clients/components/ClientsTable.vue
+++ b/src/pages/clients/components/ClientsTable.vue
@@ -22,6 +22,7 @@ import ClientsTableHat from "@/pages/clients/components/ClientsTableHat";
 import ClientsTableRow from "@/pages/clients/components/ClientsTableRow";
 import ClientsTableCheckbox from "@/pages/clients/components/ClientsTableCheckbox";
 import ClientsFormCreate from "@/pages/clients/components/ClientsFormCreate";
+import { fetchWrapper } from "@/shared/fetchWrapper";
 export default {
   name: "ClientsTable",
   components: {
@@ -51,8 +52,9 @@ export default {
       this.dataClients = data.results;
     },
     fetchDataClients() {
-      // eslint-disable-next-line
-      fetch("http://45.84.227.122:8080/general/person/").then((res) => res.json()).then((data) => this.saveDataClients(data))
+      fetchWrapper
+        .get("general/person/")
+        .then((data) => this.saveDataClients(data));
     },
     selectedCheck(e) {
       if (e.target.id === "checkbox") {
diff --git a/src/pages/clients/components/FormCreateBasicInfo.vue b/src/pages/clients/components/FormCreateBasicInfo.vue
index ce958f2..73d10b3 100644
--- a/src/pages/clients/components/FormCreateBasicInfo.vue
+++ b/src/pages/clients/components/FormCreateBasicInfo.vue
@@ -3,7 +3,7 @@
     .grid.grid-cols-2.gap-x-4.gap-y-6.px-4
       .flex.flex-col(class="gap-y-1.5")
         span.text-sm Приоритет
-        base-select(:list-data="priorityList" :option-data="basicInfo.priority" placeholder="Приоритет клиента" :for-networks="false" :style-border="true" :choose-option="choosePriority" :size-input="22" disabled)
+        base-select(:items="priorityList" placeholder="Приоритет клиента" v-model="basicInfo.priority")
       .flex.flex-col(class="gap-y-1.5")
         span.text-sm Дата рождения
           span.obligatory *
@@ -30,15 +30,15 @@
 import BaseButton from "@/components/base/BaseButton";
 import BaseInput from "@/components/base/BaseInput";
 import BaseAddingNetwork from "@/components/base/BaseAddingNetwork";
-import BaseSelect from "@/components/base/OldBaseSelect";
 import { column } from "@/pages/clients/utils/tableConfig";
+import BaseSelect from "@/components/base/BaseSelect";
 export default {
   name: "FormCreateBasicInfo",
   components: {
     BaseInput,
     BaseAddingNetwork,
-    BaseSelect,
     BaseButton,
+    BaseSelect,
   },
   props: {
     choosePriority: Function,
diff --git a/src/pages/clients/components/cells/TableCellBodyPriority.vue b/src/pages/clients/components/cells/TableCellBodyPriority.vue
index 2cc7d58..0447747 100644
--- a/src/pages/clients/components/cells/TableCellBodyPriority.vue
+++ b/src/pages/clients/components/cells/TableCellBodyPriority.vue
@@ -4,20 +4,21 @@
       .dot.w-2.h-2(:style="{ backgroundColor : settings.settings.find((el) => el.priority == value).color }")
       span.text-sm(:style="{ color : settings.settings.find((el) => el.priority == value).color }") {{settings.settings.find((el) => el.priority == value).text}}
     .flex.gap-x-2.text-sm
-      base-select(v-if="isOpenChange" :size-input="10" :option-data="getOption" :list-data="selectData" :style-border="true" :choose-option="choosePriority" disabled)
+      old-base-select(v-if="isOpenChange" :size-input="10" :option-data="getOption" :list-data="selectData" :style-border="true" :choose-option="choosePriority" disabled)
+      base-select(v-if="isOpenChange" :items="getPriorityList" v-model="getOption")
 </template>
 
 <script>
 import { column } from "@/pages/clients/utils/tableConfig";
-import BaseSelect from "@/components/base/OldBaseSelect";
+import OldBaseSelect from "@/components/base/OldBaseSelect";
+import BaseSelect from "@/components/base/BaseSelect";
 export default {
   name: "TableCellBodyPriority",
   props: ["value", "width", "isOpenChange", "choosePriority"],
-  components: { BaseSelect },
+  components: { OldBaseSelect, BaseSelect },
   data() {
     return {
       settings: column.find((el) => el.name === "priority"),
-      selectData: ["Высокий", "Средний", "Низкий", "-"],
     };
   },
   computed: {
@@ -25,6 +26,11 @@ export default {
       return this.settings.settings.find((el) => el.priority == this.value)
         .text;
     },
+    getPriorityList() {
+      return this.settings.settings.map((el) => {
+        return { label: el.text, id: el.id };
+      });
+    },
   },
 };
 </script>
diff --git a/src/pages/clients/utils/tableConfig.js b/src/pages/clients/utils/tableConfig.js
index 403a8f6..564a0cd 100644
--- a/src/pages/clients/utils/tableConfig.js
+++ b/src/pages/clients/utils/tableConfig.js
@@ -22,21 +22,25 @@ export const column = [
     settings: [
       {
         priority: 1,
+        id: "1",
         text: "Высокий",
         color: "#FF6F6F",
       },
       {
         priority: 2,
+        id: "2",
         text: "Средний",
         color: "#FFC75B",
       },
       {
         priority: 3,
+        id: "3",
         text: "Низкий",
         color: "#81ACFF",
       },
       {
         priority: null,
+        id: "4",
         text: "-",
         color: "#9294A7",
       },
diff --git a/src/shared/fetchWrapper.js b/src/shared/fetchWrapper.js
index 492d87c..8480646 100644
--- a/src/shared/fetchWrapper.js
+++ b/src/shared/fetchWrapper.js
@@ -62,7 +62,7 @@ function del(url, headers, attempts = 3) {
   return handleRequest("DELETE", url, headers, attempts, null);
 }
 
-function post(url, headers, body, attempts = 3) {
+function post(url, body, headers, attempts = 3) {
   return handleRequest("POST", url, headers, attempts, null, body);
 }
 

From 2a65bbdb2ab3b855fd8651f0e955b6ee37c6480a Mon Sep 17 00:00:00 2001
From: DwCay <duminalexei@gmail.com>
Date: Thu, 3 Nov 2022 20:03:21 +0300
Subject: [PATCH 2/2] =?UTF-8?q?WIP=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=B4=D1=80=D0=B5=D1=81=D0=B0,=20=D0=B4=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B1=D0=BB=D0=BE=D0=BA=20=D0=B4?=
 =?UTF-8?q?=D0=B5=D1=82=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B9=20=D0=B8=D0=BD?=
 =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D0=B8=20=D0=94=D0=BE?=
 =?UTF-8?q?=D0=BA=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                             | 14 +++
 package.json                                  |  1 +
 src/components/TheHeader.vue                  | 21 ++++-
 .../base/BaseClientFormCreate.vue}            | 32 ++++---
 src/components/base/BaseSelect.vue            | 13 +--
 src/main.js                                   |  3 +-
 .../components/ClientDetailInfoSection.vue    | 13 ++-
 .../components/ClientDetailInfoWrapper.vue    |  5 +-
 src/pages/clients/components/ClientsTable.vue |  6 +-
 .../clients/components/ClientsTableRow.vue    | 91 +++++++------------
 .../clients/components/ClientsWrapper.vue     |  3 +-
 .../components/FormCreateAddresses.vue        |  2 +-
 .../components/FormCreateBasicInfo.vue        |  2 +-
 .../cells/TableCellBodyPriority.vue           | 16 +---
 src/pages/clients/utils/tableConfig.js        |  2 +-
 src/pages/login/TheLogin.vue                  |  3 +-
 src/shared/fetchWrapper.js                    |  4 +-
 17 files changed, 115 insertions(+), 116 deletions(-)
 rename src/{pages/clients/components/ClientsFormCreate.vue => components/base/BaseClientFormCreate.vue} (91%)

diff --git a/package-lock.json b/package-lock.json
index e2f7028..7d45ca1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
       "version": "0.1.0",
       "dependencies": {
         "moment": "^2.29.4",
+        "v-click-outside": "^3.2.0",
         "vue": "^3.2.13",
         "vue-router": "^4.1.5",
         "vuex": "^4.0.2"
@@ -13201,6 +13202,14 @@
         "uuid": "dist/bin/uuid"
       }
     },
+    "node_modules/v-click-outside": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/v-click-outside/-/v-click-outside-3.2.0.tgz",
+      "integrity": "sha512-QD0bDy38SHJXQBjgnllmkI/rbdiwmq9RC+/+pvrFjYJKTn8dtp7Penf9q1lLBta280fYG2q53mgLhQ+3l3z74w==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/validate-npm-package-license": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
@@ -24242,6 +24251,11 @@
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
       "dev": true
     },
+    "v-click-outside": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/v-click-outside/-/v-click-outside-3.2.0.tgz",
+      "integrity": "sha512-QD0bDy38SHJXQBjgnllmkI/rbdiwmq9RC+/+pvrFjYJKTn8dtp7Penf9q1lLBta280fYG2q53mgLhQ+3l3z74w=="
+    },
     "validate-npm-package-license": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
diff --git a/package.json b/package.json
index 821fc0e..660e599 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
   },
   "dependencies": {
     "moment": "^2.29.4",
+    "v-click-outside": "^3.2.0",
     "vue": "^3.2.13",
     "vue-router": "^4.1.5",
     "vuex": "^4.0.2"
diff --git a/src/components/TheHeader.vue b/src/components/TheHeader.vue
index 965596c..175556f 100644
--- a/src/components/TheHeader.vue
+++ b/src/components/TheHeader.vue
@@ -1,12 +1,20 @@
 <template lang="pug">
-  .header-wrapper.flex.justify-center.box-border.py-2.pl-4_75px.pr-6
+  .header-wrapper.relative.flex.justify-center.box-border.py-2.pl-4_75px.pr-6
+    base-client-form-create.right-6(v-if="isOpenCreate", @blure="isOpenCreate=false", :close-form="closeFormCreate")
     .flex.items-center.box-border.cursor-pointer.mr-auto
       img.logo-img.mr-29_25px(src="@/assets/images/logo.svg", alt="Logo")
       header-inputs
     //- .charge-person-container
     //-   header-active-client-panel(:info="chargePersonInfo")
     .flex.ml-auto
-      base-button.mr-9(left-icon="icon-plus", :icon-left-size="10", :size="40", right-icon="icon-person", :icon-right-size="18")
+      base-button.mr-9(
+        left-icon="icon-plus",
+        :icon-left-size="10",
+        :size="40",
+        right-icon="icon-person",
+        :icon-right-size="18",
+        @click="isOpenCreate=true"
+        )
       button.header-buttons.flex.justify-center.items-center.mr-8.p-0
         .icon-bell.text-xxl
       .flex.justify-centflexer.items-center
@@ -22,9 +30,10 @@ import chargePersonAvatar from "@/assets/images/charge-person-avatar.svg";
 import HeaderInputs from "./HeaderInputs.vue";
 import BaseAvatar from "@/components/base/BaseAvatar";
 import BaseButton from "@/components/base/BaseButton.vue";
+import BaseClientFormCreate from "@/components/base/BaseClientFormCreate";
 export default {
   name: "TheHeader",
-  components: { HeaderInputs, BaseAvatar, BaseButton },
+  components: { HeaderInputs, BaseAvatar, BaseButton, BaseClientFormCreate },
   data() {
     return {
       avatarSrc: img,
@@ -32,8 +41,14 @@ export default {
         avatarSrc: chargePersonAvatar,
         name: "Гордеев Николай Степанович",
       },
+      isOpenCreate: false,
     };
   },
+  methods: {
+    closeFormCreate() {
+      this.isOpenCreate = false;
+    },
+  },
 };
 </script>
 
diff --git a/src/pages/clients/components/ClientsFormCreate.vue b/src/components/base/BaseClientFormCreate.vue
similarity index 91%
rename from src/pages/clients/components/ClientsFormCreate.vue
rename to src/components/base/BaseClientFormCreate.vue
index 0bb2dd1..2e5af3c 100644
--- a/src/pages/clients/components/ClientsFormCreate.vue
+++ b/src/components/base/BaseClientFormCreate.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  .wrapper-create.flex.flex-col.absolute.top-28.right-0.px-4.py-7.gap-y-8
+  .wrapper-create.flex.flex-col.absolute.top-28.px-4.py-7.gap-y-8
     .icon-cancel.close.absolute.top-5.right-5.cursor-pointer(@click="closeForm")
     span.title.text-xl.font-bold.px-4 Создание клиента
     .flex.gap-x-4.h-fit.px-4
@@ -41,7 +41,7 @@ import BaseInput from "@/components/base/BaseInput";
 import BaseSelect from "@/components/base/OldBaseSelect";
 import BaseButton from "@/components/base/BaseButton";
 export default {
-  name: "ClientsFormCreate",
+  name: "BaseClientFormClient",
   components: {
     BaseInput,
     BaseSelect,
@@ -83,7 +83,6 @@ export default {
         },
         identity_document: {
           pass: {
-            kind: "Паспорт",
             series_number: "",
             issued_by_org: "",
             issued_by_date: "",
@@ -105,7 +104,7 @@ export default {
           street: "",
           house_number: "",
           apartment_number: "",
-          index_of_address: "",
+          zip_code: "",
         },
         additional: [
           {
@@ -162,16 +161,24 @@ export default {
   },
   methods: {
     createIdentityDocument(id) {
-      fetchWrapper.post("general/identity_document/create/", {
-        ...this.filterDataEmptyProperty(this.infoClient.identity_document.pass),
-        person_id: id,
-      });
+      Object.keys(
+        this.filterDataEmptyProperty(this.infoClient.identity_document.pass)
+      ).length > 0 &&
+        fetchWrapper.post("general/identity_document/create/", {
+          ...this.filterDataEmptyProperty(
+            this.infoClient.identity_document.pass
+          ),
+          person_id: id,
+          kind: "Паспорт",
+        });
     },
     createAddress(id) {
-      fetchWrapper.post("general/address/create/", {
-        ...this.filterDataEmptyProperty(this.infoClient.addresses),
-        person_id: id,
-      });
+      Object.keys(this.filterDataEmptyProperty(this.infoClient.addresses))
+        .length > 0 &&
+        fetchWrapper.post("general/address/create/", {
+          ...this.filterDataEmptyProperty(this.infoClient.addresses),
+          person_id: id,
+        });
     },
     postNewClient() {
       fetchWrapper
@@ -182,7 +189,6 @@ export default {
             (el) => el.text === this.infoClient.basic.priority
           ).priority,
         })
-        .then((res) => res.json())
         .then((result) => {
           this.createIdentityDocument(result.id);
           this.createAddress(result.id);
diff --git a/src/components/base/BaseSelect.vue b/src/components/base/BaseSelect.vue
index e48fb6b..770ea90 100644
--- a/src/components/base/BaseSelect.vue
+++ b/src/components/base/BaseSelect.vue
@@ -1,10 +1,10 @@
 <template lang="pug">
   .base-select(@click="open = !open", :class="{'open': open }")
-    .placeholder.text-base {{ itemsMap[value] || placeholder }}
+    .placeholder.text-base {{ value || placeholder }}
     span.icon-down-arrow.open-icon(:class="{'open': open }")
     base-menu(v-if="open")
       .items-container(@click="open = false", @mouseleave="leaveSelect")
-        .item(v-for="item in items", :key="item.id" @click="clickItem(item.id)") {{ item.label }}
+        .item(v-for="item in items", :key="item.id" @click="clickItem(item.label)") {{ item.label }}
 </template>
 
 <script>
@@ -35,15 +35,6 @@ export default {
         this.$emit("update:modelValue", value);
       },
     },
-    itemsMap() {
-      return this.items.reduce(
-        (acc, item) => ({
-          ...acc,
-          [item.id]: item.label,
-        }),
-        {}
-      );
-    },
   },
   methods: {
     clickItem(id) {
diff --git a/src/main.js b/src/main.js
index 9e70808..3fd7fa9 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,6 +2,7 @@ import { createApp } from "vue";
 import App from "./App.vue";
 import router from "./router";
 import moment from "moment";
+import vClickOutside from "v-click-outside";
 import "./assets/sass/fonts.sass";
 import "./assets/sass/tailwind.sass";
 import "./assets/sass/variables.sass";
@@ -14,4 +15,4 @@ if (process.env.NODE_ENV === "development") {
 
 moment.locale("ru");
 
-createApp(App).use(router, moment).mount("#app");
+createApp(App).use(router, vClickOutside, moment).mount("#app");
diff --git a/src/pages/clients/components/ClientDetailInfoSection.vue b/src/pages/clients/components/ClientDetailInfoSection.vue
index 9adcb72..a7c78cf 100644
--- a/src/pages/clients/components/ClientDetailInfoSection.vue
+++ b/src/pages/clients/components/ClientDetailInfoSection.vue
@@ -15,17 +15,16 @@
       .flex.flex-col(v-for="(item, key) in sectionInfo" class="gap-y-1.5")
         span.title-section.font-semibold.text-xs(v-if="settings[section].options") {{settings[section].options[key]}}
         span.title-section.font-semibold.text-xs(v-if="item.header") {{item.header}}
-        client-detail-input.text-sm.text-sm.w-max-fit(v-if="isChange" :style="{fontWeight:key === 'numba'&&600}" v-model:value="sectionInfo[key]" :width="settings[section].width")
+        client-detail-input.text-sm.text-sm.w-max-fit(v-if="section!=='docs' && isChange" :style="{fontWeight:key === 'numba'&&600}" v-model:value="sectionInfo[key]" :width="settings[section].width")
           .copy.icon-copy.cursor-pointer(v-if="item.copy" @click="() => copyValue(item)")
         .flex(v-if="settings[section].options && !isChange")
           span.text-sm.w-fit(:style="{fontWeight:key === 'numba'&&600}") {{item}}
           .copy.icon-copy.cursor-pointer.pl-4(v-if="key === 'numba'" @click="() => copyValue(item)")
-        .flex(v-if="item.value && !isChange")
-          span.text-sm.w-fit {{item.value}}
-        .flex.items-center(v-if="item.name")
-          .icon-cancel.cancel.cursor-pointer.pr-3.text-xsm(v-if="isChange" :id="item.name" @click="(e) => deleteDoc(e, section)")
-          .icon-files.cursor-pointer.pr-3.text-xl(:style="{color:settings.docsColor[item.type]}")
-          span.text-sm {{item.name}}
+        .flex(v-if="item.name && !isChange")
+          span.text-sm.w-fit {{item.title}}
+        .flex.items-center(v-if="item.title")
+          .icon-cancel.cancel.cursor-pointer.pr-3.text-xsm(v-if="isChange" :id="item.id" @click="(e) => deleteDoc(e)")
+          span.text-sm {{item.title}}
 </template>
 
 <script>
diff --git a/src/pages/clients/components/ClientDetailInfoWrapper.vue b/src/pages/clients/components/ClientDetailInfoWrapper.vue
index 18cde69..479fffe 100644
--- a/src/pages/clients/components/ClientDetailInfoWrapper.vue
+++ b/src/pages/clients/components/ClientDetailInfoWrapper.vue
@@ -1,8 +1,10 @@
 <template lang="pug">
   .w-full.h-fit.pt-4.flex.gap-x-4(class="px-[52px] pb-[30px]")
     client-detail-info-section(v-model:section-info="dataDocument" section="pass")
-    .flex.flex-col.gap-y-2
+    .flex.flex-col
       client-detail-info-section(:section-info="dataAddress" section="addresses")
+    .flex.flex-col
+      client-detail-info-section(:section-info="dataAttachments" section="docs" :save-new-doc="saveNewDoc" :delete-doc="deleteDoc")
 </template>
 
 <script>
@@ -13,6 +15,7 @@ export default {
   props: {
     dataDetail: Object,
     dataAddress: Object,
+    dataAttachments: Array,
     saveNewDoc: Function,
     deleteDoc: Function,
     dataDocument: Object,
diff --git a/src/pages/clients/components/ClientsTable.vue b/src/pages/clients/components/ClientsTable.vue
index b620e7b..92ceeb9 100644
--- a/src/pages/clients/components/ClientsTable.vue
+++ b/src/pages/clients/components/ClientsTable.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
   .wrapper-table.relative.flex.flex-col.gap-y-8.px-6.py-6.h-full.w-full
-    clients-form-create(v-if="isOpenFormCreate" :close-form="closeFormCreateClient")
+    base-client-form-create.right-0(v-if="isOpenFormCreate" :close-form="closeFormCreateClient")
     clients-table-hat(:is-open-actions="marked.length" :open-form-create="openFormCreateClient")
     .flex.flex-col.h-full.gap-y-2.table-container
       clients-table-header(:check="selectedCheck" :is-check="selectAll")
@@ -21,8 +21,8 @@ import ClientsTableHeader from "@/pages/clients/components/ClientsTableHeader";
 import ClientsTableHat from "@/pages/clients/components/ClientsTableHat";
 import ClientsTableRow from "@/pages/clients/components/ClientsTableRow";
 import ClientsTableCheckbox from "@/pages/clients/components/ClientsTableCheckbox";
-import ClientsFormCreate from "@/pages/clients/components/ClientsFormCreate";
 import { fetchWrapper } from "@/shared/fetchWrapper";
+import BaseClientFormCreate from "@/components/base/BaseClientFormCreate";
 export default {
   name: "ClientsTable",
   components: {
@@ -30,7 +30,7 @@ export default {
     ClientsTableRow,
     ClientsTableHat,
     ClientsTableHeader,
-    ClientsFormCreate,
+    BaseClientFormCreate,
   },
   data() {
     return {
diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue
index 5260f6f..f4093f2 100644
--- a/src/pages/clients/components/ClientsTableRow.vue
+++ b/src/pages/clients/components/ClientsTableRow.vue
@@ -14,7 +14,7 @@
           .icon-ok.text-xsm(class="pt-[3px]")
         .relative.dots-button.icon-dots.cursor-pointer.leading-6.text-center(v-show="!isOpenChange" :tabindex="1" @click="(e) => openPopup(e)" @blur="handleUnFocusPopup")
           clients-action-popup(v-if="isOpenPopup" :open-change-data="openChangeData")
-    client-detail-info-wrapper(v-if="isOpenDetailInfo" :data-address="dataAddress" :data-detail="dataDetail" :data-document="dataIdentityDocument" :save-new-doc="saveNewDoc" :delete-doc="deleteDoc")
+    client-detail-info-wrapper(v-if="isOpenDetailInfo" :data-address="dataAddress" :data-detail="dataDetail" :data-attachments="dataAttachments" :data-document="dataIdentityDocument" :save-new-doc="saveNewDoc" :delete-doc="deleteDoc")
 </template>
 
 <script>
@@ -30,6 +30,7 @@ import ClientsActionPopup from "@/pages/clients/components/ClientsActionPopup";
 import ClientsTableCheckbox from "@/pages/clients/components/ClientsTableCheckbox";
 import ClientDetailInfoWrapper from "@/pages/clients/components/ClientDetailInfoWrapper";
 import BaseButton from "@/components/base/BaseButton";
+import { fetchWrapper } from "@/shared/fetchWrapper";
 import { column } from "@/pages/clients/utils/tableConfig";
 export default {
   name: "ClientsTableRow",
@@ -51,10 +52,12 @@ export default {
     return {
       dataIdentityDocument: {},
       dataAddress: {},
+      dataAttachments: [],
       dataDetail: {},
       isOpenDetailInfo: false,
       isOpenPopup: false,
       columnBody: column,
+      prioritySettings: column.find((el) => el.name === "priority"),
       isOpenChange: false,
       dataClient: {},
     };
@@ -73,7 +76,9 @@ export default {
         this.client.first_name || ""
       } ${this.client.patronymic || ""}`,
       age: this.client.birth_date || "",
-      priority: this.client.priority,
+      priority: this.prioritySettings.settings.find(
+        (el) => el.priority === this.client.priority
+      ).text,
       phone: {
         id: this.client.contacts.find((el) => el.kind === "PHONE")?.id || "",
         kind: "PHONE",
@@ -95,21 +100,11 @@ export default {
   },
   methods: {
     postUpdateClient() {
-      fetch(
-        `http://45.84.227.122:8080/general/person/${this.client.id}/update/`,
-        {
-          method: "POST",
-          headers: {
-            Accept: "*/*",
-            "Content-Type": "application/json;charset=utf-8",
-          },
-          body: JSON.stringify({
-            full_name: this.dataClient.fullName,
-            birth_date: this.dataClient.age,
-            priority: this.dataClient.priority,
-          }),
-        }
-      );
+      fetchWrapper.post(`general/person/${this.client.id}/update/`, {
+        full_name: this.dataClient.fullName,
+        birth_date: this.dataClient.age,
+        priority: this.dataClient.priority,
+      });
     },
     postContactsClient() {
       let contacts = [...this.dataClient.contacts];
@@ -154,37 +149,21 @@ export default {
     },
 
     postCreateContact(contact) {
-      fetch("http://45.84.227.122:8080/general/contact/create/", {
-        method: "POST",
-        headers: {
-          Accept: "*/*",
-          "Content-Type": "application/json;charset=utf-8",
-        },
-        body: JSON.stringify({
-          kind: contact.kind,
-          username: contact.username,
-          person_id: this.client.id,
-        }),
+      fetchWrapper.post("general/contact/create/", {
+        kind: contact.kind,
+        username: contact.username,
+        person_id: this.client.id,
       });
     },
     postUpdateContact(contact) {
-      fetch(`http://45.84.227.122:8080/general/contact/${contact.id}/update/`, {
-        method: "POST",
-        headers: {
-          Accept: "*/*",
-          "Content-Type": "application/json;charset=utf-8",
-        },
-        body: JSON.stringify({
-          kind: contact.kind,
-          username: contact.username,
-          person_id: this.client.id,
-        }),
+      fetchWrapper.post(`general/contact/${contact.id}/update/`, {
+        kind: contact.kind,
+        username: contact.username,
+        person_id: this.client.id,
       });
     },
     postDeleteContact(contact) {
-      fetch(`http://45.84.227.122:8080/general/contact/${contact.id}/delete/`, {
-        method: "DELETE",
-      });
+      fetchWrapper.del(`general/contact/${contact.id}/delete/`);
     },
     addNetwork(network) {
       this.dataClient.contacts.push(network);
@@ -208,14 +187,16 @@ export default {
       this.isOpenChange = true;
     },
     fetchClientDetail(id) {
-      // eslint-disable-next-line
-      fetch(`http://45.84.227.122:8080/general/person/${id}/detail`).then((res) => res.json()).then((data) => this.saveClientDetail(data))
+      fetchWrapper
+        .get(`general/person/${id}/detail/`)
+        .then((data) => this.saveClientDetail(data));
     },
     saveClientDetail(data) {
       this.saveIdentityDocument(
         data.identity_documents.find((el) => el.kind === "Паспорт")
       );
       this.saveAddress(data.address[0]);
+      this.saveAttachments([...data.attachments]);
     },
     saveIdentityDocument(data) {
       this.dataIdentityDocument = {
@@ -227,9 +208,12 @@ export default {
     },
     saveAddress(data) {
       this.dataAddress = {
-        join_address: data?.join_address || "-",
+        join_adress: data?.join_adress || "-",
       };
     },
+    saveAttachments(data) {
+      this.dataAttachments = [...data];
+    },
     openPopup(e) {
       e.target.focus();
       this.isOpenPopup = !this.isOpenPopup;
@@ -241,19 +225,12 @@ export default {
     handleUnFocusPopup() {
       this.isOpenPopup = false;
     },
-    saveNewDoc(section, data) {
-      this.dataDetail[section] = [...this.dataDetail[section], ...data];
+    saveNewDoc(data) {
+      this.dataAttachments = [...this.dataDetail, ...data];
     },
-    deleteDoc(e, section) {
-      if (section === "additional") {
-        this.dataDetail[section].forEach((el, index) => {
-          if (el.name === e.target.id) {
-            delete this.dataDetail[section][index].name;
-          }
-        });
-      }
-      this.dataDetail[section] = this.dataDetail[section].filter(
-        (el) => el.name !== e.target.id
+    deleteDoc(e) {
+      this.dataAttachments = this.dataAttachments.filter(
+        (el) => el.id !== e.target.id
       );
     },
   },
diff --git a/src/pages/clients/components/ClientsWrapper.vue b/src/pages/clients/components/ClientsWrapper.vue
index ba82da8..c0114d1 100644
--- a/src/pages/clients/components/ClientsWrapper.vue
+++ b/src/pages/clients/components/ClientsWrapper.vue
@@ -4,11 +4,10 @@
 </template>
 
 <script>
-import ClientsFormCreate from "@/pages/clients/components/ClientsFormCreate";
 import ClientsTable from "@/pages/clients/components/ClientsTable";
 export default {
   name: "ClientsWrapper",
-  components: { ClientsTable, ClientsFormCreate },
+  components: { ClientsTable },
   data() {
     return {
       isOpenForm: false,
diff --git a/src/pages/clients/components/FormCreateAddresses.vue b/src/pages/clients/components/FormCreateAddresses.vue
index ffbd761..1806469 100644
--- a/src/pages/clients/components/FormCreateAddresses.vue
+++ b/src/pages/clients/components/FormCreateAddresses.vue
@@ -25,7 +25,7 @@
           base-input.input-info(v-model:value="addresses.apartment_number" placeholder="Номер квартиры")
         .flex.flex-col(class="gap-y-1.5")
           span.text-sm.font-semibold Индекс
-          base-input.input-info(v-model:value="addresses.index_of_address" placeholder="000000")
+          base-input.input-info(v-model:value="addresses.zip_code" placeholder="000000")
     .px-4
       base-button(@click="saveClient" :size="40")
         span.font-semibold Создать клиента
diff --git a/src/pages/clients/components/FormCreateBasicInfo.vue b/src/pages/clients/components/FormCreateBasicInfo.vue
index 73d10b3..2f7e719 100644
--- a/src/pages/clients/components/FormCreateBasicInfo.vue
+++ b/src/pages/clients/components/FormCreateBasicInfo.vue
@@ -3,7 +3,7 @@
     .grid.grid-cols-2.gap-x-4.gap-y-6.px-4
       .flex.flex-col(class="gap-y-1.5")
         span.text-sm Приоритет
-        base-select(:items="priorityList" placeholder="Приоритет клиента" v-model="basicInfo.priority")
+        base-select(:items="priorityList", placeholder="Приоритет клиента", v-model="basicInfo.priority")
       .flex.flex-col(class="gap-y-1.5")
         span.text-sm Дата рождения
           span.obligatory *
diff --git a/src/pages/clients/components/cells/TableCellBodyPriority.vue b/src/pages/clients/components/cells/TableCellBodyPriority.vue
index 0447747..6c0f4ce 100644
--- a/src/pages/clients/components/cells/TableCellBodyPriority.vue
+++ b/src/pages/clients/components/cells/TableCellBodyPriority.vue
@@ -1,31 +1,25 @@
 <template lang="pug">
   .flex.box-border.px-4.items-center.w-full.gap-x-2(:style="{ minWidth : width + 'px' }")
     .flex.gap-x-2.items-center(v-if="!isOpenChange")
-      .dot.w-2.h-2(:style="{ backgroundColor : settings.settings.find((el) => el.priority == value).color }")
-      span.text-sm(:style="{ color : settings.settings.find((el) => el.priority == value).color }") {{settings.settings.find((el) => el.priority == value).text}}
-    .flex.gap-x-2.text-sm
-      old-base-select(v-if="isOpenChange" :size-input="10" :option-data="getOption" :list-data="selectData" :style-border="true" :choose-option="choosePriority" disabled)
-      base-select(v-if="isOpenChange" :items="getPriorityList" v-model="getOption")
+      .dot.w-2.h-2(:style="{ backgroundColor : settings.settings.find((el) => el.text == value).color }")
+      span.text-sm(:style="{ color : settings.settings.find((el) => el.text == value).color }") {{value}}
+    .flex.gap-x-2.text-sm(class="w-[164px]")
+      base-select(v-if="isOpenChange", :items="getPriorityList", v-model="value")
 </template>
 
 <script>
 import { column } from "@/pages/clients/utils/tableConfig";
-import OldBaseSelect from "@/components/base/OldBaseSelect";
 import BaseSelect from "@/components/base/BaseSelect";
 export default {
   name: "TableCellBodyPriority",
   props: ["value", "width", "isOpenChange", "choosePriority"],
-  components: { OldBaseSelect, BaseSelect },
+  components: { BaseSelect },
   data() {
     return {
       settings: column.find((el) => el.name === "priority"),
     };
   },
   computed: {
-    getOption() {
-      return this.settings.settings.find((el) => el.priority == this.value)
-        .text;
-    },
     getPriorityList() {
       return this.settings.settings.map((el) => {
         return { label: el.text, id: el.id };
diff --git a/src/pages/clients/utils/tableConfig.js b/src/pages/clients/utils/tableConfig.js
index 564a0cd..d370921 100644
--- a/src/pages/clients/utils/tableConfig.js
+++ b/src/pages/clients/utils/tableConfig.js
@@ -137,7 +137,7 @@ export const detail = {
   addresses: {
     title: "Адреса",
     options: {
-      join_address: "Полный адрес",
+      join_adress: "Полный адрес",
     },
     width: 292,
   },
diff --git a/src/pages/login/TheLogin.vue b/src/pages/login/TheLogin.vue
index 2114bc5..29e854d 100644
--- a/src/pages/login/TheLogin.vue
+++ b/src/pages/login/TheLogin.vue
@@ -20,7 +20,7 @@
             input.w-4.h-4.checkbox.cursor-pointer(@click="persist", type="checkbox")
             .flex.non-italic.font-medium.base Запомнить меня
         base-button.font-semibold(:disabled="disabledButton", :size="48", @click="login") Войти в аккаунт
-      .absolute.left-12.bottom-12 2022 © Астра 
+      .absolute.left-12.bottom-12 2022 © Астра
     .right-col.flex.items-center.justify-center.relative
       img.absolute.z-10(src="@/assets/images/bigLogo.svg" alt="bigLogo")
       img.absolute.z-10.absolute.left-0.bottom-0(src="@/assets/images/ellipseBottom.svg" alt="ellipseBottom")
@@ -74,7 +74,6 @@ export default {
         .then((result) => result.json())
         .then((token) => {
           localStorage.setItem("tokenAccess", token.access);
-          token.cookie("tokenRefresh", token.refresh, { httpOnly: true });
         });
     },
   },
diff --git a/src/shared/fetchWrapper.js b/src/shared/fetchWrapper.js
index 8480646..f3896ec 100644
--- a/src/shared/fetchWrapper.js
+++ b/src/shared/fetchWrapper.js
@@ -1,6 +1,6 @@
 function prepareUrl(url) {
   if (url.startsWith("http")) return url;
-  return `http://45.84.227.122:8080/${url}`;
+  return `http://45.84.227.122:8080/api/${url}`;
 }
 
 function handleRequest(method, url, headers, attempts, body) {
@@ -63,7 +63,7 @@ function del(url, headers, attempts = 3) {
 }
 
 function post(url, body, headers, attempts = 3) {
-  return handleRequest("POST", url, headers, attempts, null, body);
+  return handleRequest("POST", url, headers, attempts, body);
 }
 
 function put(url, headers, body, attempts = 3) {