diff --git a/src/assets/icons/whiteEye.svg b/src/assets/icons/whiteEye.svg
new file mode 100644
index 0000000..c002e5c
--- /dev/null
+++ b/src/assets/icons/whiteEye.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass
index 6c42ce7..63d62b0 100644
--- a/src/assets/sass/variables.sass
+++ b/src/assets/sass/variables.sass
@@ -5,6 +5,7 @@
--bg-opacity-0: rgba(0, 0, 0, 0 )
--font-dark-blue-color: #252850
--font-dark-blue-color-0: rgba(37, 40, 80, 0.7)
+ --font-dark-blue-color-1: rgba(37, 40, 80, 0.4)
--font-black-color: #090a15
--font-black-color-1: rgba(9, 10, 21, 0.5)
--icon-light-blue: #d7d9ff
diff --git a/src/components/base/BaseModalShowingPicture.vue b/src/components/base/BaseModalShowingPicture.vue
new file mode 100644
index 0000000..b52686d
--- /dev/null
+++ b/src/components/base/BaseModalShowingPicture.vue
@@ -0,0 +1,33 @@
+
+ base-modal(
+ v-model="value",
+ hide-header,
+ default-padding
+ )
+ .wrapper.flex.relative
+ img.w-full.h-full(:src="picture")
+
+
+
+
+
diff --git a/src/pages/newMedicalCard/components/HealthState/HealthStateForm.vue b/src/pages/newMedicalCard/components/HealthState/HealthStateForm.vue
index 9b95510..cdd2e18 100644
--- a/src/pages/newMedicalCard/components/HealthState/HealthStateForm.vue
+++ b/src/pages/newMedicalCard/components/HealthState/HealthStateForm.vue
@@ -2,19 +2,35 @@
medical-form-wrapper(
:title="`${value?.year} год`",
:is-edit="isEdit",
- :openEdit="openEdit",
- :cancel="cancelEdit"
+ :open-edit="openEdit",
+ :cancel="cancelEdit",
+ :delete-item="deleteCard",
+ :save="saveСhanges",
+ :is-check-change="isCheckChange"
)
.flex.w-full.gap-x-4
- .flex.h-fit.flex-col.gap-y-2.p-2.rounded(
- v-if="value.pictures.length || isEdit"
- :style="{backgroundColor: 'var(--bg-light-grey)'}"
+ base-modal-showing-picture(
+ v-model="isShowsPicture",
+ :picture="value.pictures.find((el) => el.id === pictureId)?.photo",
)
- .flex.gap-x-2(v-if="value.pictures.length")
- .flex.relative.h-10.w-10(v-for="picture in value.pictures")
- img.h-10.w-10.rounded(:src="picture.photo")
+ .flex.flex-col.gap-y-2.p-2.rounded(
+ v-if="value.pictures.length || isEdit",
+ :style="{backgroundColor: 'var(--bg-light-grey)'}",
+ )
+ .flex.gap-2.w-full(v-if="value.pictures.length")
+ .photo.flex.relative(
+ v-for="(picture, index) in value.pictures",
+ :style="{width: isEdit ? '40px' : '104px', height: isEdit ? '40px' : '104px'}",
+ )
+ .photo-viewing.flex.absolute.rounded.cursor-pointer.w-full.h-full.items-center.justify-center(
+ v-if="!isEdit",
+ @click="() => showPicture(picture.id)"
+ )
+ img(src="@/assets/icons/whiteEye.svg" alt="eye")
+ img.h-full.w-full.rounded(:src="picture.photo")
q-btn.absolute(
- @click="() => deletePicture(picture)",
+ v-if="isEdit",
+ @click="() => deletePicture(picture.id)",
round,
dense,
size="16px",
@@ -26,7 +42,10 @@
size="8px",
:style="{color: 'var(--default-white)'}"
)
- .download.flex.cursor-pointer.relative.items-center.justify-center.rounded(:style="{height: '93px'}")
+ .download.flex.cursor-pointer.relative.items-center.justify-center.rounded(
+ v-if="isEdit",
+ :style="{ height: '93px' }",
+ )
base-input.w-full.h-full(
@update:model-value="(e) => addNewFiles(e)",
doc,
@@ -37,14 +56,24 @@
multiple
)
label.absolute.w-fit.h-fit(for="download")
- q-icon(name="app:download" size="24px")
+ q-icon(
+ name="app:download",
+ size="24px"
+ )
.flex.w-full.flex-col.gap-y-2
.flex.font-semibold.text-sm(:style="{color: 'var(--font-grey-color)'}") Комментарий врача
- .flex.flex-col.comments.rounded.py-3.pl-4.pr-2.h-130px
- .flex.flex-col.w-full.overflow-y-auto
- .flex(v-for="(comment, index) in value.comments")
+ .flex.flex-col.rounded.h-full(
+ :class="{'comments': isEdit}",
+ :style="{padding: isEdit ? '12px 8px 12px 16px' : '0 0 0 12px'}"
+ )
+ .flex.flex-col.w-full
+ .flex.items-center.gap-x-2(v-for="(comment, index) in value.comments")
+ .flex.w-1.h-1.rounded-full(
+ v-if="!isEdit",
+ :style="{backgroundColor: 'var(--font-dark-blue-color)'}")
q-input.comment.w-full(
- :ref="`comment-${index}`"
+ :ref="`comment-${index}`",
+ :readonly="!isEdit",
v-model="comment.text",
borderless,
dense,
@@ -55,23 +84,36 @@