Merge branch 'ASTRA-134' into 'master'

Исправил баги с добавлением снимков и подвижностью зубов

See merge request andrusyakka/urban-couscous!464

src/components/base/BaseDownload.vue

@@ -2,13 +2,12 @@
   label.download.flex.cursor-pointer.relative.items-center.justify-center.rounded(
     :style="{height: `${height}px`, width: width ? `${width}px` : '100%'}"
   )
-    base-input(
+    base-input.w-full.h-full(
       @change="(e) => addNewFiles(e)",
       doc,
       type="file",
       :accept="getAccept",
-      id="download",
-      :style="{zIndex: '-1'}",
+      id="upload"
       borderless,
       :multiple="multiple"
     )
@@ -92,6 +91,12 @@ export default {
 </script>
 
 <style lang="sass" scoped>
+#upload :deep(.q-field__native)
+  cursor: pointer
+  height: 100%
+  padding: 0
+#upload :deep(.q-field__control)
+  height: 100%
 .download
   border: 1px dashed var(--font-grey-color)
   background-color: var(--default-white)

src/pages/newMedicalCard/components/HealthState/HealthStateCreateModal.vue

@@ -14,8 +14,8 @@
           .grey-border.rounded-md.flex.w-full.py-2.pr-4.pl-2.justify-between.items-center(v-for="picture in dataEntry.pictures")
             .flex.items-center
               img.grey-border.rounded.w-8.h-8.mr-3(:src="picture.photo")
-              span.text-base.font-normal.mr-2 {{picture.name}}
-              span.text-smm.font-normal(:style="{color: 'var(--font-dark-grey-color)'}") {{`${picture.size} МБ`}}
+              span.name.text-base.font-normal.mr-2.whitespace-pre-wrap {{picture.name}}
+              span.text-smm.font-normal.whitespace-nowrap(:style="{color: 'var(--font-dark-grey-color)'}") {{`${picture.size} МБ`}}
             q-icon.delete-img.cursor-pointer(
               @click="() => deleteImg(picture.id)",
               name="app:cancel", 
@@ -118,6 +118,8 @@ export default {
 </script>
 
 <style lang="sass" scoped>
+.name
+  max-width: 270px
 .delete-img
   color: var(--font-grey-color)
   &:hover

src/pages/newMedicalCard/utils/medicalConfig.js

@@ -844,7 +844,7 @@ export const protocolForms = [
         name: "upper",
         rowMap: [
           {
-            label: "Подвижность",
+            label: "Подвижность зубов",
             key: "tooth_mobility",
           },
           {
@@ -973,7 +973,7 @@ export const protocolForms = [
             key: "dental_condition",
           },
           {
-            label: "Подвижность",
+            label: "Подвижность зубов",
             key: "tooth_mobility",
           },
         ],