Merge branch 'ASTRA-81' into 'master'

Resolve ASTRA-81

See merge request andrusyakka/urban-couscous!380

src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/DataForm.vue

@@ -33,7 +33,7 @@
                 .flex.flex-col.gap-y-1(v-else)
                   .doc-text.font-medium.text-smm {{item.name.substr(0, item.name.lastIndexOf('.'))}}
                   .title.font-medium.text-xsx {{item.size + " Мб"}}
-        .filter.flex.flex-col.gap-y-4(v-if="change || fillInspection")
+        .filter.flex.flex-col.gap-y-4.relative(v-if="change || fillInspection")
           .flex.gap-x-2
             base-input(placeholder="Поиск", outlined, :width="232", iconLeft)
               q-icon(name="app:icon-search", size="20px", style="color: var(--font-grey-color)")
@@ -55,11 +55,14 @@
               .line.flex.gap-x-4.h-9.items-center(v-for="name in complaint?.array")
                 q-checkbox(
                   dense,
-                  v-model="data.selected",
+                  v-model="selected",
                   :val="name?.label",
                   :style="{border: 'none', width: '16px', height: '16px'}"
                 )
                 .name.flex.items-center.font-medium.text-smm {{ name?.label }}
+          .flex.h-10.w-10.absolute.right-4.bottom-4
+            q-btn(color="primary", dense, padding="4px 12px")
+              q-icon(name="app:icon-plus", size="17px")
     .flex.gap-x-20.w-full(v-if="change || fillInspection")
       .flex.flex-col.gap-y-3.w-full(v-for="file in data.results.files")
         .title.text-smm.font-semibold {{file.name}}
@@ -109,6 +112,7 @@ export default {
   data() {
     return {
       change: false,
+      selected: [],
     };
   },
   methods: {
@@ -168,6 +172,17 @@ export default {
         reader.readAsDataURL(file);
       });
     },
+    checkSelected() {
+      this.data.results.tags.forEach((com) => {
+        this.data.results.complaints.forEach((tag) => {
+          if (
+            tag.label === com.label &&
+            !this.selected.find((e) => e.label === com.label)
+          )
+            this.selected.push(tag.label);
+        });
+      });
+    },
   },
   watch: {
     fillInspection: {
@@ -177,6 +192,9 @@ export default {
       },
     },
   },
+  mounted() {
+    this.checkSelected();
+  },
 };
 </script>
 

src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue

@@ -7,7 +7,6 @@
     :tag="fillInspection || change"
   )
     .protocol-body.flex.flex-col
-      .flex.items-center.gap-x-11px(:class="{'open-header': change || fillInspection}")
       .flex.gap-x-4(:style="{height: change || fillInspection ? '300px' : ''}")
         .flex.flex-col.gap-y-1(:class="{'open-textarea': change || fillInspection}")
           .tag-wrap.flex.gap-x-1.gap-y-1(v-if="!fillInspection")
@@ -51,6 +50,11 @@
           .flex.h-10.w-10.absolute.right-4.bottom-4
             q-btn(color="primary", dense, padding="4px 12px")
               q-icon(name="app:icon-plus", size="17px")
+
+    .flex(v-if="data.title === 'Осмотр полости рта' && (fillInspection || change)", :style="{color: 'var(--btn-blue-color)'}")
+      q-btn(no-caps, flat padding="2px 4px")
+        q-icon(left, name="app:plus", size="11px")
+        span.text-smm.font-medium Добавить описание зуба
 </template>
 
 <script>