diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue index a6d1ad0..71673c0 100644 --- a/src/pages/calendar/TheCalendar.vue +++ b/src/pages/calendar/TheCalendar.vue @@ -17,6 +17,7 @@ v-if="isOpenForm" :close-form="closeFormCreateEvent" :owners-data="employeesData" + :members-data="membersData" ) @@ -44,6 +45,7 @@ export default { eventsData: [], employeesData: [], isOpenForm: false, + membersData: [], }; }, methods: { @@ -62,6 +64,9 @@ export default { saveEmployeesData(res) { this.employeesData = res.results; }, + saveMembersData(res) { + this.membersData = res.results; + }, fetchEventsData() { fetch("http://45.84.227.122:8080/registry/event/") .then((res) => res.json()) @@ -69,6 +74,9 @@ export default { fetch("http://45.84.227.122:8080/general/employee/") .then((res) => res.json()) .then((res) => this.saveEmployeesData(res)); + fetch("http://45.84.227.122:8080/general/person/") + .then((res) => res.json()) + .then((res) => this.saveMembersData(res)); }, changeWidth(value) { this.sidebarWidth = value; diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue index 9fe4810..ef19055 100644 --- a/src/pages/calendar/components/CalendarFormAddEvent.vue +++ b/src/pages/calendar/components/CalendarFormAddEvent.vue @@ -5,9 +5,9 @@ span.text-xs.opacity-40.font-bold.leading-3 Ответственный .icon-cancel.close-icon.text-xs.cursor-pointer(@click="closeForm") base-select( - :size-input="responsibleInputSize" + :size-input="ownerSelectSize" :option-data="ownerName" - :list-data="filteredOwners" + :list-data="ownersList" :choose-option="chooseOptionOwner" placeholder="Выберите ответственного" separator @@ -30,12 +30,18 @@ ) .flex.gap-x-4.items-center .icon-person.text-xl.icon - .form-item.cursor-pointer.flex.gap-x-2.px-4.py-2.items-center - input.item-input.cursor-text.text-base(v-model="eventData.eventClient" type="text" placeholder="ФИО клиента") + base-select( + :size-input="memberSelectSize" + :list-data="membersList" + :option-data="memberName" + :choose-option="chooseOptionMember" + placeholder="Выберите участника" + separator + ) .flex.flex-col.gap-y-2 span.text-xs.opacity-40.font-bold.leading-3 Вид события base-select( - :size-input="kindEventSize" + :size-input="kindEventSelectSize" :option-data="eventData.kindEvent" :list-data="kindEvents" :choose-option="chooseOptionTypeEvent" @@ -63,6 +69,7 @@