From 4f17285df423863423e40c124f55eac6d6b80944 Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Mon, 19 Dec 2022 13:29:41 +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=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20note,=20=D1=84=D0=B8=D0=BA=D1=81=20=D1=81=D1=82=D0=B8?= =?UTF-8?q?=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ..._circle_remove_delete_icon_149506 1 (1).svg | 10 ---------- .../components/ClientDetailInfoSection.vue | 18 ++++++++++++++++-- .../components/ClientDetailInfoWrapper.vue | 4 +++- .../clients/components/ClientDetailInput.vue | 2 ++ .../clients/components/ClientsTableRow.vue | 15 ++++++++++----- .../clients/components/ClientsWrapper.vue | 1 + .../clients/components/TableCreateNote.vue | 2 +- .../components/MedicalCardWrapper.vue | 1 + src/router.js | 2 ++ tailwind.config.js | 1 + 10 files changed, 37 insertions(+), 19 deletions(-) delete mode 100644 src/assets/icons/close_circle_remove_delete_icon_149506 1 (1).svg diff --git a/src/assets/icons/close_circle_remove_delete_icon_149506 1 (1).svg b/src/assets/icons/close_circle_remove_delete_icon_149506 1 (1).svg deleted file mode 100644 index 35f9ae6..0000000 --- a/src/assets/icons/close_circle_remove_delete_icon_149506 1 (1).svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/pages/clients/components/ClientDetailInfoSection.vue b/src/pages/clients/components/ClientDetailInfoSection.vue index fffc868..4b62d1c 100644 --- a/src/pages/clients/components/ClientDetailInfoSection.vue +++ b/src/pages/clients/components/ClientDetailInfoSection.vue @@ -126,13 +126,26 @@ .flex.flex-col.gap-y-4(v-if="section === 'addresses' && isChange") client-detail-section-address(:dope-address="dopeAddress") .flex.flex-col.gap-y-2(v-if="section === 'additional' && isChange") - //- .title-section.text-xxs.font-semibold {{item.title}} - client-detail-input.text-sm.w-max-fit( + .flex.justify-between + .title-section.text-xxs.font-semibold Заголовок + .icon-cancel.cancel.cursor-pointer.pr-3.text-xsm( + v-if="isChange", + :id="item.id", + @click="deleteNote(item.id)" + ) + client-detail-input.text-sm.w-max-fit.pr-12.relative( + :maxLength="40", :style="{fontWeight:key === 'numba'&&600}", v-model:value="sectionInfo[key].title", placeholder="Заголовок" ) + .text.flex.absolute.text-xsx.top-18px( + class="right-2.5", + :style="{color: 'var(--font-grey-color)'}" + ) {{`${sectionInfo[key].title.length}/40`}} + .title-section.text-xxs.font-semibold Описание client-detail-input.text-sm.w-max-fit( + :maxLength="40", :style="{fontWeight:key === 'numba'&&600}", v-model:value="sectionInfo[key].description", placeholder="Описание" @@ -193,6 +206,7 @@ export default { sectionInfo: Object, section: String, deleteDoc: Function, + deleteNote: Function, updateDocument: Function, updateAddress: Function, updateNotes: Function, diff --git a/src/pages/clients/components/ClientDetailInfoWrapper.vue b/src/pages/clients/components/ClientDetailInfoWrapper.vue index 54c212f..b842240 100644 --- a/src/pages/clients/components/ClientDetailInfoWrapper.vue +++ b/src/pages/clients/components/ClientDetailInfoWrapper.vue @@ -32,7 +32,8 @@ :section-info="dataNotes", :lack-notes="lackNotes", :create-note="createNote", - :update-notes="updateNotes" + :update-notes="updateNotes", + :delete-note="deleteNote" ) @@ -47,6 +48,7 @@ export default { dataNotes: Array, saveNewDoc: Function, deleteDoc: Function, + deleteNote: Function, dataDocument: Object, updateDocument: Function, updateAddress: Function, diff --git a/src/pages/clients/components/ClientDetailInput.vue b/src/pages/clients/components/ClientDetailInput.vue index ac03b12..382b2c1 100644 --- a/src/pages/clients/components/ClientDetailInput.vue +++ b/src/pages/clients/components/ClientDetailInput.vue @@ -7,6 +7,7 @@ :cols="24", @input="$emit('update:value', $event.target.value)", :placeholder="placeholder", + :maxLength="maxLength" ) input.w-full.outline-0.not-italic.font-medium( v-else, @@ -30,6 +31,7 @@ export default { default: "Поиск", }, rows: Number, + maxLength: Number, }, directives: { mask }, computed: { diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue index e4f58f7..a243568 100644 --- a/src/pages/clients/components/ClientsTableRow.vue +++ b/src/pages/clients/components/ClientsTableRow.vue @@ -95,14 +95,15 @@ :data-notes="dataNotes" :save-new-doc="saveNewDoc", :delete-doc="deleteDoc", + :delete-note="postDeleteNote" :update-document="postUpdateIdentityDocument", :update-address="postUpdateAddress", :update-notes="postUpdateNotes", :lack-data="lackData", :lack-address="lackAddress", - :dope-address="dopeAddress", :lack-attachments="lackAttachments", - :lack-notes="lackNotes" + :lack-notes="lackNotes", + :dope-address="dopeAddress", :create-address="postCreateAddress", :create-document="postCreateIdentityDocument", :create-note="postCreateNote", @@ -433,15 +434,14 @@ export default { this.lackAttachments = this.dataAttachments[0]?.id ? true : false; }, saveNote(data) { - if (data?.note[0]) { - this.dataNotes = [...data.note]; + this.dataNotes = data?.note.filter((e) => !e.deleted_flg); + if (this.dataNotes[0]) { this.lackNotes = true; } else { this.lackNotes = false; this.dataNotes = [{ title: "", description: "" }]; } }, - saveIdentityDocument(data) { if (data?.id) { this.docId = data.id; @@ -659,6 +659,11 @@ export default { .then(() => this.fetchClientDetail(this.id)); }); }, + postDeleteNote(noteId) { + fetchWrapper + .del(`general/note/${noteId}/delete/`) + .then(() => this.fetchClientDetail(this.id)); + }, }, watch: { diff --git a/src/pages/clients/components/ClientsWrapper.vue b/src/pages/clients/components/ClientsWrapper.vue index 37c20fe..1d5add4 100644 --- a/src/pages/clients/components/ClientsWrapper.vue +++ b/src/pages/clients/components/ClientsWrapper.vue @@ -34,4 +34,5 @@ export default { .wrapper overflow: auto border-top-left-radius: 4px + border-top-right-radius: 4px diff --git a/src/pages/clients/components/TableCreateNote.vue b/src/pages/clients/components/TableCreateNote.vue index 6aecd13..4693a1e 100644 --- a/src/pages/clients/components/TableCreateNote.vue +++ b/src/pages/clients/components/TableCreateNote.vue @@ -16,6 +16,7 @@ + + diff --git a/src/pages/settings/TheSettings.vue b/src/pages/settings/TheSettings.vue index be02f8a..c3c9fba 100644 --- a/src/pages/settings/TheSettings.vue +++ b/src/pages/settings/TheSettings.vue @@ -1,58 +1,11 @@