WIP Настроила очистку в форме создания приема
This commit is contained in:
@@ -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);
|
||||
},
|
||||
|
||||
@@ -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 {
|
||||
}
|
||||
},
|
||||
},
|
||||
},
|
||||
},*/
|
||||
};
|
||||
</script>
|
||||
|
||||
|
||||
@@ -93,21 +93,16 @@ export default {
|
||||
TheNotificationProvider,
|
||||
},
|
||||
mixins: [v_model],
|
||||
emits: ["clear-selected-event-data", "close-change-form"],
|
||||
//emits: ["clear-selected-event-data", "close-change-form"],
|
||||
emits: ["clear-event-data"],
|
||||
props: {
|
||||
closeForm: Function,
|
||||
//closeForm: Function,
|
||||
selectedEventData: {
|
||||
type: Object,
|
||||
default() {
|
||||
return {};
|
||||
},
|
||||
},
|
||||
eventStatuses: {
|
||||
type: Array,
|
||||
default() {
|
||||
return [];
|
||||
},
|
||||
},
|
||||
timeInformation: {
|
||||
type: Object,
|
||||
default() {
|
||||
@@ -134,7 +129,7 @@ export default {
|
||||
eventDate: Date,
|
||||
status: { label: "Планируется прием", id: null },
|
||||
id: null,
|
||||
ifClearedForm: true,
|
||||
//ifClearedForm: true,
|
||||
membersData: [],
|
||||
ownersData: [],
|
||||
WORKING_STATUS: "WORKS",
|
||||
@@ -401,6 +396,7 @@ export default {
|
||||
};
|
||||
await this.postCreateEvent(this.eventData);
|
||||
this.eventData = {};
|
||||
this.value = false;
|
||||
},
|
||||
async updateEventData() {
|
||||
if (!this.checkTime()) return;
|
||||
@@ -422,17 +418,18 @@ export default {
|
||||
};
|
||||
await this.postUpdateEvent(this.id, this.eventData);
|
||||
this.eventData = {};
|
||||
this.value = false;
|
||||
} else
|
||||
this.addErrorNotification(
|
||||
"Событие не может быть изменено",
|
||||
"Клиент был удален"
|
||||
);
|
||||
},
|
||||
clearForm() {
|
||||
if (this.selectedEventData.id) this.$emit("close-change-form");
|
||||
this.$emit("clear-selected-event-data");
|
||||
this.closeForm();
|
||||
},
|
||||
//clearForm() {
|
||||
// if (this.selectedEventData.id) this.$emit("close-change-form");
|
||||
// this.$emit("clear-selected-event-data");
|
||||
// this.closeForm();
|
||||
//},
|
||||
mergeDate(eventDate, time) {
|
||||
let parseTime = time.split(":");
|
||||
return moment(eventDate.setHours(parseTime[0], parseTime[1]), 0).format(
|
||||
@@ -466,7 +463,7 @@ export default {
|
||||
);
|
||||
} else {
|
||||
this.addSuccessNotification("Событие успешно создано");
|
||||
this.clearForm();
|
||||
//this.clearForm();
|
||||
}
|
||||
},
|
||||
async postUpdateEvent(id, event) {
|
||||
@@ -481,7 +478,7 @@ export default {
|
||||
);
|
||||
} else {
|
||||
this.addSuccessNotification("Изменения успешно сохранены");
|
||||
this.clearForm();
|
||||
//this.clearForm();
|
||||
}
|
||||
},
|
||||
personId(object, field) {
|
||||
@@ -601,6 +598,9 @@ export default {
|
||||
}
|
||||
},
|
||||
},
|
||||
value(newValue) {
|
||||
if (newValue === false) this.$emit("clear-event-data");
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.fetchOwnersData();
|
||||
|
||||
@@ -26,9 +26,7 @@
|
||||
:day-end-time="validateEndTime",
|
||||
:style="columnSize",
|
||||
:event-statuses="eventStatuses",
|
||||
:change-form-was-closed="changeFormWasClosed",
|
||||
@selected-event="transmitEventData",
|
||||
@reset-change-form="transmitResetChangeForm",
|
||||
@delete-event="transmitDeleteEvent",
|
||||
:schedule-body-ref="$refs.scheduleBody",
|
||||
:open-form-create-event="openFormCreateEvent",
|
||||
@@ -74,7 +72,7 @@ export default {
|
||||
props: {
|
||||
openFormCreateEvent: Function,
|
||||
url: String,
|
||||
changeFormWasClosed: Boolean,
|
||||
//changeFormWasClosed: Boolean,
|
||||
currentDate: {
|
||||
type: Object,
|
||||
default() {
|
||||
@@ -314,9 +312,9 @@ export default {
|
||||
})
|
||||
);
|
||||
},
|
||||
transmitResetChangeForm() {
|
||||
/*transmitResetChangeForm() {
|
||||
this.$emit("reset-change-form");
|
||||
},
|
||||
},*/
|
||||
transmitEventData(eventData) {
|
||||
this.$emit("selected-event", eventData);
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user