From 5f6a98dfc48bb5057e705f64fa33875cf66bd89d Mon Sep 17 00:00:00 2001 From: DwCay Date: Mon, 24 Oct 2022 23:47:47 +0300 Subject: [PATCH] =?UTF-8?q?WIP=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D0=B1=D0=BB=D0=B0=D1=81=D1=82=D0=B8=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BD=D0=BE=D0=B2=D1=8B=D1=85=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=BA=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2=20=D0=B8=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8=D1=82=D0=B5=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D0=BE=D0=B9=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC?= =?UTF-8?q?=D1=86=D0=B0=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/sass/variables.sass | 1 + src/components/base/BaseInput.vue | 20 +++--- ...sExportButton.vue => BaseExportButton.vue} | 0 .../components/ClientDetailInfoSection.vue | 64 ++++++++++++++++-- .../components/ClientDetailInfoWrapper.vue | 6 +- .../clients/components/ClientDetailInput.vue | 2 +- .../clients/components/ClientsTableHat.vue | 7 +- .../clients/components/ClientsTableRow.vue | 17 ++++- .../components/TableAddingNewAdditional.vue | 66 +++++++++++++++++++ .../clients/components/TableAddingNewDoc.vue | 57 ++++++++++++++++ 10 files changed, 215 insertions(+), 25 deletions(-) rename src/components/base/buttons/{BassExportButton.vue => BaseExportButton.vue} (100%) create mode 100644 src/pages/clients/components/TableAddingNewAdditional.vue create mode 100644 src/pages/clients/components/TableAddingNewDoc.vue diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass index 582b362..3ff0f4a 100644 --- a/src/assets/sass/variables.sass +++ b/src/assets/sass/variables.sass @@ -27,3 +27,4 @@ --light-grey-bg-color: #f8f9fa --btn-green-color: rgba(60, 217, 75, 1) --btn-light-green-color: rgba(60, 217, 75, 0.2) + --border-light-grey-color-1: rgba(211, 212, 220, 0.5) diff --git a/src/components/base/BaseInput.vue b/src/components/base/BaseInput.vue index a353b87..0825780 100644 --- a/src/components/base/BaseInput.vue +++ b/src/components/base/BaseInput.vue @@ -1,7 +1,8 @@ diff --git a/src/pages/clients/components/ClientDetailInfoWrapper.vue b/src/pages/clients/components/ClientDetailInfoWrapper.vue index a7f0230..be4a6c2 100644 --- a/src/pages/clients/components/ClientDetailInfoWrapper.vue +++ b/src/pages/clients/components/ClientDetailInfoWrapper.vue @@ -7,8 +7,8 @@ .flex.flex-col.gap-y-2 client-detail-info-section(:section-info="dataDetail.birthday" section="birthday") client-detail-info-section(:section-info="dataDetail.addresses" section="addresses") - client-detail-info-section(:section-info="dataDetail.docs" section="docs") - client-detail-info-section(:section-info="dataDetail.additional" section="additional") + client-detail-info-section(:section-info="dataDetail.docs" section="docs" :save-new-doc="saveNewDoc" :delete-doc="deleteDoc") + client-detail-info-section(:section-info="dataDetail.additional" section="additional" :save-new-doc="saveNewDoc" :delete-doc="deleteDoc") diff --git a/src/pages/clients/components/ClientDetailInput.vue b/src/pages/clients/components/ClientDetailInput.vue index 261cca4..ef80414 100644 --- a/src/pages/clients/components/ClientDetailInput.vue +++ b/src/pages/clients/components/ClientDetailInput.vue @@ -13,7 +13,7 @@ export default { }, computed: { heightInput() { - return ((this.width / 100) * 70) / 8; + return ((this.width / 100) * 70) / 11; }, }, }; diff --git a/src/pages/clients/components/ClientsTableHat.vue b/src/pages/clients/components/ClientsTableHat.vue index 9155cc5..41f0179 100644 --- a/src/pages/clients/components/ClientsTableHat.vue +++ b/src/pages/clients/components/ClientsTableHat.vue @@ -3,11 +3,12 @@ .flex.gap-2.w-fit.h-fit .input base-input(:with-icon="true") + .icon-search button.filter-button.flex.items-center.justify-center.box-border(class="px-2.5") .icon-filter.text-xl.leading-4 clients-table-header-actions(v-if="!!isOpenActions" :is-selected-one="isOpenActions===1") .flex.w-fit.h-fit.gap-x-2 - bass-export-button(:only-icon="true") + base-export-button(:only-icon="true") base-create-button(@click="openFormCreate" :with-icon="true") @@ -15,13 +16,13 @@ diff --git a/src/pages/clients/components/TableAddingNewAdditional.vue b/src/pages/clients/components/TableAddingNewAdditional.vue new file mode 100644 index 0000000..0ceafa3 --- /dev/null +++ b/src/pages/clients/components/TableAddingNewAdditional.vue @@ -0,0 +1,66 @@ + + + + + diff --git a/src/pages/clients/components/TableAddingNewDoc.vue b/src/pages/clients/components/TableAddingNewDoc.vue new file mode 100644 index 0000000..0dcca58 --- /dev/null +++ b/src/pages/clients/components/TableAddingNewDoc.vue @@ -0,0 +1,57 @@ + + + + +