diff --git a/src/components/base/BaseClientFormCreate.vue b/src/components/base/BaseClientFormCreate.vue
index 3cb6dbf..14861a1 100644
--- a/src/components/base/BaseClientFormCreate.vue
+++ b/src/components/base/BaseClientFormCreate.vue
@@ -130,7 +130,7 @@ export default {
networksSettings: column.find((el) => el.name === "networks")?.settings,
prioritySettings: column.find((el) => el.name === "priority"),
networkId: "",
- infoClient: {
+ defaultInfoClient: {
basic: {
full_name: "",
birth_date: null,
@@ -190,6 +190,7 @@ export default {
},
],
},
+ infoClient: {},
forms: [
{
title: "Основное",
@@ -267,9 +268,6 @@ export default {
closePopup() {
this.showPopup = false;
},
- /*closeModal() {
- !this.showModal ? this.closeForm() : null;
- },*/
async createIdentityDocument(id) {
let doc = null;
let filteredData = Object.keys(
@@ -370,6 +368,7 @@ export default {
this.writeCreatedClientId(result.id);
this.setUpdatedClients();
this.addSuccessNotification();
+ this.value = false;
});
} else {
this.addErrorNotification(
@@ -393,10 +392,7 @@ export default {
this.infoClient.basic.priority = e.target.id;
},
saveClient() {
- if (this.checkFormFullness()) {
- this.postNewClient();
- //this.closeForm();
- }
+ if (this.checkFormFullness()) this.postNewClient();
},
changeOpenModal() {
this.showModal = true;
@@ -483,6 +479,13 @@ export default {
this.closeAddImage();
}
},
+ value(newValue) {
+ if (newValue === false)
+ this.infoClient = JSON.parse(JSON.stringify(this.defaultInfoClient));
+ },
+ },
+ mounted() {
+ this.infoClient = JSON.parse(JSON.stringify(this.defaultInfoClient));
},
};
diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue
index 2edf473..797c08d 100644
--- a/src/pages/calendar/TheCalendar.vue
+++ b/src/pages/calendar/TheCalendar.vue
@@ -15,26 +15,21 @@
:events-data="eventsData",
:sidebar-width="sidebarWidth",
:event-statuses="eventStatuses",
- :change-form-was-closed="changeFormWasClosed",
@previous-date="switchPreviousDate",
@next-date="switchNextDate",
@selected-layout="changeCalendarLayout",
- @reset-change-form="resetChangeFormState",
@selected-event="writeEventData",
@delete-event="openModal",
:open-form-create-event="openFormCreateEvent"
)
- transition(name="form")
- calendar-form-add-event(
- v-model="isOpenForm"
- :close-form="closeFormCreateEvent",
- :selected-event-data="selectedEvent",
- :event-statuses="eventStatuses",
- :time-information="timeInformation",
- :current-date="currentDate",
- @clear-selected-event-data="clearSelectedEvent",
- @close-change-form="setChangeFormState"
- )
+ calendar-form-add-event(
+ v-model="isOpenForm",
+ :selected-event-data="selectedEvent",
+ :event-statuses="eventStatuses",
+ :time-information="timeInformation",
+ :current-date="currentDate",
+ @clear-event-data="clearSelectedEvent"
+ )
base-modal(
v-model="showModal",
title="Удаление события"
@@ -56,7 +51,7 @@ import CalendarSidebar from "./components/CalendarSidebar.vue";
import CalendarFormAddEvent from "./components/CalendarFormAddEvent.vue";
import BaseModal from "@/components/base/BaseModal.vue";
import CalendarDeleteModal from "./components/CalendarDeleteModal.vue";
-import { statusesDictionary } from "@/pages/calendar/utils/statusesDictionary";
+import { statusesConfig } from "@/pages/calendar/utils/statusesConfig";
export default {
name: "TheCalendar",
@@ -85,8 +80,8 @@ export default {
schedulesData: [],
isOpenForm: false,
WORKING_STATUS: "WORKS",
- changeFormWasClosed: false,
- eventStatuses: statusesDictionary,
+ //changeFormWasClosed: false,
+ eventStatuses: statusesConfig,
};
},
methods: {
@@ -148,18 +143,19 @@ export default {
this.isOpenForm = false;
this.fetchEventsData();
},
- setChangeFormState() {
+ /*setChangeFormState() {
this.changeFormWasClosed = true;
},
resetChangeFormState() {
this.changeFormWasClosed = false;
- },
+ },*/
writeEventData(eventData) {
this.selectedEvent = eventData;
this.openFormCreateEvent();
},
clearSelectedEvent() {
this.selectedEvent = {};
+ this.closeFormCreateEvent();
},
openModal(eventData) {
this.selectedEvent = eventData;
@@ -172,7 +168,7 @@ export default {
watch: {
showModal: function () {
if (this.showModal === false) {
- this.setChangeFormState();
+ //this.setChangeFormState();
this.clearSelectedEvent();
}
},
@@ -191,23 +187,4 @@ export default {
diff --git a/src/pages/calendar/components/CalendarColumn.vue b/src/pages/calendar/components/CalendarColumn.vue
index 6854179..fa0c803 100644
--- a/src/pages/calendar/components/CalendarColumn.vue
+++ b/src/pages/calendar/components/CalendarColumn.vue
@@ -22,9 +22,7 @@
:ownerEvent="event",
:event-statuses="eventStatuses",
:style="eventCardPosition(event.start, event.end)",
- :change-form-was-closed="changeFormWasClosed",
@selected-event="transmitEventData",
- @reset-change-form="transmitResetChangeForm",
@delete-event="transmitDeleteEvent",
:schedule-body-ref="scheduleBodyRef",
)
@@ -52,7 +50,7 @@ export default {
dayEndTime: Number,
dayStartTime: Number,
eventStatuses: Array,
- changeFormWasClosed: Boolean,
+ //changeFormWasClosed: Boolean,
scheduleBodyRef: Node,
url: String,
openFormCreateEvent: Function,
@@ -165,9 +163,9 @@ export default {
transmitEventData(eventData) {
this.$emit("selected-event", eventData);
},
- transmitResetChangeForm() {
+ /*transmitResetChangeForm() {
this.$emit("reset-change-form");
- },
+ },*/
transmitDeleteEvent(eventData) {
this.$emit("delete-event", eventData);
},
diff --git a/src/pages/calendar/components/CalendarEventCard.vue b/src/pages/calendar/components/CalendarEventCard.vue
index afa664a..18c8d51 100644
--- a/src/pages/calendar/components/CalendarEventCard.vue
+++ b/src/pages/calendar/components/CalendarEventCard.vue
@@ -40,7 +40,7 @@ export default {
name: "CalendarEventCard",
components: { CalendarEventDescriptionCard },
props: {
- changeFormWasClosed: Boolean,
+ //changeFormWasClosed: Boolean,
ownerEvent: Object,
eventStatuses: {
type: Array,
@@ -244,7 +244,7 @@ export default {
this.setDefaultTheme();
},
},
- watch: {
+ /*watch: {
changeFormWasClosed: {
immediate: true,
handler(newValue) {
@@ -254,7 +254,7 @@ export default {
}
},
},
- },
+ },*/
};
diff --git a/src/pages/calendar/components/CalendarEventDescriptionCard.vue b/src/pages/calendar/components/CalendarEventDescriptionCard.vue
index b25c8b4..f12f1b3 100644
--- a/src/pages/calendar/components/CalendarEventDescriptionCard.vue
+++ b/src/pages/calendar/components/CalendarEventDescriptionCard.vue
@@ -26,7 +26,7 @@