From 0c557d185cb6b99580587db32139a16675eeda81 Mon Sep 17 00:00:00 2001
From: megavrilinvv <vastre@rambler.ru>
Date: Thu, 18 May 2023 13:48:15 +0300
Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=B2=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=84=D0=B8=D0=B3,=20=D0=BF=D0=B5=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BF=D0=B8=D1=81=D0=B0=D0=BB=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D1=82=20=D1=81=20=D0=BD=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=80=D0=BE=D0=BC=20=D1=82=D1=8D=D0=B3=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Forms/DataForm.vue                        |  8 +++
 .../Forms/DiseaseForm.vue                     | 10 +++-
 .../Forms/MedicalFormTag.vue                  | 51 ++++++++++--------
 .../MedicalProtocolsInspection.vue            | 54 +------------------
 .../newMedicalCard/utils/medicalConfig.js     | 53 ++++++++++++++++++
 5 files changed, 100 insertions(+), 76 deletions(-)

diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/DataForm.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/DataForm.vue
index 192d0b4..a2cde87 100644
--- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/DataForm.vue
+++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/DataForm.vue
@@ -159,6 +159,14 @@ export default {
       });
     },
   },
+  watch: {
+    fillInspection: {
+      immediate: true,
+      handler(newVal) {
+        if (newVal) this.change = false;
+      },
+    },
+  },
 };
 </script>
 
diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/DiseaseForm.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/DiseaseForm.vue
index 0c859a3..fba6c28 100644
--- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/DiseaseForm.vue
+++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/DiseaseForm.vue
@@ -4,6 +4,7 @@
     :is-edit="change",
     :open-edit="openCard",
     :cancel="closeCard",
+    :tag="fillInspection || change"
   )
     .disease-body.flex
       .flex.flex-col.gap-y-17px(v-if="fillInspection || change")
@@ -31,7 +32,6 @@ export default {
   props: {
     data: Object,
     fillInspection: Boolean,
-    inspection: Boolean,
   },
   data() {
     return { change: false };
@@ -44,6 +44,14 @@ export default {
       this.change = false;
     },
   },
+  watch: {
+    fillInspection: {
+      immediate: true,
+      handler(newVal) {
+        if (newVal) this.change = false;
+      },
+    },
+  },
 };
 </script>
 
diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue
index ff7a6cb..fc6fd72 100644
--- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue
+++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue
@@ -1,21 +1,19 @@
 <template lang="pug">
   medical-form-wrapper(
-    v-for="(item, index) in list[0].data",
-    :key="item.id"
-    :title="item.name",
-    :is-edit="item?.change",
-    :open-edit="()=>openCard(index)",
-    :cancel="()=>closeCard(index)"
-    :tag="fillInspection || item?.change"
+    :title="data.title",
+    :is-edit="change",
+    :open-edit="openCard",
+    :cancel="closeCard"
+    :tag="fillInspection || change"
   )
     .protocol-body.flex.flex-col
-      .flex.items-center.gap-x-11px(:class="{'open-header': item.change || fillInspection}")
-      .flex.gap-x-4(:style="{height: item.change || fillInspection ? '300px' : ''}")
-        .flex.flex-col.gap-y-1(:class="{'open-textarea': item.change || fillInspection}")
+      .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")
-            .tag.flex.items-center.px-3.cursor-pointer.text-smm(v-for="tag in item.tags" :key="tag.id") {{tag.label}}
-          base-input.px-3(v-if="item.change || fillInspection", type="textarea", autogrow, borderless, placeholder="Введите жалобу...")
-        .filter.flex.flex-col.gap-y-4(v-if="item.change || fillInspection")
+            .tag.flex.items-center.px-3.cursor-pointer.text-smm(v-for="tag in data.results.tags" :key="tag.id") {{tag.label}}
+          base-input.px-3(v-if="change || fillInspection", type="textarea", autogrow, borderless, placeholder="Введите жалобу...")
+        .filter.flex.flex-col.gap-y-4(v-if="change || fillInspection")
           .flex.gap-x-2
             base-input(placeholder="Поиск", outlined, :width="232", iconLeft)
               q-icon(
@@ -35,8 +33,8 @@
                 :style="{width: '40px', height: '40px', color: 'var(--font-grey-color)'}",
                 padding="0"
               )
-          .field.flex.flex-col.overflow-y-scroll(v-if="item.complaints")
-            .checkbox.flex.flex-col(v-for="complaint in textSorting(item.complaints)")
+          .field.flex.flex-col.overflow-y-scroll(v-if="data.results.complaints")
+            .checkbox.flex.flex-col(v-for="complaint in textSorting(data.results.complaints)")
               .letter.flex.items-center.font-bold.justify-center {{ complaint.sym }}
               .line.flex.gap-x-4.h-9.items-center(v-for="name in complaint?.array")
                 q-checkbox(
@@ -56,15 +54,10 @@ import MedicalFormWrapper from "@/pages/newMedicalCard/components/MedicalFormWra
 export default {
   name: "MedicalFormTag",
   components: { BaseButton, BaseInput, MedicalFormWrapper },
-  props: {
-    abc: Array,
-    list: Array,
-    fillInspection: Boolean,
-    openCard: Function,
-    closeCard: Function,
-  },
+  props: { data: Object, abc: Array, fillInspection: Boolean },
   data() {
     return {
+      change: false,
       selected: [],
     };
   },
@@ -84,6 +77,20 @@ export default {
       });
       return srt;
     },
+    openCard() {
+      this.change = true;
+    },
+    closeCard() {
+      this.change = false;
+    },
+  },
+  watch: {
+    fillInspection: {
+      immediate: true,
+      handler(newVal) {
+        if (newVal) this.change = false;
+      },
+    },
   },
 };
 </script>
diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsInspection.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsInspection.vue
index 34c3488..b43434f 100644
--- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsInspection.vue
+++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsInspection.vue
@@ -22,14 +22,7 @@
               :style="{width: '40px', height: '40px', color: 'var(--font-grey-color)'}",
               padding="0"
             )
-      medical-form-tag(
-        v-if="inspection || fillInspection",
-        :list="list",
-        :abc="abc",
-        :fill-inspection="fillInspection"
-        :open-card="openCard",
-        :close-card="closeCard"
-      )
+    
       div(v-for="form in protocolForms", :key="form.key", v-if="inspection || fillInspection")  
         component(v-bind:is="form.component", :data="form", :fill-inspection="fillInspection", :abc="abc")
       .protocol.flex.justify-between.p-6(v-if="fillInspection")
@@ -68,43 +61,6 @@ export default {
         {
           id: 1,
           label: "Первичный осмотр 2023 года",
-          data: [
-            {
-              id: 1,
-              change: false,
-              name: "Жалобы",
-              tags: [
-                { id: 1, label: "Боль при приеме сладкой пищи" },
-                { id: 2, label: "Жжение языка" },
-                { id: 3, label: "Кровоточивость десен" },
-                { id: 4, label: "Лечение у ортодонта не проводилось" },
-                { id: 5, label: "Ранее зубы лечили в ЛПУ" },
-                { id: 6, label: "Удаление зуба" },
-              ],
-              complaints: [
-                { id: 1, label: "Ранее зубы лечили в ЛПУ" },
-                { id: 2, label: "Жжение языка" },
-                { id: 3, label: "Кровоточивость десен" },
-                { id: 4, label: "Лечение у ортодонта не проводилось" },
-                { id: 5, label: "Уныние зуба" },
-                { id: 6, label: "Боль при приеме сладкой пищи" },
-                { id: 7, label: "Удаление зуба" },
-                { id: 2, label: "Жжение языка" },
-              ],
-            },
-            {
-              id: 2,
-              change: false,
-              name: "Аллергологический анамнез",
-              tags: [],
-            },
-            {
-              id: 3,
-              change: false,
-              name: "Принимаемые лекарственные препараты",
-              tags: [],
-            },
-          ],
         },
       ],
       abc: [
@@ -142,14 +98,6 @@ export default {
       ],
     };
   },
-  methods: {
-    openCard(index) {
-      this.list[0].data[index].change = true;
-    },
-    closeCard(index) {
-      this.list[0].data[index].change = false;
-    },
-  },
 };
 </script>
 
diff --git a/src/pages/newMedicalCard/utils/medicalConfig.js b/src/pages/newMedicalCard/utils/medicalConfig.js
index 24af6f5..c7842aa 100644
--- a/src/pages/newMedicalCard/utils/medicalConfig.js
+++ b/src/pages/newMedicalCard/utils/medicalConfig.js
@@ -566,6 +566,59 @@ export const mapEventStatus = {
 };
 
 export const protocolForms = [
+  {
+    title: "Жалобы",
+    component: "MedicalFormTag",
+    key: "complaints",
+    state: "complaints",
+    results: {
+      tags: [
+        { id: 1, label: "Боль при приеме сладкой пищи" },
+        { id: 2, label: "Жжение языка" },
+        { id: 3, label: "Кровоточивость десен" },
+        { id: 4, label: "Лечение у ортодонта не проводилось" },
+        { id: 5, label: "Ранее зубы лечили в ЛПУ" },
+        { id: 6, label: "Удаление зуба" },
+      ],
+      complaints: [
+        { id: 1, label: "Ранее зубы лечили в ЛПУ" },
+        { id: 2, label: "Жжение языка" },
+        { id: 3, label: "Кровоточивость десен" },
+        { id: 4, label: "Лечение у ортодонта не проводилось" },
+        { id: 5, label: "Кровоточивость зуба" },
+        { id: 6, label: "Боль при приеме сладкой пищи" },
+        { id: 7, label: "Удаление зуба" },
+      ],
+    },
+  },
+  {
+    title: "Аллергологический анамнез",
+    component: "MedicalFormTag",
+    key: "anamnesis",
+    state: "anamnesis",
+    results: {
+      tags: [],
+    },
+  },
+  {
+    title: "Перенесенные и сопутствующие заболевания",
+    component: "MedicalFormTag",
+    key: "illnesses",
+    state: "illnesses",
+    results: {
+      tags: [],
+    },
+  },
+  {
+    title: "Принимаемые лекарственные препараты",
+    component: "MedicalFormTag",
+    key: "medications",
+    state: "medications",
+    results: {
+      tags: [],
+    },
+  },
+
   {
     title: "Прикус",
     component: "IndexForm",