diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass
index cd32676..0f55b38 100644
--- a/src/assets/sass/variables.sass
+++ b/src/assets/sass/variables.sass
@@ -18,6 +18,7 @@
--bg-btn-icons-color: rgba(215, 217, 255, 0.6)
--font-grey-color: #9294a7
--border-light-grey-color: #d3d4dc
+ --row-overlay-color: #f5f6ff
--default-shadow: 4px 4px 8px rgba(9, 10, 21, 0.1), -4px -4px 8px rgba(9, 10, 21, 0.1)
--bg-hover-row-table: rgba(215, 217, 255, 0.25)
--default-white: #fff
diff --git a/src/pages/clients/components/ClientTableDeleteModal.vue b/src/pages/clients/components/ClientTableDeleteModal.vue
index 7cbe768..17b0c91 100644
--- a/src/pages/clients/components/ClientTableDeleteModal.vue
+++ b/src/pages/clients/components/ClientTableDeleteModal.vue
@@ -1,6 +1,6 @@
.flex.flex-col.mb-1.mt-4
- span.font-medium.text-base.modal-text.mb-3 Вы действительно хотите удалить клиента?
+ span.font-medium.text-base.modal-text Вы действительно хотите удалить клиента?
.flex.gap-x-3.mt-6.font-semibold
base-button(
outlined,
@@ -10,7 +10,7 @@
base-button(
outlined-red,
:size=40,
- @click="deleteEvent"
+ @click=""
) Удалить
@@ -32,8 +32,8 @@ export default {
color: var(--font-grey-color)
.card-container
- width: 374px
- height: 82px
+ width: 420px
+ height: 194px
border-radius: 4px
border: 1px solid var(--border-light-grey-color-1)
diff --git a/src/pages/clients/components/ClientsActionPopup.vue b/src/pages/clients/components/ClientsActionPopup.vue
index 81a66e0..5a82b0b 100644
--- a/src/pages/clients/components/ClientsActionPopup.vue
+++ b/src/pages/clients/components/ClientsActionPopup.vue
@@ -8,7 +8,7 @@
.button.keep-redaction.flex.gap-x-3
.icon-star-off.icon
span На ведение
- .button.delete.flex.gap-x-3(@click="deleteClient")
+ .button.delete.flex.gap-x-3(@click="transmitDeleteClient")
.icon-basket.icon-delete
span Удалить
@@ -18,7 +18,11 @@ export default {
name: "ClientsActionPopup",
props: {
openChangeData: Function,
- deleteClient: Function,
+ },
+ methods: {
+ transmitDeleteClient() {
+ this.$emit("delete-client");
+ },
},
};
diff --git a/src/pages/clients/components/ClientsTable.vue b/src/pages/clients/components/ClientsTable.vue
index b8b1912..e9e64f4 100644
--- a/src/pages/clients/components/ClientsTable.vue
+++ b/src/pages/clients/components/ClientsTable.vue
@@ -15,8 +15,9 @@
:is-check="marked.includes(client.id)",
:check="selectedCheck",
:client="client",
- :fetch-data-clients="fetchDataClients",
- @update-clients="updateDataClient"
+ :current-year="currentYear",
+ :row-overlay="deletedClientId === client.id",
+ @delete-client="deleteClientHandler",
)
client-table-pagination(
v-if="paginationInfo.length > 1"
@@ -29,6 +30,9 @@
v-model="showModal",
title="Удалить клиента"
)
+ client-table-delete-modal(
+ :close-modal="changeShowModal"
+ )