From 766e1be22c27ce1485fcc045e5b2a208e605084d Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Wed, 30 Nov 2022 18:39:11 +0300 Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B8=D0=BD=D0=BF=D1=83=D1=82=D1=8B=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=B4=D0=B0=D1=82=D1=8B=20=D0=B8=20=D0=BE=D0=B3=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=87=D0=B8=D0=BB=20=D0=B2=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=D0=B8=D0=BC=D1=8B=D0=B5=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F;=20=D0=BF=D1=80=D0=B8=20=D0=BD=D0=B0=D0=B2=D0=B5?= =?UTF-8?q?=D0=B4=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=BD=D0=B0=20=D0=B0=D0=B2?= =?UTF-8?q?=D0=B0=D1=82=D0=B0=D1=80=20=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=D0=B0,=20=D0=BF=D0=BE=D1=8F=D0=B2=D0=BB=D1=8F=D0=B5=D1=82?= =?UTF-8?q?=D1=81=D1=8F=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BA=D0=B0=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/LoggedInLayout.vue | 9 --------- src/components/TheHeader.vue | 2 -- src/components/base/BaseClientFormCreate.vue | 17 +++++++++++------ src/components/base/BaseInputDate.vue | 14 ++++++++------ src/pages/clients/TheClients.vue | 2 -- .../components/ClientDetailInfoSection.vue | 1 - .../components/ClientDetailInfoWrapper.vue | 2 -- src/pages/clients/components/ClientsTable.vue | 2 -- .../clients/components/ClientsTableRow.vue | 2 -- src/pages/clients/components/ClientsWrapper.vue | 2 -- .../clients/components/FormCreateBasicInfo.vue | 12 ++++++------ .../components/FormCreateIdentityDocuments.vue | 12 ++++++------ 12 files changed, 31 insertions(+), 46 deletions(-) diff --git a/src/components/LoggedInLayout.vue b/src/components/LoggedInLayout.vue index 9023f4a..172f217 100644 --- a/src/components/LoggedInLayout.vue +++ b/src/components/LoggedInLayout.vue @@ -4,7 +4,6 @@ :is-open-form="isOpenForm", :close-form="closeForm", :open-form="openForm", - :current-year="currentYear", @update-client="setUpdatedClients" ) .flex.flex-auto @@ -12,7 +11,6 @@ router-view( :open-form="openForm", :is-open-form="isOpenForm", - :current-year="currentYear", :updated-clients="updatedClients", @reset-updated-clients="resetUpdatedClients" ) @@ -30,7 +28,6 @@ export default { data() { return { isOpenForm: false, - currentYear: null, updatedClients: false, }; }, @@ -41,9 +38,6 @@ export default { closeForm() { this.isOpenForm = false; }, - printCurrentYear() { - return new Date().getFullYear(); - }, setUpdatedClients() { this.updatedClients = true; }, @@ -51,8 +45,5 @@ export default { this.updatedClients = false; }, }, - mounted: function () { - this.currentYear = this.printCurrentYear(); - }, }; diff --git a/src/components/TheHeader.vue b/src/components/TheHeader.vue index ec05d4e..9d0afdc 100644 --- a/src/components/TheHeader.vue +++ b/src/components/TheHeader.vue @@ -3,7 +3,6 @@ base-client-form-create( v-if="isOpenForm", :close-form="closeForm", - :current-year="currentYear", @update-client="transmitUpdateClient" ) .flex.items-center.box-border.cursor-pointer.mr-auto @@ -43,7 +42,6 @@ export default { openForm: Function, closeForm: Function, isOpenForm: Boolean, - currentYear: Number, }, data() { return { diff --git a/src/components/base/BaseClientFormCreate.vue b/src/components/base/BaseClientFormCreate.vue index 948764f..91e1db6 100644 --- a/src/components/base/BaseClientFormCreate.vue +++ b/src/components/base/BaseClientFormCreate.vue @@ -12,7 +12,7 @@ v-for="img in image" ) .icon-download.text-xl(v-if="img === defaultIcon") - .flex.w-10.h-10(v-else) + .wrapper-img.flex.w-10.h-10(v-else) img.current-avatar(:src="img") base-popup.right-5.top-7(v-if="showPopup", :width="230") .flex.items-center.gap-x-2 @@ -56,13 +56,11 @@ :choose-option="chooseOptionNetworks" :choose-priority="choosePriority" :priority-list="priorityList" - :current-year="currentYear" - ) + ) .flex(:style="{display :'none'}" ref="doc") form-create-identity-documents( :identity-document="infoClient.identity_document", - :save-client="saveClient", - :current-year="currentYear" + :save-client="saveClient" ) .flex(:style="{display :'none'}" ref="address") form-create-addresses( @@ -106,7 +104,6 @@ export default { }, props: { closeForm: Function, - currentYear: Number, }, data() { return { @@ -429,4 +426,12 @@ export default { background-size: cover background-repeat: no-repeat background-position: center + &:hover + display: none + +.wrapper-img + background-size: 20px + background-repeat: no-repeat + background-position: center + background-image: url(@/assets/icons/download.svg) diff --git a/src/components/base/BaseInputDate.vue b/src/components/base/BaseInputDate.vue index 096d053..b433ccf 100644 --- a/src/components/base/BaseInputDate.vue +++ b/src/components/base/BaseInputDate.vue @@ -1,14 +1,16 @@ @@ -152,7 +151,6 @@ export default { check: Function, isCheck: Boolean, client: Object, - currentYear: Number, }, created() { this.dataClient = { diff --git a/src/pages/clients/components/ClientsWrapper.vue b/src/pages/clients/components/ClientsWrapper.vue index 2dab7fe..8ba02d7 100644 --- a/src/pages/clients/components/ClientsWrapper.vue +++ b/src/pages/clients/components/ClientsWrapper.vue @@ -3,7 +3,6 @@ clients-table( :open-form="openForm", :is-open-form="isOpenForm", - :current-year="currentYear", :updated-clients="updatedClients", @reset-updated-clients="transmitReset" ) @@ -16,7 +15,6 @@ export default { components: { ClientsTable }, props: { openForm: Function, - currentYear: Number, isOpenForm: Boolean, updatedClients: Boolean, }, diff --git a/src/pages/clients/components/FormCreateBasicInfo.vue b/src/pages/clients/components/FormCreateBasicInfo.vue index 391dcb8..3ae64cc 100644 --- a/src/pages/clients/components/FormCreateBasicInfo.vue +++ b/src/pages/clients/components/FormCreateBasicInfo.vue @@ -10,12 +10,9 @@ ) .flex.flex-col(class="gap-y-1.5") span.text-sm Дата рождения - base-input.input-info( + base-input-date.input-date( v-model:value="basicInfo.birth_date", - type="date", - placeholder="00.00.0000", - :width-input="277", - :max-date="`${ currentYear }-12-31`" + :width-input="277" ) .flex.flex-col(class="gap-y-1.5") span.text-sm Номер телефона @@ -54,6 +51,7 @@