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/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue
index 9a86ff3..83cad58 100644
--- a/src/pages/calendar/components/CalendarFormAddEvent.vue
+++ b/src/pages/calendar/components/CalendarFormAddEvent.vue
@@ -376,7 +376,7 @@ export default {
},
fetchMembersData() {
fetchWrapper
- .get("general/person/")
+ .get("general/person/?limit=100")
.then((res) => this.saveMembersData(res));
},
saveMembersData(res) {
diff --git a/src/pages/clients/components/ClientTableDeleteModal.vue b/src/pages/clients/components/ClientTableDeleteModal.vue
new file mode 100644
index 0000000..e52419c
--- /dev/null
+++ b/src/pages/clients/components/ClientTableDeleteModal.vue
@@ -0,0 +1,46 @@
+
+ .flex.flex-col.mb-1.mt-4
+ span.font-medium.text-base.modal-text Вы действительно хотите удалить клиента?
+ .flex.gap-x-3.mt-6.font-semibold
+ base-button(
+ outlined,
+ :size=40,
+ @click="closeModal"
+ ) Отменить
+ base-button(
+ outlined-red,
+ :size=40,
+ @click="transmitDeleteClient"
+ ) Удалить
+
+
+
+
+
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 897c58a..d521202 100644
--- a/src/pages/clients/components/ClientsTable.vue
+++ b/src/pages/clients/components/ClientsTable.vue
@@ -15,7 +15,9 @@
:is-check="marked.includes(client.id)",
:check="selectedCheck",
:client="client",
- :fetch-data-clients="fetchDataClients",
+ :row-overlay="deletedRowId === client.id",
+ @delete-client="deleteClientHandler",
+ @recover-client="clearDeletedRowId",
@update-clients="updateDataClient"
)
client-table-pagination(
@@ -25,6 +27,15 @@
@next-page="switchNextPage",
@set-current-page="changeCurrentTablePage"
)
+ base-modal(
+ v-model="showModal",
+ title="Удалить клиента"
+ )
+ client-table-delete-modal(
+ :close-modal="closeModal",
+ :deleted-client-id="deletedClientId",
+ @delete-client="writeDeletedRowId"
+ )
@@ -456,4 +516,14 @@ export default {
&:hover
background-color: var(--btn-blue-color)
color: var(--default-white)
+.row-overlay
+ background: transparent
+ position: absolute
+ z-index: 100
+.row-overlay-color
+ background: var(--row-overlay-color)
+.recover-btn
+ color: var(--btn-blue-color)
+.countdown
+ color: var(--font-grey-color )