diff --git a/src/components/base/BaseUploadPhoto.vue b/src/components/base/BaseUploadPhoto.vue
new file mode 100644
index 0000000..f864b20
--- /dev/null
+++ b/src/components/base/BaseUploadPhoto.vue
@@ -0,0 +1,73 @@
+
+ .flex.flex-col.items-center.justify-center(
+ :style="{padding: '153px 370px'}"
+ )
+ .avatar-wrapper.flex.relative
+ base-input(
+ circle,
+ type="file",
+ id="image-upload",
+ accept="image/*",
+ @change="(e)=>previewImage(e)",
+ )
+ .avatar.flex.absolute.items-center.gap-x-6
+ img.avatar.object-cover(for="image-upload", :src="image")
+ q-btn(
+ round,
+ color="primary",
+ @click="confirm",
+ icon="app:icon-ok"
+ )
+
+
+
+
+
diff --git a/src/pages/newMedicalCard/components/BasicDataForm.vue b/src/pages/newMedicalCard/components/BasicDataForm.vue
index 6a606a9..b1ffc20 100644
--- a/src/pages/newMedicalCard/components/BasicDataForm.vue
+++ b/src/pages/newMedicalCard/components/BasicDataForm.vue
@@ -7,13 +7,18 @@
.label-field.font-sm.text-sm.whitespace-nowrap {{`${field.label} :`}}
.avatar-field.flex.gap-3.items-center(v-if="field.type === 'avatar'")
base-avatar(:size="40")
- img(
+ img.avatar.object-cover(
v-if="basic[data.dataKey][field.key]"
- :src="url + basic[data.dataKey][field.key]"
+ :src="basic[data.dataKey][field.key]"
alt="AV"
)
span(v-else) {{ avatar }}
- .replace-photo.font-medium.text-base.cursor-pointer(v-if="isEdit") Заменить фото
+ .replace-photo.font-medium.text-base.cursor-pointer(v-if="isEdit" @click="showModal = true") Заменить фото
+ base-modal(v-model="showModal" title="Загрузить изображение")
+ base-upload-photo(
+ v-model="basic[data.dataKey][field.key]"
+ :confirm-upload="confirmCahngeAvatar"
+ )
.select(v-else-if="field.type === 'select'")
base-select(
v-model="basic[data.dataKey][field.key]"
@@ -41,6 +46,8 @@
import BaseSelect from "@/components/base/BaseSelect.vue";
import BaseInput from "@/components/base/BaseInput.vue";
import BaseAvatar from "@/components/base/BaseAvatar.vue";
+import BaseModal from "@/components/base/BaseModal.vue";
+import BaseUploadPhoto from "@/components/base/BaseUploadPhoto.vue";
import MedicalFormWrapper from "@/pages/newMedicalCard/components/MedicalFormWrapper.vue";
import {
baseDataForm,
@@ -50,9 +57,17 @@ import { mapGetters, mapState } from "vuex";
export default {
name: "BasicDataForm",
- components: { MedicalFormWrapper, BaseInput, BaseAvatar, BaseSelect },
+ components: {
+ MedicalFormWrapper,
+ BaseInput,
+ BaseAvatar,
+ BaseSelect,
+ BaseModal,
+ BaseUploadPhoto,
+ },
data() {
return {
+ showModal: false,
isEdit: false,
genderOptions: genderOptions,
configData: baseDataForm,
@@ -68,9 +83,12 @@ export default {
}),
},
methods: {
+ confirmCahngeAvatar() {
+ this.showModal = false;
+ },
cancelEdit() {
- this.isEdit = false;
this.$store.dispatch("returnInitData");
+ this.isEdit = false;
},
saveChange() {
this.isEdit = false;
@@ -87,6 +105,9 @@ export default {
width: 324px
.avatar-field
min-width: 324px
+.avatar
+ height: 100%
+ border-radius: 50%
.replace-photo
color: var(--btn-blue-color)
.input
diff --git a/src/store/modules/medicalCard.js b/src/store/modules/medicalCard.js
index 551853d..f9672ea 100644
--- a/src/store/modules/medicalCard.js
+++ b/src/store/modules/medicalCard.js
@@ -31,7 +31,7 @@ const state = () => ({
});
const getters = {
- getBasicData(state) {
+ getBasicData(state, rootState) {
let registrationAddress =
state.medicalCard?.person?.address?.find((el) => el.registration_flg) ||
{};
@@ -49,7 +49,7 @@ const getters = {
birth_date: person?.birth_date
? new Date(person?.birth_date)
: new Date(),
- photo: person?.photo,
+ photo: person?.photo ? rootState.getUrl + person?.photo : null,
},
registrationAddress: {
region: registrationAddress?.region,