diff --git a/src/components/base/BaseClientFormCreate.vue b/src/components/base/BaseClientFormCreate.vue index 4ea33f0..9f5d07d 100644 --- a/src/components/base/BaseClientFormCreate.vue +++ b/src/components/base/BaseClientFormCreate.vue @@ -370,7 +370,6 @@ export default { changeOpenModal() { this.showModal = true; this.showPopup = false; - this.image = [addImageIcon]; }, changeOpenPopup() { this.showPopup = true; diff --git a/src/pages/clients/components/ClientDetailInfoSection.vue b/src/pages/clients/components/ClientDetailInfoSection.vue index 1533d88..8c98dcd 100644 --- a/src/pages/clients/components/ClientDetailInfoSection.vue +++ b/src/pages/clients/components/ClientDetailInfoSection.vue @@ -6,7 +6,7 @@ span.text-sm.font-semibold.whitespace-nowrap {{settings[section].title}} .flex.items-center.gap-x-8 base-button( - v-if="isChange", + v-if="isChange && (this.isData || this.isAddress || this.isAttachments)", @click.stop="changeDoc", confirm, rounded, @@ -15,7 +15,7 @@ ) .icon-ok.text-xsm(class="pt-[3px]") .edit.icon-edit.cursor-pointer.text-sm( - v-if="!isChange", + v-if="!isChange && (this.isData || this.isAddress || this.isAttachments)", @click="changeClientData" ) .flex.relative @@ -28,7 +28,11 @@ :size="24" ) .icon-plus(class="pt-[2px]") - base-popup.right-3.top-5(v-if="section === 'docs' && isOpenAddingWrap", :width="244") + base-popup.right-3.top-5( + v-if="section === 'docs' && isOpenAddingWrap", + v-click-outside="closePopup", + :width="244" + ) table-choice-adding-doc( :add-new-doc="addNewDoc", :save-docs="saveDocs", @@ -46,6 +50,7 @@ :add-new-doc="addNewDoc", :new-docs="docData", :close-modal="changeShowModal", + v-click-outside="closeAddDocs" ) table-create-package-doc(v-if="isOpenPackage") table-adding-new-additional( @@ -226,6 +231,12 @@ export default { this.showModal = false; this.saveDocs(); }, + closePopup() { + this.isOpenAddingWrap = false; + }, + closeAddDocs() { + this.isAttachments = false; + }, checkDataPresence(data) { let postData = JSON.parse(JSON.stringify(data)); let keys = Object.keys(postData); diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue index 7e35aac..69135fb 100644 --- a/src/pages/clients/components/ClientsTableRow.vue +++ b/src/pages/clients/components/ClientsTableRow.vue @@ -25,7 +25,7 @@ @delete-client="transmitDeleteClient" ) .dots.flex.justify-center.items-center(v-if="!rowOverlay") - .flex.pl-5.z-10(v-if="isOpenChange") + .flex.z-10(v-if="isOpenChange", class="pl-[10px]") base-button( @click="closeChangeData", confirm, diff --git a/src/pages/clients/components/cells/ClientsTableCellHeader.vue b/src/pages/clients/components/cells/ClientsTableCellHeader.vue index 8e08ee1..a8f6c4a 100644 --- a/src/pages/clients/components/cells/ClientsTableCellHeader.vue +++ b/src/pages/clients/components/cells/ClientsTableCellHeader.vue @@ -1,5 +1,8 @@ diff --git a/src/pages/clients/components/cells/TableCellBodyAge.vue b/src/pages/clients/components/cells/TableCellBodyAge.vue index 076cb58..4ea2aef 100644 --- a/src/pages/clients/components/cells/TableCellBodyAge.vue +++ b/src/pages/clients/components/cells/TableCellBodyAge.vue @@ -1,11 +1,12 @@ diff --git a/src/pages/clients/components/cells/TableCellBodyEmail.vue b/src/pages/clients/components/cells/TableCellBodyEmail.vue index fbc33ea..45afac6 100644 --- a/src/pages/clients/components/cells/TableCellBodyEmail.vue +++ b/src/pages/clients/components/cells/TableCellBodyEmail.vue @@ -1,6 +1,12 @@