diff --git a/src/pages/clients/components/ClientDetailInfoSection.vue b/src/pages/clients/components/ClientDetailInfoSection.vue index 8928fd0..03aca33 100644 --- a/src/pages/clients/components/ClientDetailInfoSection.vue +++ b/src/pages/clients/components/ClientDetailInfoSection.vue @@ -39,10 +39,9 @@ no-caps, padding="0px" ) - base-popup.right-3.top-5( + q-menu( v-if="section === 'docs' && isOpenAddingWrap", - v-click-outside="closePopup", - :width="244" + anchor="bottom left", self="top right" ) table-choice-adding-doc( :add-new-doc="addNewDoc", @@ -53,7 +52,6 @@ ) base-modal( v-model="showModal", - :style-content="{padding: isOpenAddDoc ? '16px' : '28px 32px'}", :showIcon="isOpenAddDoc" ) table-adding-new-doc( @@ -65,11 +63,9 @@ ) //table-create-package-doc(v-if="isOpenPackage") stepper-create-agreement(v-if="isOpenPackage") - - base-popup.right-3.top-5( + q-menu( v-if="section === 'additional' && isOpenAddingWrap", - v-click-outside="closePopup", - :width="485" + anchor="bottom left", self="top right" ) table-create-note(:create-note="createNote", :close-popup="closePopup") transition(name="section", mode="out-in") @@ -189,7 +185,6 @@ import TableCreatePackageDoc from "@/pages/clients/components/TableCreatePackage import TableCreateNote from "@/pages/clients/components/TableCreateNote"; import ClientDetailSectionAddress from "@/pages/clients/components/ClientDetailSectionAddress"; import TableChoiceAddingDoc from "@/pages/clients/components/TableChoiceAddingDoc"; -import BasePopup from "@/components/base/BasePopup"; import BaseModal from "@/components/base/BaseModal"; import BaseInput from "@/components/base/BaseInput"; import { detail } from "@/pages/clients/utils/tableConfig"; @@ -204,7 +199,6 @@ export default { name: "ClientDetailInfoSection", components: { BaseInput, - BasePopup, BaseModal, BaseLoader, ClientDetailInput, diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue index aea744b..21d9572 100644 --- a/src/pages/clients/components/ClientsTableRow.vue +++ b/src/pages/clients/components/ClientsTableRow.vue @@ -450,7 +450,7 @@ export default { this.lackAttachments = this.dataAttachments[0]?.id ? true : false; }, saveNote(data) { - this.dataNotes = data?.note.filter((e) => !e.deleted_flg); + this.dataNotes = data?.note.filter((e) => e?.deleted_flg === false); if (this.dataNotes[0]) { this.lackNotes = true; } else { diff --git a/src/pages/clients/components/TableChoiceAddingDoc.vue b/src/pages/clients/components/TableChoiceAddingDoc.vue index 07058e3..6f071c8 100644 --- a/src/pages/clients/components/TableChoiceAddingDoc.vue +++ b/src/pages/clients/components/TableChoiceAddingDoc.vue @@ -1,13 +1,18 @@