From d0ff2da700d09fcce9e260d2736bdf728598686b Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Tue, 15 Aug 2023 17:14:13 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BE=D1=82?= =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B4?= =?UTF-8?q?=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BF=D1=80=D0=B8=20=D0=BE?= =?UTF-8?q?=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B8=20=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/CalendarRecordPreview.vue | 2 +- src/pages/newMedicalCard/TheMedicalCard.vue | 3 ++ .../BasicDataForms/ContactsForm.vue | 8 ++-- src/store/modules/medicalCard.js | 44 ++++++++++--------- 4 files changed, 31 insertions(+), 26 deletions(-) diff --git a/src/pages/newCalendar/components/CalendarRecordPreview.vue b/src/pages/newCalendar/components/CalendarRecordPreview.vue index 2972479..c938130 100644 --- a/src/pages/newCalendar/components/CalendarRecordPreview.vue +++ b/src/pages/newCalendar/components/CalendarRecordPreview.vue @@ -124,7 +124,7 @@ export default { }, methods: { openMedicalCard(id) { - this.getMedicalCardData(id); + localStorage.setItem("medicalId", id); this.$router.push("medical-card"); }, hidePreview() { diff --git a/src/pages/newMedicalCard/TheMedicalCard.vue b/src/pages/newMedicalCard/TheMedicalCard.vue index edc3a1c..5606bbe 100644 --- a/src/pages/newMedicalCard/TheMedicalCard.vue +++ b/src/pages/newMedicalCard/TheMedicalCard.vue @@ -47,5 +47,8 @@ export default { computed: mapState({ medical: (state) => state.medical.medicalCard, }), + created() { + this.$store.dispatch("getMedicalCardData"); + }, }; diff --git a/src/pages/newMedicalCard/components/BasicDataForms/ContactsForm.vue b/src/pages/newMedicalCard/components/BasicDataForms/ContactsForm.vue index 6f32192..db5a5df 100644 --- a/src/pages/newMedicalCard/components/BasicDataForms/ContactsForm.vue +++ b/src/pages/newMedicalCard/components/BasicDataForms/ContactsForm.vue @@ -17,11 +17,11 @@ .flex(v-if="key === 'networks'") .flex.rounded-full.cursor-pointer.items-center.gap-10px.py-1.pl-1.pr-2( v-if="data.id || data.filled" - @click="() => copyLinkNetwork(data.username)" + @click="() => copyLinkNetwork(data.value)" style="background-color: var(--bg-light-grey)" ) q-icon.icon(:name="mapNetworks[data.kind].icon" :class="{old: data.id, new: data.filled}") - span.text-sm.font-medium {{ mapNetworks[data.kind].title || data.username }} + span.text-sm.font-medium {{ mapNetworks[data.kind].title || data.value }} .flex.gap-10px(v-else v-click-outside="() => checkNetworksField(index)" :key="key+index") base-select-networks( :list-data="Object.values(mapNetworks)" @@ -31,7 +31,7 @@ :size-input="50" ) base-input.w-full( - v-model="data.username", + v-model="data.value", :name="key", :rule="configData[key].rules", size="M" @@ -39,7 +39,7 @@ base-input.w-full( v-else, :readonly="!isEdit", - v-model="data.username", + v-model="data.value", :name="key", :mask="configData[key].inputMask", :rule="configData[key].rules", diff --git a/src/store/modules/medicalCard.js b/src/store/modules/medicalCard.js index de082d1..5d4bd9e 100644 --- a/src/store/modules/medicalCard.js +++ b/src/store/modules/medicalCard.js @@ -257,15 +257,18 @@ const getters = { getContactsData(state) { let phones = state.medicalCard?.person?.contacts - ?.filter((el) => el.kind === "PHONE") - ?.map((el) => ({ ...el })) || []; + ?.filter((el) => el.category === "PHONE") + ?.map((el) => { + el.value = el.value.slice(1); + return { ...el }; + }) || []; let emails = state.medicalCard?.person?.contacts - ?.filter((el) => el.kind === "EMAIL") + ?.filter((el) => el.category === "EMAIL") ?.map((el) => ({ ...el })) || []; let networks = state.medicalCard?.person?.contacts - ?.filter((el) => el.kind !== "PHONE" && el.kind !== "EMAIL") + ?.filter((el) => el.category !== "PHONE" && el.category !== "EMAIL") ?.map((el) => ({ ...el })) || []; return { phones, @@ -454,24 +457,23 @@ const actions = { }); return this.getMedicalCardData(id); }, - getMedicalCardData({ state, commit }, id) { - if (state?.personId === id) return; - fetchWrapper.get(`medical_cards/person/${id}`).then((data) => { - if (!data) { - return this.createMedicalCard(id); - } - state.personId = id; - commit("setMedicalCard", data); - commit("setBasicData"); - commit("setContactsData"); - commit("setDocumentsData"); - commit("setAllergiesData"); - commit("setConfidantData"); - commit("setHealthStateData"); - commit("setEventsPersonData", data?.person?.id); - }); + getMedicalCardData({ commit }) { + fetchWrapper + .get(`medical_cards/person/${localStorage.getItem("medicalId")}`) + .then((data) => { + if (!data) { + return this.createMedicalCard(localStorage.getItem("medicalId")); + } + commit("setMedicalCard", data); + commit("setBasicData"); + commit("setContactsData"); + commit("setDocumentsData"); + commit("setAllergiesData"); + commit("setConfidantData"); + commit("setHealthStateData"); + commit("setEventsPersonData", data?.person?.id); + }); }, - getPersonsFiltredList() { return fetchWrapper .get( From c49b4ad05095292746cb2d5e94eee261da15f4aa Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Tue, 15 Aug 2023 17:18:57 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=80=D0=BE?= =?UTF-8?q?=D1=83=D1=82=D0=B0,=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BD=D0=B5?= =?UTF-8?q?=D1=82=20id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/newMedicalCard/TheMedicalCard.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/newMedicalCard/TheMedicalCard.vue b/src/pages/newMedicalCard/TheMedicalCard.vue index 5606bbe..427c8a8 100644 --- a/src/pages/newMedicalCard/TheMedicalCard.vue +++ b/src/pages/newMedicalCard/TheMedicalCard.vue @@ -48,6 +48,7 @@ export default { medical: (state) => state.medical.medicalCard, }), created() { + if (!localStorage.getItem("medicalId")) this.$router.push("/calendar"); this.$store.dispatch("getMedicalCardData"); }, };