diff --git a/src/pages/newCalendar/components/managerCalendar/CalendarColumn.vue b/src/pages/newCalendar/components/managerCalendar/CalendarColumn.vue index 59cb494..09b42ef 100644 --- a/src/pages/newCalendar/components/managerCalendar/CalendarColumn.vue +++ b/src/pages/newCalendar/components/managerCalendar/CalendarColumn.vue @@ -49,7 +49,7 @@ export default { events: (state) => state.calendar.events, }), filteredRecords() { - return this.events.filter((elem) => elem?.medic?.id === this.medic?.id); + return this.events.filter((elem) => elem?.medic?.ID === this.medic?.ID); }, }, }; diff --git a/src/pages/newMedicalCard/components/BasicDataForms/BasicDataForm.vue b/src/pages/newMedicalCard/components/BasicDataForms/BasicDataForm.vue index ad11a02..0056008 100644 --- a/src/pages/newMedicalCard/components/BasicDataForms/BasicDataForm.vue +++ b/src/pages/newMedicalCard/components/BasicDataForms/BasicDataForm.vue @@ -14,7 +14,7 @@ .font-semibold.text-sm.whitespace-nowrap {{data.dataLabel}} .flex.w-full.items-center.gap-4(v-for="field in data.fields") .label-field.font-sm.text-sm.whitespace-nowrap {{`${field.label} :`}} - .avatar-field.flex.gap-3.items-center(v-if="field.type === 'avatar'") + .flex.gap-3.items-center.h-10(v-if="field.type === 'avatar'") base-avatar(:size="40") img.avatar.object-cover( v-if="basic[data.dataKey][field.key]?.photo" diff --git a/src/pages/newMedicalCard/components/BasicDataForms/ContactsForm.vue b/src/pages/newMedicalCard/components/BasicDataForms/ContactsForm.vue index 6507f88..db40a5c 100644 --- a/src/pages/newMedicalCard/components/BasicDataForms/ContactsForm.vue +++ b/src/pages/newMedicalCard/components/BasicDataForms/ContactsForm.vue @@ -9,13 +9,13 @@ :cancel="cancelEdit" :open-edit="openEdit" ) - q-form.form-wrap.gap-24.w-full(ref="formContacts") - .flex.flex-col.gap-4(v-for="(contact, key) in contacts") + q-form.form-wrap.gap-6.w-full(ref="formContacts") + .flex.flex-col.gap-2(v-for="(contact, key) in contacts") .font-semibold.text-sm.whitespace-nowrap {{configData[key].title}} - .flex.w-full.justify-between.items-center.gap-4(v-for="(data, index) in contact") + .flex.w-full.items-center.gap-4(v-for="(data, index) in contact") .label-field.font-sm.text-sm.whitespace-nowrap {{`${configData[key].fieldName} ${index+1} :`}} - .input-wrapper.items-center.flex.h-10.gap-10px - .flex(v-if="key === 'networks'") + .w-full.items-center.flex.h-10 + .flex.w-full(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.value)" @@ -23,7 +23,7 @@ ) q-icon.icon(:name="mapNetworks[data.category].icon" :class="{old: data.id, new: data.filled}") span.text-sm.font-medium {{ mapNetworks[data.category].title || data.value }} - .flex.gap-10px(v-else v-click-outside="() => checkNetworksField(index)" :key="key+index") + .flex.gap-10px.w-full(v-else v-click-outside="() => checkNetworksField(index)" :key="key+index") base-select-networks( :list-data="Object.values(mapNetworks)" :option-data="data.category" @@ -31,13 +31,14 @@ :style-border="true" :size-input="50" ) - base-input.w-full( + base-input( v-model="data.value", :name="key", :rule="configData[key].rules", - size="M" + size="M", + width="100%" ) - base-input.w-full( + base-input( v-else, :readonly="!isEdit", v-model="data.value", @@ -45,23 +46,25 @@ :mask="configData[key].inputMask", :rule="configData[key].rules", @update:model-value="checkChangeInput", - size="M" + size="M", + width="100%" ) - .delete-contact.icon-cancel.text-xxs.cursor-pointer( + q-icon.delete-icon.ml-2.cursor-pointer( v-if="isEdit" @click="() => deleteContact(key, index)" - ) + name="app:cancel-mini", + size="24px" + ) q-btn.ml-2px( v-if="isEdit", color="primary", flat, - :style="{'font-weight': 500, width: '104px', height: '24px'}", + :style="{'font-weight': 500, width: '76px', height: '40px'}", no-caps, padding="0", @click="(e) => addNewContact(e, key)" + label="Добавить" ) - q-icon(name="app:icon-plus", size="12px", left) - span Добавить