From a0b186a8d08dc2515621471f91f4ab27eaa8e77b Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Wed, 4 Oct 2023 14:03:38 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=B0=20=D0=B1=D0=B0=D0=B3=D0=B8,=20=D1=81=D0=B4=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BD=D1=83=D0=BB=D0=B0=20=D0=98=D0=9D=D0=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicDataForms/DocumentsForm.vue          | 28 +++++++++++++++----
 .../BasicDataForms/InsuranceForm.vue          |  7 ++---
 .../components/MedicalBasicDataWrapper.vue    |  2 --
 .../newMedicalCard/utils/medicalConfig.js     |  3 ++
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/pages/newMedicalCard/components/BasicDataForms/DocumentsForm.vue b/src/pages/newMedicalCard/components/BasicDataForms/DocumentsForm.vue
index 17bd882..37234c6 100644
--- a/src/pages/newMedicalCard/components/BasicDataForms/DocumentsForm.vue
+++ b/src/pages/newMedicalCard/components/BasicDataForms/DocumentsForm.vue
@@ -8,8 +8,12 @@
     :open-edit="openEdit",
     :save="saveChange"
   )
-    q-form.form-wrap.gap-6.w-full(ref="documentForm", :no-error-focus="true")
-      .data-section.flex.flex-col.gap-2(v-for="data in configData", :key="data.dataLabel")
+    q-form.form-wrap.gap-x-6.w-full(ref="documentForm", :no-error-focus="true")
+      .data-section.flex.flex-col.gap-2(
+        v-for="data in configData",
+        :key="data.dataLabel",
+        :class="data?.dataClass"
+      )
         .font-semibold.text-sm.whitespace-nowrap {{data.dataLabel}}
         .flex.w-full.items-center.gap-4(
           v-for="field in data.fields",
@@ -66,7 +70,9 @@
             :rule="[(val) => !personDataField.includes(data.dataKey + ':' + field.key) ? checkPassportFields(val, field.rules) : field.rules(val, initialDocData?.[data.dataKey]?.id)]",
             size="M"
           )
-            .icon-copy.my-auto.text-lg.label-field.cursor-pointer(
+            q-icon.my-auto.cursor-pointer.copy(
+              size="20px",
+              name="app:copy",
               v-if="checkCopiedFields(field.key) && !!docData[data.dataKey][field.key]",
               @click="copyValue(docData[data.dataKey][field.key])"
             )
@@ -314,10 +320,11 @@ export default {
 .form-wrap
   display: grid
   grid-template-columns: repeat(3, 1fr)
-  grid-template-rows: repeat(1, 1fr)
+  row-gap: 32px
+  grid-template-rows: 1.2fr 1.8fr
   @media(max-width: 1440px)
     grid-template-columns: repeat(2, 1fr)
-    grid-template-rows: 3fr 1fr
+    grid-template-rows: 1.2fr 1.8fr
 .label-field
   min-width: 110px
   color: var(--font-grey-color)
@@ -336,4 +343,15 @@ export default {
   background-color: var(--btn-red-color)
 .cancel-icon :deep(path)
   fill: white
+.copy :deep(path)
+  fill: var(--font-grey-color)
+.passport
+  grid-column: 1 / 2
+  grid-row: 1 / 3
+.insurance
+  grid-column: 2 / 3
+  grid-row: 1 / 2
+.tax
+  grid-column: 2 / 3
+  grid-row: 2 / 3
 </style>
diff --git a/src/pages/newMedicalCard/components/BasicDataForms/InsuranceForm.vue b/src/pages/newMedicalCard/components/BasicDataForms/InsuranceForm.vue
index ff51977..7e5ff3c 100644
--- a/src/pages/newMedicalCard/components/BasicDataForms/InsuranceForm.vue
+++ b/src/pages/newMedicalCard/components/BasicDataForms/InsuranceForm.vue
@@ -18,9 +18,8 @@
           :style="{marginTop: field.label === 'Документы' ? '20px' : null}"
         )
           .label-field.font-sm.text-sm.whitespace-nowrap {{`${field.label} :`}}
-          .flex.gap-3.items-center.h-10.w-10(
+          .flex.gap-3.items-center.h-10(
             v-if="field.type === 'photo'",
-            :style="{'min-width': field.label === 'Документы' ? '324px' : '302px'}"
           )
             .flex.w-10.h-10.relative(v-if="insuranceData[insurance.insuranceKey]?.attachments?.photo")
               img.rounded.avatar.object-cover(
@@ -90,8 +89,8 @@
               :name="insurance.insuranceKey + ':' + field.key",
               :rule="[(val) => checkFields(val, insurance.insuranceKey, field.rules)]"
             )
-              q-icon.my-auto.text-lg.label-field.cursor-pointer.copy(
-                size="18px",
+              q-icon.my-auto.cursor-pointer.copy(
+                size="20px",
                 name="app:copy",
                 v-if="checkCopiedFields(field.key, insuranceData[insurance.insuranceKey])",
                 @click="copyValue(insuranceData[insurance.insuranceKey][field.key])"
diff --git a/src/pages/newMedicalCard/components/MedicalBasicDataWrapper.vue b/src/pages/newMedicalCard/components/MedicalBasicDataWrapper.vue
index ab95b91..b1daab4 100644
--- a/src/pages/newMedicalCard/components/MedicalBasicDataWrapper.vue
+++ b/src/pages/newMedicalCard/components/MedicalBasicDataWrapper.vue
@@ -25,6 +25,4 @@ export default {
   min-height: 350px
   @media (max-width: 600px)
     width: fit-content
-  &::-webkit-scrollbar
-    width: 0
 </style>
diff --git a/src/pages/newMedicalCard/utils/medicalConfig.js b/src/pages/newMedicalCard/utils/medicalConfig.js
index a1fc286..1a78d89 100644
--- a/src/pages/newMedicalCard/utils/medicalConfig.js
+++ b/src/pages/newMedicalCard/utils/medicalConfig.js
@@ -468,6 +468,7 @@ export const documentForm = [
   {
     dataLabel: "Паспорт",
     dataKey: "passport",
+    dataClass: "passport",
     fields: [
       {
         key: "series",
@@ -532,6 +533,7 @@ export const documentForm = [
   {
     dataLabel: "СНИЛС",
     dataKey: "insurance_number",
+    dataClass: "insurance",
     fields: [
       {
         key: "number",
@@ -554,6 +556,7 @@ export const documentForm = [
   {
     dataLabel: "ИНН",
     dataKey: "tax_identification_number",
+    dataClass: "tax",
     fields: [
       {
         key: "number",