From 370970b26c20e1d05d797fb7617a55e586418fb0 Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Wed, 19 Jul 2023 11:35:07 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=B0=20=D0=BC=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20=D0=BD?=
 =?UTF-8?q?=D0=B5=D1=81=D0=BE=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D1=81=D1=82?=
 =?UTF-8?q?=D0=B2=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base/BaseTextarea.vue.vue      | 13 +++++++++--
 .../components/CalendarRecordPreview.vue      |  1 +
 .../components/RecordCreationForm.vue         |  2 +-
 .../BasicDataForms/DocumentsForm.vue          | 22 ++++++++++++++++---
 .../HealthState/HealthStateCreateModal.vue    |  4 ++--
 5 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/components/base/BaseTextarea.vue.vue b/src/components/base/BaseTextarea.vue.vue
index 7b635b7..38b3707 100644
--- a/src/components/base/BaseTextarea.vue.vue
+++ b/src/components/base/BaseTextarea.vue.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  base-input-container.gap-y-2(:label="label", :style="{width: width + 'px'}")
+  base-input-container.gap-y-2(:label="label", :style="{width: width + 'px', ...paddingVariable}")
     q-input.input(
       v-model="value",
       :name="name",
@@ -58,6 +58,10 @@ export default {
     readonly: Boolean,
     name: String,
     height: String,
+    padding: {
+      type: String,
+      default: "12px 16px",
+    },
   },
   emits: ["update:modelValue"],
   computed: {
@@ -69,6 +73,11 @@ export default {
         this.$emit("update:modelValue", value);
       },
     },
+    paddingVariable() {
+      return {
+        "--padding": this.padding,
+      };
+    },
   },
 };
 </script>
@@ -82,7 +91,7 @@ export default {
   font-size: 16px
   line-height: normal
   color: var(--font-dark-blue-color)
-  padding: 12px 16px
+  padding: var(--padding)
   &::placeholder
     color: var(--font-grey-color)
     opacity: 1
diff --git a/src/pages/newCalendar/components/CalendarRecordPreview.vue b/src/pages/newCalendar/components/CalendarRecordPreview.vue
index 8f6709f..f3a869a 100644
--- a/src/pages/newCalendar/components/CalendarRecordPreview.vue
+++ b/src/pages/newCalendar/components/CalendarRecordPreview.vue
@@ -23,6 +23,7 @@
             no-caps,
             label="Полная медкарта",
             :style="{'font-weight': 500}"
+            size="14px"
           )
             q-icon.arrow(name="app:long-arrow", size="18px", right)
         .flex.gap-x-1.flex-1.h-full(v-if="field?.title === 'Услуги'")
diff --git a/src/pages/newCalendar/components/RecordCreationForm.vue b/src/pages/newCalendar/components/RecordCreationForm.vue
index 778f7db..cedc96a 100644
--- a/src/pages/newCalendar/components/RecordCreationForm.vue
+++ b/src/pages/newCalendar/components/RecordCreationForm.vue
@@ -52,7 +52,7 @@
       )
   .footer.flex.gap-2
     base-button(type="secondary", label="Отменить", width="126px", @click="closeForm")
-    base-button(width="168px", label="Создать запись", @click="closeForm")
+    base-button(width="168px", label="Создать запись", @click="closeForm", disabled)
 </template>
 
 <script>
diff --git a/src/pages/newMedicalCard/components/BasicDataForms/DocumentsForm.vue b/src/pages/newMedicalCard/components/BasicDataForms/DocumentsForm.vue
index 4b7ac00..bd1881f 100644
--- a/src/pages/newMedicalCard/components/BasicDataForms/DocumentsForm.vue
+++ b/src/pages/newMedicalCard/components/BasicDataForms/DocumentsForm.vue
@@ -54,7 +54,7 @@
             size="M"
           )
           base-input(
-            v-if="field.type === 'text'",
+            v-if="field.type === 'text' && field.key !== 'issued_by_org'",
             v-model="docData[data.dataKey][field.key]",
             :name="field.key",
             @update:model-value="checkChangeDocData",
@@ -63,13 +63,27 @@
             :width="302",
             :mask="field?.inputMask",
             :rule="[(val) => !personDataField.includes(field.key) ? checkPassportFields(val, field.rules) : field.rules(val)]",
-            :autogrow="field.key === 'issued_by_org'",
-            :size="field.key !== 'issued_by_org' ? 'M' : 'auto'"
+            size="M"
           )
             .icon-copy.my-auto.text-lg.label-field.cursor-pointer(
               v-if="checkCopiedFields(field.key) && !!docData[data.dataKey][field.key]",
               @click="copyValue(docData[data.dataKey][field.key])"
             )
+          base-textarea(
+            v-if="field.type === 'text' && field.key === 'issued_by_org'",
+            v-model="docData[data.dataKey][field.key]",
+            :name="field.key",
+            @update:model-value="checkChangeDocData",
+            :readonly="!isEdit",
+            :type="field.type",
+            :width="302",
+            :mask="field?.inputMask",
+            :rule="[(val) => !personDataField.includes(field.key) ? checkPassportFields(val, field.rules) : field.rules(val)]",
+            autogrow,
+            size="auto",
+            height="57px"
+            padding="10px 16px"
+          )
 </template>
 
 <script>
@@ -87,6 +101,7 @@ import TheNotificationProvider from "@/components/Notifications/TheNotificationP
 import { addNotification } from "@/components/Notifications/notificationContext";
 import BaseInput from "@/components/base/BaseInput.vue";
 import BaseInputDate from "@/components/base/BaseInputDate.vue";
+import BaseTextarea from "@/components/base/BaseTextarea.vue.vue";
 export default {
   name: "DocumentsForm",
   components: {
@@ -97,6 +112,7 @@ export default {
     BaseUploadPhoto,
     TheNotificationProvider,
     BaseInputDate,
+    BaseTextarea,
   },
   data() {
     return {
diff --git a/src/pages/newMedicalCard/components/HealthState/HealthStateCreateModal.vue b/src/pages/newMedicalCard/components/HealthState/HealthStateCreateModal.vue
index ffc6231..1dfe674 100644
--- a/src/pages/newMedicalCard/components/HealthState/HealthStateCreateModal.vue
+++ b/src/pages/newMedicalCard/components/HealthState/HealthStateCreateModal.vue
@@ -10,7 +10,7 @@
             multiple,
             title-type="снимок",
             :returned-fields="['photo', 'id', 'name', 'size']"
-            )
+          )
           .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")
@@ -36,7 +36,7 @@
           label="Отменить"
         )
         base-button(
-          width="126px",
+          width="132px",
           label="Сохранить",
           @click="createNewEntry",
         )