Merge branch 'ASTRA-108' into 'master'

[WIP] Добавил вкладку Дополнительное на форму создания записи, фикс стилей

See merge request andrusyakka/urban-couscous!418

src/pages/clients/components/FormCreateAddresses.vue

@@ -32,7 +32,7 @@
           filled,
           placeholder="Введите улицу",
           v-model="addresses.street",
-          label="Введите улицу",
+          label="Улица",
           outlined
         )
         base-input(

src/pages/newCalendar/components/RecordCreationForm.vue

@@ -56,7 +56,7 @@
     .flex.items-center.gap-x-3.text-smm
       .text.font-semibold Услуги:
       .flex.gap-x-1
-        .services.flex.items-center.px-4.font-medium.text-smm.gap-x-1(
+        .services.flex.items-center.px-4.font-medium.text-smm.gap-x-1.h-9(
           :class="{'other-serivices': services.length}"
         )
           span(v-if="!services.length") Выберите услуги
@@ -69,7 +69,7 @@
           .other.flex.h-7.items-center.justify-center(
             v-if="services.length > 3"
           ) {{`+${services.length - 3}`}}
-        .price.flex.items-center.items-center.justify-center {{sumService}}
+        .price.flex.items-center.items-center.justify-center(v-if="services.length") {{sumService}}
         q-btn.change.flex.w-7.h-7(dense, padding="4px 4px")
           img(:src="folder")
     base-input-full-name(:info-client="patientData")
@@ -127,6 +127,7 @@ import calendar from "@/assets/icons/calendar-grey.svg";
 import FormCreateBasicInfo from "@/pages/clients/components/FormCreateBasicInfo";
 import FormCreateIdentityDocuments from "@/pages/clients/components/FormCreateIdentityDocuments";
 import FormCreateAddresses from "@/pages/clients/components/FormCreateAddresses";
+import FormCreateAttachments from "@/pages/clients/components/FormCreateAttachments.vue";
 import BaseInput from "@/components/base/BaseInput.vue";
 import BaseInputFullName from "@/components/base/BaseInputFullName.vue";
 import { patientData } from "@/pages/newCalendar/utils/calendarConfig.js";
@@ -141,6 +142,7 @@ export default {
     FormCreateBasicInfo,
     FormCreateIdentityDocuments,
     FormCreateAddresses,
+    FormCreateAttachments,
     BaseInput,
     BaseInputFullName,
     BaseCalendar,
@@ -162,7 +164,7 @@ export default {
       times: { from: "8:30", to: "10:30" },
       services: [
         { id: 0, name: "Чистка зубов", price: 500, color: "#D8E3FF" },
-        { id: 1, name: "Осмотр", price: 300, color: "#FFF0CA" },
+        { id: 1, name: "Осмотр", price: 1300, color: "#FFF0CA" },
       ],
       forms: [
         {
@@ -180,6 +182,11 @@ export default {
           id: "address",
           component: "form-create-addresses",
         },
+        {
+          title: "Дополнительное",
+          id: "additional",
+          component: "form-create-attachments",
+        },
       ],
       currentForm: "form-create-basic-info",
       networksSettings: column.find((el) => el.name === "networks")?.settings,
@@ -197,7 +204,10 @@ export default {
       return filteredNetworks;
     },
     sumService() {
-      return this.services.reduce((acc, el) => acc + el.price, 0) + "₽";
+      let sum = this.services.reduce((acc, el) => acc + el.price, 0) + " ₽";
+      return sum.length >= 5
+        ? sum.replace(/(\d{1,3}(?=(?:\d\d\d)+(?!\d)))/g, "$1" + " ")
+        : sum;
     },
   },
   methods: {
@@ -267,8 +277,8 @@ export default {
 
 .services
   background: var(--bg-light-grey)
+  color: var(--font-grey-color)
   border-radius: 6px
-  height: 28px
   width: 560px
 
 .service
@@ -281,7 +291,6 @@ export default {
   padding: 4px
   border: 1px solid #D3D4DC
   background: var(--default-white)
-  height: 36px
 
 .other
   width: 46px