diff --git a/src/components/LoggedInLayout.vue b/src/components/LoggedInLayout.vue
index 44ff92e..ea8b749 100644
--- a/src/components/LoggedInLayout.vue
+++ b/src/components/LoggedInLayout.vue
@@ -1,9 +1,9 @@
.flex.flex-col.w-full.h-full.gap-y-2
- the-header(:is-open-create-client="isOpenCreateClient", @is-close-header-form="changeCloseHeaderForm")
+ the-header(:is-open-form="isOpenForm", :close-form="closeForm", :open-form="openForm")
.flex.flex-auto
the-sidebar
- router-view(@create-client="transmitOpenCreateClient", :is-close-header-form="isCloseHeaderForm")
+ router-view(:open-form="openForm")
diff --git a/src/pages/clients/components/ClientsTable.vue b/src/pages/clients/components/ClientsTable.vue
index 7bd219d..8c174d2 100644
--- a/src/pages/clients/components/ClientsTable.vue
+++ b/src/pages/clients/components/ClientsTable.vue
@@ -1,7 +1,6 @@
.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-create="openFormCreateClient")
+ clients-table-hat(:is-open-actions="marked.length" :open-form="openForm")
.flex.flex-col.h-full.gap-y-2.table-container.w-full
clients-table-header(:check="selectedCheck" :is-check="selectAll")
.flex.flex-col
@@ -33,7 +32,7 @@ export default {
BaseClientFormCreate,
},
props: {
- isCloseHeaderForm: Boolean,
+ openForm: Function,
},
data() {
@@ -42,19 +41,9 @@ export default {
selectAll: false,
marked: [],
dataClients: [],
- isOpen: false,
};
},
methods: {
- openFormCreateClient() {
- this.isOpenFormCreate = true;
- this.$emit("create-client", this.isOpenFormCreate);
- },
- closeFormCreateClient() {
- this.isOpenFormCreate = false;
- this.$emit("create-client", this.isOpenFormCreate);
- this.fetchDataClients();
- },
saveDataClients(data) {
this.dataClients = data.results;
},
@@ -86,16 +75,6 @@ export default {
mounted() {
this.fetchDataClients();
},
- watch: {
- isCloseHeaderForm: {
- immediate: true,
- handler(newValue) {
- if (newValue === false) {
- this.closeFormCreateClient();
- }
- },
- },
- },
};
diff --git a/src/pages/clients/components/ClientsTableHat.vue b/src/pages/clients/components/ClientsTableHat.vue
index c35e1db..de4fe02 100644
--- a/src/pages/clients/components/ClientsTableHat.vue
+++ b/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 Создать
@@ -25,7 +25,7 @@ export default {
BaseButton,
},
props: {
- openFormCreate: Function,
+ openForm: Function,
isOpenActions: Number,
},
};
diff --git a/src/pages/clients/components/ClientsWrapper.vue b/src/pages/clients/components/ClientsWrapper.vue
index bf3683a..50a2dbc 100644
--- a/src/pages/clients/components/ClientsWrapper.vue
+++ b/src/pages/clients/components/ClientsWrapper.vue
@@ -1,10 +1,6 @@
.wrapper.flex.w-full.relative.mx-6
- clients-table(
- :open-form-create="openFormCreateClient",
- @create-client="transmitOpenCreateForm",
- :is-close-header-form="isCloseHeaderForm"
- )
+ clients-table(:open-form="openForm")
diff --git a/src/pages/clients/components/FormCreateAddresses.vue b/src/pages/clients/components/FormCreateAddresses.vue
index cd9ae64..8daf2b8 100644
--- a/src/pages/clients/components/FormCreateAddresses.vue
+++ b/src/pages/clients/components/FormCreateAddresses.vue
@@ -11,12 +11,9 @@
.line.absolute
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 Город
- base-input.input-info(placeholder="Выберите город", :items="cities")
.flex.flex-col(class="gap-y-1.5")
.text-info.text-xxs.font-semibold Город
- base-select(
+ base-custom-select(
placeholder="Выберите город",
:items="cities",
v-model="currentCity"
@@ -44,11 +41,11 @@