From 8dbfff1a103a3a3f4e9345a73c4b47fb7ec55794 Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Wed, 30 Nov 2022 16:01:04 +0300 Subject: [PATCH] =?UTF-8?q?WIP=20=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD?= =?UTF-8?q?=D0=BE=20=D0=BC=D0=BE=D0=B4=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B5?= =?UTF-8?q?=20=D0=BE=D0=BA=D0=BD=D0=BE,=20=D0=BD=D0=B0=D1=87=D0=B0=D1=82?= =?UTF-8?q?=20overlay?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/sass/variables.sass | 1 + .../components/ClientTableDeleteModal.vue | 8 +- .../clients/components/ClientsActionPopup.vue | 8 +- src/pages/clients/components/ClientsTable.vue | 29 ++- .../clients/components/ClientsTableHat.vue | 5 +- .../clients/components/ClientsTableRow.vue | 211 ++++++++++-------- 6 files changed, 162 insertions(+), 100 deletions(-) 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 @@ @@ -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" + )