From bc95fbcfb751079b82a47589c0ff2a4fb7f59700 Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Mon, 5 Dec 2022 18:18:04 +0300 Subject: [PATCH] =?UTF-8?q?WIP=20=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB?= =?UTF-8?q?=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D1=83=20?= =?UTF-8?q?=D1=82=D0=B5=D0=BA=D1=83=D1=89=D0=B5=D0=B9=20=D0=B4=D0=B0=D1=82?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base/BaseClientFormCreate.vue | 37 ++++++++++++++++++- src/pages/clients/components/ClientsTable.vue | 6 ++- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/src/components/base/BaseClientFormCreate.vue b/src/components/base/BaseClientFormCreate.vue index df58b62..d83bf3d 100644 --- a/src/components/base/BaseClientFormCreate.vue +++ b/src/components/base/BaseClientFormCreate.vue @@ -91,6 +91,7 @@ import BaseModal from "@/components/base/BaseModal"; import addImageIcon from "@/assets/icons/photo.svg"; import TheNotificationProvider from "@/components/Notifications/TheNotificationProvider"; import { addNotification } from "@/components/Notifications/notificationContext"; +import * as moment from "moment"; export default { name: "BaseClientFormClient", components: { @@ -246,7 +247,39 @@ export default { !this.showModal ? this.closeForm() : null; }, createIdentityDocument(id) { - Object.keys( + let filteredData = Object.keys( + this.filterDataEmptyProperty(this.infoClient.identity_document.pass) + ); + console.log( + moment(this.infoClient.identity_document.pass.issued_by_date).isAfter( + moment().format("YYYY-MM-DD") + ) + ); + if (filteredData.length > 0) { + if (filteredData.length !== 4) + this.addErrorNotification( + "Паспортные данные заполнены не полностью", + "Паспортные данные не будут записаны в профиль клиента" + ); + else if ( + moment(this.infoClient.identity_document.pass.issued_by_date).isAfter( + moment().format("YYYY-MM-DD") + ) + ) { + this.addErrorNotification( + "Некорректная дата выдачи паспорта", + "Паспортные данные не будут записаны в профиль клиента" + ); + } else + fetchWrapper.post("general/identity_document/create/", { + ...this.filterDataEmptyProperty( + this.infoClient.identity_document.pass + ), + person_id: id, + kind: "Паспорт", + }); + } + /*bject.keys( this.filterDataEmptyProperty(this.infoClient.identity_document.pass) ).length > 0 && fetchWrapper.post("general/identity_document/create/", { @@ -255,7 +288,7 @@ export default { ), person_id: id, kind: "Паспорт", - }); + });*/ }, createAddress(id) { Object.keys(this.filterDataEmptyProperty(this.infoClient.addresses)) diff --git a/src/pages/clients/components/ClientsTable.vue b/src/pages/clients/components/ClientsTable.vue index fde1ffe..edc6cd2 100644 --- a/src/pages/clients/components/ClientsTable.vue +++ b/src/pages/clients/components/ClientsTable.vue @@ -206,7 +206,11 @@ export default { this.textSearch = ""; this.clearingTextSearch = true; this.clientsCount += 1; - this.currentTablePage = this.calculatePageCount(this.clientsCount); + if ( + this.currentTablePage !== this.calculatePageCount(this.clientsCount) + ) + this.currentTablePage = this.calculatePageCount(this.clientsCount); + else this.fetchDataClients(); this.$emit("reset-updated-clients"); } },