From 5bdb9b20d3dad3435dd4a8aa080e78269f3a6e2b Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Fri, 4 Nov 2022 15:37:49 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BB=D0=B0=20=D0=BE=D1=87=D0=B8=D1=81=D1=82=D0=BA?= =?UTF-8?q?=D1=83=20=D1=84=D0=BE=D1=80=D0=BC=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/CalendarFormAddEvent.vue | 8 ++++++-- .../calendar/components/CalendarSchedule.vue | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue index c42f457..387c8b9 100644 --- a/src/pages/calendar/components/CalendarFormAddEvent.vue +++ b/src/pages/calendar/components/CalendarFormAddEvent.vue @@ -3,7 +3,7 @@ .flex.flex-col.gap-y-2 .flex.justify-between.pt-2 span.text-xs.opacity-40.font-bold.leading-3 Ответственный - .icon-cancel.close-icon.text-xs.cursor-pointer(@click="closeForm") + .icon-cancel.close-icon.text-xs.cursor-pointer(@click="clearForm") base-select( id="owners" :size-input="ownerSelectSize" @@ -272,9 +272,13 @@ export default { employees: [this.employees], members: [this.members], }; - this.closeForm(); + this.clearForm(); this.eventData = {}; }, + clearForm() { + this.$emit("clear-selected-event-data"); + this.closeForm(); + }, mergeDate(eventDate, time) { return moment(`${eventDate} ${time}`).format(); }, diff --git a/src/pages/calendar/components/CalendarSchedule.vue b/src/pages/calendar/components/CalendarSchedule.vue index 0b15d0f..aa3cc9c 100644 --- a/src/pages/calendar/components/CalendarSchedule.vue +++ b/src/pages/calendar/components/CalendarSchedule.vue @@ -48,6 +48,7 @@ :owners-data="ownersData" :members-data="membersData" :selected-event-data="selectedEvent" + @clear-selected-event-data="clearSelectedEvent" ) @@ -322,6 +323,24 @@ export default { this.selectedEvent = eventData; this.$emit("open-change-form"); }, + clearSelectedEvent() { + this.selectedEvent = { + id: null, + start: "", + end: "", + kind: "", + employees: { + employee: null, + role: "owner", + id: null, + }, + members: { + person: null, + role: null, + id: null, + }, + }; + }, }, watch: { currentTime() {