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..8d5f0bc 100644
--- a/src/pages/calendar/TheCalendar.vue
+++ b/src/pages/calendar/TheCalendar.vue
@@ -24,17 +24,16 @@
@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"
+ :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"
+ )
base-modal(
v-model="showModal",
title="Удаление события"
@@ -56,7 +55,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",
@@ -86,7 +85,7 @@ export default {
isOpenForm: false,
WORKING_STATUS: "WORKS",
changeFormWasClosed: false,
- eventStatuses: statusesDictionary,
+ eventStatuses: statusesConfig,
};
},
methods: {
@@ -191,23 +190,4 @@ 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 @@