Merge pull request #134 from dderbentsov/UC-62

Добавил одно окно создания клиента и исправил баг с выбором города

src/components/LoggedInLayout.vue

@@ -1,9 +1,9 @@
 <template lang="pug">
 .flex.flex-col.w-full.h-full.gap-y-2
-    the-header
+    the-header(:is-open-form="isOpenForm", :close-form="closeForm", :open-form="openForm")
     .flex.flex-auto
       the-sidebar
-      router-view
+      router-view(:open-form="openForm")
 </template>
 
 <script>
@@ -13,5 +13,18 @@ import TheSidebar from "@/components/TheSidebar";
 export default {
   name: "LoggedInLayout",
   components: { TheHeader, TheSidebar },
+  data() {
+    return {
+      isOpenForm: false,
+    };
+  },
+  methods: {
+    openForm() {
+      this.isOpenForm = true;
+    },
+    closeForm() {
+      this.isOpenForm = false;
+    },
+  },
 };
 </script>

src/components/TheHeader.vue

@@ -1,6 +1,6 @@
 <template lang="pug">
   .header-wrapper.relative.flex.justify-center.box-border.py-2.pl-4_75px.pr-6
-    base-client-form-create(v-if="isOpenCreate", @blure="isOpenCreate=false", :close-form="closeFormCreate")
+    base-client-form-create(v-if="isOpenForm", :close-form="closeForm")
     .flex.items-center.box-border.cursor-pointer.mr-auto
       img.logo-img.mr-29_25px(src="@/assets/images/logo.svg", alt="Logo")
       header-inputs
@@ -13,7 +13,7 @@
         :size="40",
         right-icon="icon-person",
         :icon-right-size="18",
-        @click="isOpenCreate=true"
+        @click="openForm"
       )
       button.header-buttons.flex.justify-center.items-center.mr-8.p-0(@click="logout")
         .icon-bell.text-xxl
@@ -34,6 +34,11 @@ import BaseClientFormCreate from "@/components/base/BaseClientFormCreate";
 export default {
   name: "TheHeader",
   components: { HeaderInputs, BaseAvatar, BaseButton, BaseClientFormCreate },
+  props: {
+    openForm: Function,
+    closeForm: Function,
+    isOpenForm: Boolean,
+  },
   data() {
     return {
       avatarSrc: img,
@@ -41,13 +46,9 @@ export default {
         avatarSrc: chargePersonAvatar,
         name: "Гордеев Николай Степанович",
       },
-      isOpenCreate: false,
     };
   },
   methods: {
-    closeFormCreate() {
-      this.isOpenCreate = false;
-    },
     logout() {
       localStorage.clear();
       this.$router.push("/login");

src/components/base/BaseClientFormCreate.vue

@@ -20,7 +20,7 @@
           :save-client="saveClient"
           :choose-option="chooseOptionNetworks"
           :choose-priority="choosePriority"
-          :priority-list="getPriorityList"
+          :priority-list="priorityList"
           :current-year="currentYear"
           )
       .flex(:style="{display :'none'}" ref="doc")
@@ -75,7 +75,10 @@ export default {
         basic: {
           full_name: "",
           birth_date: "",
-          priority: "",
+          priority: {
+            id: null,
+            label: "",
+          },
           contacts: [
             {
               id: "network",
@@ -146,19 +149,19 @@ export default {
       ],
       priorityList: [
         {
-          id: "1",
+          id: 1,
           label: "Высокий",
         },
         {
-          id: "2",
+          id: 2,
           label: "Средний",
         },
         {
-          id: "3",
+          id: 3,
           label: "Низкий",
         },
         {
-          id: "4",
+          id: 4,
           label: "-",
         },
       ],

src/pages/clients/TheClients.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-  clients-wrapper
+  clients-wrapper(:open-form="openForm")
 </template>
 
 <script>
@@ -7,5 +7,8 @@ import ClientsWrapper from "@/pages/clients/components/ClientsWrapper";
 export default {
   name: "TheClients",
   components: { ClientsWrapper },
+  props: {
+    openForm: Function,
+  },
 };
 </script>

src/pages/clients/components/ClientsTable.vue

@@ -1,7 +1,6 @@
 <template lang="pug">
   .wrapper-table.relative.flex.flex-col.gap-y-8.px-6.py-6.h-full.w-full
-    base-client-form-create(v-if="isOpenFormCreate" :close-form="closeFormCreateClient")
+    clients-table-hat(:is-open-actions="marked.length" :open-form="openForm")
-    clients-table-hat(:is-open-actions="marked.length" :open-form-create="openFormCreateClient")
     .flex.flex-col.h-full.gap-y-2.table-container.w-full
       clients-table-header(:check="selectedCheck" :is-check="selectAll")
       .flex.flex-col
@@ -32,6 +31,10 @@ export default {
     ClientsTableHeader,
     BaseClientFormCreate,
   },
+  props: {
+    openForm: Function,
+  },
+
   data() {
     return {
       isOpenFormCreate: false,
@@ -41,13 +44,6 @@ export default {
     };
   },
   methods: {
-    openFormCreateClient() {
-      this.isOpenFormCreate = true;
-    },
-    closeFormCreateClient() {
-      this.isOpenFormCreate = false;
-      this.fetchDataClients();
-    },
     saveDataClients(data) {
       this.dataClients = data.results;
     },

src/pages/clients/components/ClientsTableHat.vue

@@ -9,7 +9,7 @@
     clients-table-header-actions(v-if="!!isOpenActions" :is-selected-one="isOpenActions===1")
     .flex.w-fit.h-fit.gap-x-2
       base-button(left-icon="icon-download" :icon-left-size="16" :size="40" :outlined="true")
-      base-button(left-icon="icon-plus" :icon-left-size="13" :size="40" @click="openFormCreate")
+      base-button(left-icon="icon-plus" :icon-left-size="13" :size="40" @click="openForm")
         span.font-semibold Создать
 </template>
 
@@ -25,7 +25,7 @@ export default {
     BaseButton,
   },
   props: {
-    openFormCreate: Function,
+    openForm: Function,
     isOpenActions: Number,
   },
 };

src/pages/clients/components/ClientsWrapper.vue

@@ -1,6 +1,6 @@
 <template lang="pug">
   .wrapper.flex.w-full.relative.mx-6
-    clients-table(:open-form-create="openFormCreateClient")
+    clients-table(:open-form="openForm")
 </template>
 
 <script>
@@ -8,18 +8,8 @@ import ClientsTable from "@/pages/clients/components/ClientsTable";
 export default {
   name: "ClientsWrapper",
   components: { ClientsTable },
-  data() {
+  props: {
-    return {
+    openForm: Function,
-      isOpenForm: false,
-    };
-  },
-  methods: {
-    openFormCreateClient() {
-      this.isOpenForm = true;
-    },
-    closeFormCreateClient() {
-      this.isOpenForm = false;
-    },
   },
 };
 </script>

src/pages/clients/components/FormCreateAddresses.vue

@@ -12,8 +12,12 @@
         span.text-sm.separator.px-2 или
       .grid.grid-cols-2.gap-y-6.gap-x-4
         .flex.flex-col(class="gap-y-1.5")
-          span.text-sm.font-semibold Город
+          .text-info.text-xxs.font-semibold Город
-          base-input.input-info(placeholder="Выберите город")
+          base-custom-select(
+            placeholder="Выберите город",
+            :items="cities",
+            v-model="currentCity"
+          )
         .flex.flex-col(class="gap-y-1.5")
           span.text-sm.font-semibold Область
           base-input.input-info(placeholder="Введите область")
@@ -37,16 +41,27 @@
 <script>
 import BaseButton from "@/components/base/BaseButton";
 import BaseInput from "@/components/base/BaseInput";
+import BaseCustomSelect from "@/components/base/BaseCustomSelect";
 import { mask } from "vue-the-mask";
 export default {
   name: "FormCreateAddresses",
-  components: { BaseInput, BaseButton },
+  components: { BaseInput, BaseButton, BaseCustomSelect },
   props: {
     addresses: Object,
     saveClient: Function,
     saveFile: Function,
   },
   directives: { mask },
+  data() {
+    return {
+      currentCity: { id: null, label: "" },
+      cities: [
+        { id: 1, label: "Владивосток" },
+        { id: 2, label: "Москва" },
+        { id: 3, label: "Тула" },
+      ],
+    };
+  },
 };
 </script>
 

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(
+        base-custom-select(
           :items="priorityList",
           placeholder="Приоритет клиента",
           v-model="basicInfo.priority"
@@ -55,14 +55,14 @@ import BaseButton from "@/components/base/BaseButton";
 import BaseInput from "@/components/base/BaseInput";
 import BaseAddingNetwork from "@/components/base/BaseAddingNetwork";
 import { column } from "@/pages/clients/utils/tableConfig";
-import BaseSelect from "@/components/base/BaseSelect";
+import BaseCustomSelect from "@/components/base/BaseCustomSelect";
 export default {
   name: "FormCreateBasicInfo",
   components: {
     BaseInput,
     BaseAddingNetwork,
     BaseButton,
-    BaseSelect,
+    BaseCustomSelect,
   },
   props: {
     choosePriority: Function,