From a66081c14db9bfdb888f8593592dcb2069ab7c97 Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Wed, 30 Nov 2022 15:52:42 +0300 Subject: [PATCH 1/2] =?UTF-8?q?[WIP]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BF=D1=80=D0=B8=D0=BE=D1=80=D0=B8=D1=82=D0=B5?= =?UTF-8?q?=D1=82=20=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D0=B0,=20=D0=BE?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D1=83=20=D0=B2=D0=B2?= =?UTF-8?q?=D0=BE=D0=B4=D0=B0=20=D0=BF=D0=B0=D1=81=D0=BF=D0=BE=D1=80=D1=82?= =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85,=20?= =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D1=87=D0=B5=D0=BA=D0=B1=D0=BE=D0=BA?= =?UTF-8?q?=D1=81=D0=B0=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=B0=20=D0=BA?= =?UTF-8?q?=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base/BaseClientFormCreate.vue | 5 ++--- .../components/ClientDetailInfoSection.vue | 15 ++++++++------- .../clients/components/ClientDetailInput.vue | 12 +++++++++++- .../clients/components/ClientsTableCheckbox.vue | 2 +- .../clients/components/FormCreateBasicInfo.vue | 3 +++ src/pages/clients/utils/tableConfig.js | 3 ++- 6 files changed, 27 insertions(+), 13 deletions(-) diff --git a/src/components/base/BaseClientFormCreate.vue b/src/components/base/BaseClientFormCreate.vue index 41e5176..948764f 100644 --- a/src/components/base/BaseClientFormCreate.vue +++ b/src/components/base/BaseClientFormCreate.vue @@ -260,15 +260,14 @@ export default { }, postNewClient() { const formData = new FormData(); + formData.append("full_name", this.infoClient.basic.full_name); this.imageData.forEach((e) => { formData.append("photo", e); - formData.append("full_name", this.infoClient.basic.full_name); }); if (this.infoClient.basic.birth_date) formData.append("birth_date", this.infoClient.basic.birth_date); - let foundElement = this.prioritySettings.settings.find( - (el) => el.text === this.infoClient.basic.priority + (el) => el.priority === this.infoClient.basic.priority.id ); if (foundElement) formData.append("priority", foundElement.priority); fetchWrapper diff --git a/src/pages/clients/components/ClientDetailInfoSection.vue b/src/pages/clients/components/ClientDetailInfoSection.vue index fe42fff..6c0bcfa 100644 --- a/src/pages/clients/components/ClientDetailInfoSection.vue +++ b/src/pages/clients/components/ClientDetailInfoSection.vue @@ -68,15 +68,13 @@ v-model:value="sectionInfo[key]", :width="settings[section].width", :placeholder="settings[section].placeholder[key]" + :sharp="settings[section].sharps[key] && section === 'pass' ? settings[section].sharps[key] : ''" ) - base-input.max-h-10.py-2.pl-3( + base-input-date.input( v-else-if="isChange && section !== 'docs'", - type="date", v-model:value="sectionInfo.issued_by_date" - :max-date="`${currentYear}-12-31`", - dateInput ) - .copy.icon-copy.cursor-pointer( + .copy.icon-copy.cursor-pointer( v-if="item.copy", @click="() => copyValue(item)" ) @@ -123,9 +121,9 @@ import TableAddingNewAdditional from "@/pages/clients/components/TableAddingNewA import TableCreatePackageDoc from "@/pages/clients/components/TableCreatePackageDoc"; import ClientDetailSectionAddress from "@/pages/clients/components/ClientDetailSectionAddress"; import TableChoiceAddingDoc from "@/pages/clients/components/TableChoiceAddingDoc"; -import BaseInput from "@/components/base/BaseInput"; import BasePopup from "@/components/base/BasePopup"; import BaseModal from "@/components/base/BaseModal"; +import BaseInputDate from "@/components/base/BaseInputDate"; import { detail } from "@/pages/clients/utils/tableConfig"; import pdfIcon from "@/assets/icons/pdf.svg"; import wordIcon from "@/assets/icons/word.svg"; @@ -134,7 +132,7 @@ export default { name: "ClientDetailInfoSection", components: { BaseButton, - BaseInput, + BaseInputDate, BasePopup, BaseModal, ClientDetailInput, @@ -367,4 +365,7 @@ export default { width: 38px z-index: 1 background: var(--light-grey-bg-color) + +.input + border: 1.5px solid var(--border-light-grey-color) diff --git a/src/pages/clients/components/ClientDetailInput.vue b/src/pages/clients/components/ClientDetailInput.vue index f683dd1..228f432 100644 --- a/src/pages/clients/components/ClientDetailInput.vue +++ b/src/pages/clients/components/ClientDetailInput.vue @@ -1,15 +1,25 @@ 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 @@