From 93cea24131730891cf926942a61c3d5761e840b8 Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Mon, 26 Dec 2022 20:03:33 +0300 Subject: [PATCH 1/5] =?UTF-8?q?WIP=20=D0=9F=D0=BE=D0=B4=D1=82=D1=8F=D0=BD?= =?UTF-8?q?=D1=83=D0=BB=D0=B0=20id=20=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=BC=D0=B5=D0=B4=D0=BA=D0=B0?= =?UTF-8?q?=D1=80=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/clients/components/ClientsActionPopup.vue | 3 ++- src/pages/clients/components/ClientsTable.vue | 6 ++++-- src/pages/clients/components/ClientsTableRow.vue | 1 + .../clients/components/FormCreateMedicalCard.vue | 11 +++++++++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/pages/clients/components/ClientsActionPopup.vue b/src/pages/clients/components/ClientsActionPopup.vue index 4c2b673..4af4fa6 100644 --- a/src/pages/clients/components/ClientsActionPopup.vue +++ b/src/pages/clients/components/ClientsActionPopup.vue @@ -8,7 +8,7 @@ .button.keep-redaction.flex.gap-x-3 .icon-star-off.icon span На ведение - .button.keep-redaction.flex.gap-x-3(@click="createMedicalCard") + .button.keep-redaction.flex.gap-x-3(@click="createMedicalCard(clientId)") .icon-star-off.icon span Мед. карта .button.delete.flex.gap-x-3( @@ -29,6 +29,7 @@ export default { openChangeData: Function, disabledDelete: Boolean, createMedicalCard: Function, + clientId: String, }, methods: { transmitDeleteClient() { diff --git a/src/pages/clients/components/ClientsTable.vue b/src/pages/clients/components/ClientsTable.vue index 42d456b..f50a2d8 100644 --- a/src/pages/clients/components/ClientsTable.vue +++ b/src/pages/clients/components/ClientsTable.vue @@ -17,7 +17,7 @@ ) .flex.flex-col.h-full.table-container.w-full.mt-8.mb-3 base-modal(v-model="showMedicalCard") - form-create-medical-card + form-create-medical-card(:selected-client-id="selectedClientId") clients-table-header(:check="selectedCheck" :is-check="selectAll") .flex.flex-col clients-table-row( @@ -133,6 +133,7 @@ export default { clearingTextSearch: false, showMedicalCard: false, createdClientName: "", + selectedClientId: "", }; }, computed: { @@ -262,7 +263,8 @@ export default { this.titleModal = "Создать мед.карту"; this.openModal(); }, - createMedicalCard() { + createMedicalCard(id) { + this.selectedClientId = id; this.showMedicalCard = true; this.closeModal(); }, diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue index 7712d78..6a5a835 100644 --- a/src/pages/clients/components/ClientsTableRow.vue +++ b/src/pages/clients/components/ClientsTableRow.vue @@ -21,6 +21,7 @@ clients-action-popup( v-if="isOpenPopup", :open-change-data="openChangeData", + :client-id="client.id", :disabled-delete="!!deletedClientId && !rowOverlay", @delete-client="transmitDeleteClient", :create-medical-card="createMedicalCard" diff --git a/src/pages/clients/components/FormCreateMedicalCard.vue b/src/pages/clients/components/FormCreateMedicalCard.vue index d4acf1e..3e1c1dc 100644 --- a/src/pages/clients/components/FormCreateMedicalCard.vue +++ b/src/pages/clients/components/FormCreateMedicalCard.vue @@ -51,6 +51,9 @@ export default { MedicalPolicyDocuments, BaseStepper, }, + props: { + selectedClientId: String, + }, data() { return { isBaseData: true, @@ -93,6 +96,14 @@ export default { }, finish() {}, }, + watch: { + selectedClientId: { + immediate: true, + handler(newValue) { + console.log(newValue); + }, + }, + }, }; From 449cc6ebbe2fb41c2d8c925a722e17ea174664e9 Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Tue, 27 Dec 2022 12:09:36 +0300 Subject: [PATCH 2/5] =?UTF-8?q?WIP=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=D0=B0=20inputDate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base/BaseInputDate.vue | 2 ++ src/pages/calendar/components/CalendarFormAddEvent.vue | 4 ++-- src/pages/clients/components/ClientDetailInfoSection.vue | 2 +- src/pages/clients/components/FormCreateBasicInfo.vue | 6 ++---- .../clients/components/FormCreateIdentityDocuments.vue | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/base/BaseInputDate.vue b/src/components/base/BaseInputDate.vue index f1b164f..902f13c 100644 --- a/src/components/base/BaseInputDate.vue +++ b/src/components/base/BaseInputDate.vue @@ -37,11 +37,13 @@ export default { diff --git a/src/pages/clients/components/FormCreateIdentityDocuments.vue b/src/pages/clients/components/FormCreateIdentityDocuments.vue index fc93e51..1c7b113 100644 --- a/src/pages/clients/components/FormCreateIdentityDocuments.vue +++ b/src/pages/clients/components/FormCreateIdentityDocuments.vue @@ -28,7 +28,7 @@ ) .flex.flex-col(class="gap-y-1.5") span.text-sm Дата выдачи - base-input-date.input-date( + base-input-date.input-info.h-10( v-model:value="identityDocument.pass.issued_by_date", placeholder="Дата", :width-input="277" From 84ddeb74a1a69af3c248dde0f0f1e65a185ca863 Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Tue, 27 Dec 2022 14:43:15 +0300 Subject: [PATCH 3/5] =?UTF-8?q?WIP=20=D0=9E=D0=B1=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=B0=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=20=D0=BE=D1=87=D0=B8=D1=81=D1=82=D0=BA?= =?UTF-8?q?=D0=B5=20=D0=B2=20inputDate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base/BaseInputDate.vue | 2 +- .../calendar/components/CalendarFormAddEvent.vue | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/base/BaseInputDate.vue b/src/components/base/BaseInputDate.vue index 902f13c..04d2813 100644 --- a/src/components/base/BaseInputDate.vue +++ b/src/components/base/BaseInputDate.vue @@ -28,7 +28,7 @@ export default { return this.modelValue?.toISOString().split("T")[0]; }, set(value) { - this.$emit("update:modelValue", new Date(value)); + this.$emit("update:modelValue", value ? new Date(value) : null); }, }, }, diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue index 1960dc1..79326fd 100644 --- a/src/pages/calendar/components/CalendarFormAddEvent.vue +++ b/src/pages/calendar/components/CalendarFormAddEvent.vue @@ -40,7 +40,7 @@ .flex.gap-x-2 .flex.flex-col(class="gap-y-1.5") span.text-xxs.opacity-40.font-bold.leading-3.font-bold Дата - base-input-date.h-10(v-model:value="eventDate") + base-input-date.h-10(v-model="eventDate") .flex.gap-x-2.items-center .flex.flex-col(class="gap-y-1.5") span.text-xxs.opacity-40.font-bold.leading-3.font-bold Начало @@ -130,7 +130,7 @@ export default { endTime: "", members: {}, employees: {}, - eventDate: "", + eventDate: Date, status: {}, id: null, ifClearedForm: true, @@ -206,13 +206,13 @@ export default { }, startDate() { return this.selectedEventData.start - ? moment.parseZone(this.selectedEventData.start) - : this.currentDate; + ? new Date(this.selectedEventData.start) + : this.currentDate.toDate(); }, endDate() { return this.selectedEventData.end - ? moment.parseZone(this.selectedEventData.end) - : this.currentDate; + ? new Date(this.selectedEventData.end) + : this.currentDate.toDate(); }, eventEmployee() { if (this.selectedEventData.employees) { @@ -558,7 +558,7 @@ export default { handler(newDate) { if (newDate) { this.eventDate = newDate; - this.startTime = newDate.format("HH:mm"); + this.startTime = moment(newDate).format("HH:mm"); } }, }, @@ -566,7 +566,7 @@ export default { immediate: true, handler(newDate) { if (newDate) { - this.endTime = newDate.format("HH:mm"); + this.endTime = moment(newDate).format("HH:mm"); } }, }, From b5d74ab6be0f2b9872e5e811df14e3f4f01c6fb2 Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Tue, 27 Dec 2022 16:36:35 +0300 Subject: [PATCH 4/5] =?UTF-8?q?WIP=20=D0=A4=D0=BE=D1=80=D0=BC=D1=8B=20?= =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=81=D0=BE?= =?UTF-8?q?=D0=B1=D1=8B=D1=82=D0=B8=D1=8F=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BF=D0=BE=D0=B4=20input?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../calendar/components/CalendarColumn.vue | 6 ++---- .../calendar/components/CalendarEventCard.vue | 2 +- .../CalendarEventDescriptionCard.vue | 2 +- .../components/CalendarFormAddEvent.vue | 20 ++++++++++++------- .../components/FormCreateMedicalCard.vue | 8 -------- 5 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/pages/calendar/components/CalendarColumn.vue b/src/pages/calendar/components/CalendarColumn.vue index a1ad860..6854179 100644 --- a/src/pages/calendar/components/CalendarColumn.vue +++ b/src/pages/calendar/components/CalendarColumn.vue @@ -202,10 +202,8 @@ export default { ], start: `${this.currentDate.format( "YYYY-MM-DD" - )}T${hours}:${minuts}:00Z`, - end: `${this.currentDate.format( - "YYYY-MM-DD" - )}T${hours}:${minuts}:00Z`, + )}T${hours}:${minuts}:00`, + end: `${this.currentDate.format("YYYY-MM-DD")}T${hours}:${minuts}:00`, }); }, }, diff --git a/src/pages/calendar/components/CalendarEventCard.vue b/src/pages/calendar/components/CalendarEventCard.vue index ff6f960..afa664a 100644 --- a/src/pages/calendar/components/CalendarEventCard.vue +++ b/src/pages/calendar/components/CalendarEventCard.vue @@ -207,7 +207,7 @@ export default { }, methods: { trimTime(time) { - return time.slice(11, -4); + return time.slice(11, 16); }, composeFullName(object) { return `${object.last_name} ${object.first_name ?? ""} ${ diff --git a/src/pages/calendar/components/CalendarEventDescriptionCard.vue b/src/pages/calendar/components/CalendarEventDescriptionCard.vue index a3de16b..0080951 100644 --- a/src/pages/calendar/components/CalendarEventDescriptionCard.vue +++ b/src/pages/calendar/components/CalendarEventDescriptionCard.vue @@ -137,7 +137,7 @@ export default { if (!this.disabled) this.$emit("close-description-card"); }, trimTime(time) { - return time.slice(11, -4); + return time.slice(11, 16); }, composeFullName(object) { return `${object.last_name} ${object.first_name ?? ""} ${ diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue index 79326fd..cfb94de 100644 --- a/src/pages/calendar/components/CalendarFormAddEvent.vue +++ b/src/pages/calendar/components/CalendarFormAddEvent.vue @@ -188,13 +188,14 @@ export default { return true; }, disabledUpdateButton() { - let start = moment.parseZone(this.selectedEventData.start); - let end = moment.parseZone(this.selectedEventData.end); + let start = moment(this.selectedEventData.start); + let end = moment(this.selectedEventData.end); if ( - this.eventDate === start.format("YYYY-MM-DD") && + moment(this.eventDate).format("YYYY-MM-DD") === + start.format("YYYY-MM-DD") && this.startTime === start.format("HH:mm") && this.endTime === end.format("HH:mm") && - this.status.label === this.selectedEventData.status && + this.findStatus(this.status.label) === this.selectedEventData.status && this.employees.employee.id === this.personId(this.selectedEventData.employees, "employee") && this.members.person.id === @@ -202,6 +203,7 @@ export default { ) { return true; } + if (!this.eventDate) return true; return false; }, startDate() { @@ -312,7 +314,8 @@ export default { if (foundedEmployee) foundedSchedule = foundedEmployee.schedules.find( (elem) => - elem.date === this.eventDate && elem.status === this.WORKING_STATUS + elem.date === moment(this.eventDate).format("YYYY-MM-DD") && + elem.status === this.WORKING_STATUS ); if (!foundedSchedule) { this.addErrorNotification( @@ -417,7 +420,10 @@ export default { this.closeForm(); }, mergeDate(eventDate, time) { - return moment(`${eventDate} ${time}`).format("YYYY-MM-DDTHH:mm:ss"); + let parseTime = time.split(":"); + return moment(eventDate.setHours(parseTime[0], parseTime[1]), 0).format( + "YYYY-MM-DDTHH:mm:ss" + ); }, findPerson(requestedList, object, field) { let foundPerson = requestedList.find(({ id }) => id === object[field].id); @@ -490,7 +496,7 @@ export default { }, fetchMembersData() { fetchWrapper - .get("general/person/?limit=100") + .get("general/person/?limit=200") .then((res) => this.saveMembersData(res)); }, fetchOwnersData() { diff --git a/src/pages/clients/components/FormCreateMedicalCard.vue b/src/pages/clients/components/FormCreateMedicalCard.vue index 3e1c1dc..358b149 100644 --- a/src/pages/clients/components/FormCreateMedicalCard.vue +++ b/src/pages/clients/components/FormCreateMedicalCard.vue @@ -96,14 +96,6 @@ export default { }, finish() {}, }, - watch: { - selectedClientId: { - immediate: true, - handler(newValue) { - console.log(newValue); - }, - }, - }, }; From 95e94ef57ae65a8233fa528fd91964f7556d25bd Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Tue, 27 Dec 2022 18:52:51 +0300 Subject: [PATCH 5/5] =?UTF-8?q?WIP=20=D0=A7=D0=B0=D1=81=D1=82=D0=B8=D1=87?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20inputDate=20=D0=BD=D0=B0=20=D1=84=D0=BE=D1=80?= =?UTF-8?q?=D0=BC=D0=B5=20=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base/BaseClientFormCreate.vue | 19 +++++++++++++------ .../components/FormCreateBasicInfo.vue | 2 +- .../FormCreateIdentityDocuments.vue | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/components/base/BaseClientFormCreate.vue b/src/components/base/BaseClientFormCreate.vue index d7f4ca3..7832537 100644 --- a/src/components/base/BaseClientFormCreate.vue +++ b/src/components/base/BaseClientFormCreate.vue @@ -121,7 +121,7 @@ export default { infoClient: { basic: { full_name: "", - birth_date: "", + birth_date: null, priority: { id: null, label: "", @@ -147,7 +147,7 @@ export default { pass: { series_number: "", issued_by_org: "", - issued_by_date: "", + issued_by_date: null, issued_by_org_code: "", }, snils: { @@ -270,9 +270,13 @@ export default { ); } else fetchWrapper.post("general/identity_document/create/", { - ...this.filterDataEmptyProperty( - this.infoClient.identity_document.pass - ), + series_number: this.infoClient.identity_document.pass.series_number, + issued_by_org: this.infoClient.identity_document.pass.issued_by_org, + issued_by_date: moment( + this.infoClient.identity_document.pass.issued_by_date + ).format("YYYY-MM-DD"), + issued_by_org_code: + this.infoClient.identity_document.pass.issued_by_org_code, person: id, kind: "Паспорт", }); @@ -313,7 +317,10 @@ export default { formData.append("photo", e); }); if (this.infoClient.basic.birth_date) - formData.append("birth_date", this.infoClient.basic.birth_date); + formData.append( + "birth_date", + moment(this.infoClient.basic.birth_date).format("YYYY-MM-DD") + ); let foundElement = this.prioritySettings.settings.find( (el) => el.priority === this.infoClient.basic.priority.id ); diff --git a/src/pages/clients/components/FormCreateBasicInfo.vue b/src/pages/clients/components/FormCreateBasicInfo.vue index 1afedac..bf48f76 100644 --- a/src/pages/clients/components/FormCreateBasicInfo.vue +++ b/src/pages/clients/components/FormCreateBasicInfo.vue @@ -11,7 +11,7 @@ .flex.flex-col(class="gap-y-1.5") span.text-sm Дата рождения base-input-date.input-info( - v-model:value="basicInfo.birth_date", + v-model="basicInfo.birth_date", ) .flex.flex-col(class="gap-y-1.5") span.text-sm Номер телефона diff --git a/src/pages/clients/components/FormCreateIdentityDocuments.vue b/src/pages/clients/components/FormCreateIdentityDocuments.vue index 1c7b113..9be99da 100644 --- a/src/pages/clients/components/FormCreateIdentityDocuments.vue +++ b/src/pages/clients/components/FormCreateIdentityDocuments.vue @@ -29,7 +29,7 @@ .flex.flex-col(class="gap-y-1.5") span.text-sm Дата выдачи base-input-date.input-info.h-10( - v-model:value="identityDocument.pass.issued_by_date", + v-model="identityDocument.pass.issued_by_date", placeholder="Дата", :width-input="277" )