From 1cec90a76bf9040b1386f04c46ba5736e43841af Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Fri, 9 Dec 2022 17:33:54 +0300 Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=A4=D0=B8=D0=BA=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clients/components/ClientsTableRow.vue | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue index e5cf38d..7e35aac 100644 --- a/src/pages/clients/components/ClientsTableRow.vue +++ b/src/pages/clients/components/ClientsTableRow.vue @@ -85,29 +85,6 @@ :is-open-change="isOpenChange", :width="columnBody.find(el => el.name === 'networks').width" ) -<<<<<<< HEAD -======= - transition(name="detail") - client-detail-info-wrapper.detail( - v-if="isOpenDetailInfo", - :data-address="dataAddress", - :data-detail="dataDetail", - :data-attachments="dataAttachments", - :data-document="dataIdentityDocument", - :save-new-doc="saveNewDoc", - :delete-doc="deleteDoc", - :update-document="postUpdateIdentityDocument", - :update-address="postUpdateAddress", - :lack-data="lackData", - :lack-address="lackAddress", - :dope-address="dopeAddress", - :lack-attachments="lackAttachments", - :create-address="postCreateAddress", - :create-document="postCreateIdentityDocument", - :address-id="addressId", - :doc-id="docId", - ) ->>>>>>> e5fcfd5baecb94a416445131391f2d1f3ebc4bad client-detail-info-wrapper.detail.px-52px( :class="{'pb-[30px] pt-4': isOpenDetailInfo}" :data-address="dataAddress", @@ -126,6 +103,7 @@ :create-document="postCreateIdentityDocument", :address-id="addressId", :doc-id="docId", + )