From 7d5341e61a6c153b91ad7ff29cfd5d4e4f729dd1 Mon Sep 17 00:00:00 2001
From: megavrilinvv <vastre@rambler.ru>
Date: Tue, 24 Jan 2023 12:09:19 +0300
Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=81=D0=B5=D0=BB=D0=B5=D0=BA=D1=82=D1=8B,=20=D1=88?=
 =?UTF-8?q?=D1=80=D0=B8=D1=84=D1=82=20=D0=B8=D0=BD=D0=BF=D1=83=D1=82=D0=B0?=
 =?UTF-8?q?,=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D1=81=D0=BC=D0=B5=D0=BD=20=D0=BD=D0=B0=20=D1=80=D0=B0=D1=81?=
 =?UTF-8?q?=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base/BaseInput.vue                         | 5 ++++-
 .../components/FormsAgreementCreate/AgreementCommon.vue   | 8 ++++----
 .../components/FormsAgreementCreate/AgreementPerson.vue   | 6 ++----
 .../components/FormsAgreementCreate/AgreementServices.vue | 8 ++++----
 src/pages/schedule/components/ScheduleTableBody.vue       | 3 +++
 src/pages/schedule/components/ScheduleTableSelect.vue     | 3 +++
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/components/base/BaseInput.vue b/src/components/base/BaseInput.vue
index 2ceda86..028fe35 100644
--- a/src/components/base/BaseInput.vue
+++ b/src/components/base/BaseInput.vue
@@ -2,7 +2,7 @@
   base-input-container.gap-y-2(:label="label")
     q-input(
       v-model="value",
-      :class="{'circle': circle}",
+      :class="{'circle': circle, 'font-input': true}",
       :input-style="{ color: textColor, width: width + 'px' }",
       :borderless="borderless",
       :placeholder="placeholder",
@@ -85,6 +85,9 @@ export default {
 </script>
 
 <style lang="sass" scoped>
+.font-input
+  font-feature-settings: 'pnum' on, 'lnum' on
+
 .circle
   width: 100%
   height: 100%
diff --git a/src/pages/clients/components/FormsAgreementCreate/AgreementCommon.vue b/src/pages/clients/components/FormsAgreementCreate/AgreementCommon.vue
index cfc859d..f20428c 100644
--- a/src/pages/clients/components/FormsAgreementCreate/AgreementCommon.vue
+++ b/src/pages/clients/components/FormsAgreementCreate/AgreementCommon.vue
@@ -1,7 +1,7 @@
 <template lang="pug">
   .flex.flex-col.gap-y-6
     span.font-bold Общая информация
-    base-custom-select(
+    base-select(
       placeholder="Категория договора",
       v-model="category",
       :items="categories",
@@ -26,7 +26,7 @@
         label="Окончание оказания услуг"
         outlined
       )         
-    base-custom-select(
+    base-select(
       placeholder="Поручить",
       v-model="employee",
       :items="employees",
@@ -37,14 +37,14 @@
 <script>
 import BaseStepper from "@/components/base/BaseStepper";
 import BaseInput from "@/components/base/BaseInput";
-import BaseCustomSelect from "@/components/base/BaseCustomSelect.vue";
+import BaseSelect from "@/components/base/BaseSelect.vue";
 
 export default {
   name: "AgreementCommon",
   components: {
     BaseStepper,
     BaseInput,
-    BaseCustomSelect,
+    BaseSelect,
   },
   data() {
     return {
diff --git a/src/pages/clients/components/FormsAgreementCreate/AgreementPerson.vue b/src/pages/clients/components/FormsAgreementCreate/AgreementPerson.vue
index 246b4a2..8400880 100644
--- a/src/pages/clients/components/FormsAgreementCreate/AgreementPerson.vue
+++ b/src/pages/clients/components/FormsAgreementCreate/AgreementPerson.vue
@@ -8,7 +8,7 @@
       outlined
     )
     //-.flex.justify-between
-      base-custom-select.w-80(
+      base-select.w-80(
         placeholder="Тип документа",
         v-model="patient.doc_type",
         :items="patentIdentityDocumentTypes",
@@ -40,7 +40,7 @@
       v-model="clientFullName",
       label='Заказчик')
     //-.flex.justify-between
-      base-custom-select.w-80(
+      base-select.w-80(
         placeholder="Тип документа",
         v-model="patient.doc_type",
         :items="patentIdentityDocumentTypes",
@@ -67,7 +67,6 @@
 
 <script>
 import BaseInput from "@/components/base/BaseInput";
-import BaseCustomSelect from "@/components/base/BaseCustomSelect.vue";
 import BaseSelect from "@/components/base/BaseSelect.vue";
 import KitLongList from "@/components/kit/KitLongList.vue";
 import KitShortList from "@/components/kit/KitShortList.vue";
@@ -78,7 +77,6 @@ export default {
   name: "AgreementPerson",
   components: {
     BaseInput,
-    BaseCustomSelect,
     BaseSelect,
     KitLongList,
     KitShortList,
diff --git a/src/pages/clients/components/FormsAgreementCreate/AgreementServices.vue b/src/pages/clients/components/FormsAgreementCreate/AgreementServices.vue
index 8c968a2..886d2d5 100644
--- a/src/pages/clients/components/FormsAgreementCreate/AgreementServices.vue
+++ b/src/pages/clients/components/FormsAgreementCreate/AgreementServices.vue
@@ -1,7 +1,7 @@
 <template lang="pug">
   .flex.flex-col.gap-y-6
     span.font-bold Общая информация
-    base-custom-select(
+    base-select(
       placeholder="Категория договора",
       v-model="category",
       :items="categories",
@@ -26,7 +26,7 @@
         label="Окончание оказания услуг"
         outlined
       )         
-    base-custom-select(
+    base-select(
       placeholder="Поручить",
       v-model="employee",
       :items="employees",
@@ -36,13 +36,13 @@
 
 <script>
 import BaseInput from "@/components/base/BaseInput";
-import BaseCustomSelect from "@/components/base/BaseCustomSelect.vue";
+import BaseSelect from "@/components/base/BaseSelect.vue";
 
 export default {
   name: "AgreementServices",
   components: {
     BaseInput,
-    BaseCustomSelect,
+    BaseSelect,
   },
   data() {
     return {
diff --git a/src/pages/schedule/components/ScheduleTableBody.vue b/src/pages/schedule/components/ScheduleTableBody.vue
index 29f027b..76eaaf6 100644
--- a/src/pages/schedule/components/ScheduleTableBody.vue
+++ b/src/pages/schedule/components/ScheduleTableBody.vue
@@ -119,4 +119,7 @@ export default {
 
 .set-template
   background-color: var(--bg-event-orange-color) !important
+
+.set-template::after
+  content: var(--text-status)
 </style>
diff --git a/src/pages/schedule/components/ScheduleTableSelect.vue b/src/pages/schedule/components/ScheduleTableSelect.vue
index c15d272..445fd00 100644
--- a/src/pages/schedule/components/ScheduleTableSelect.vue
+++ b/src/pages/schedule/components/ScheduleTableSelect.vue
@@ -110,4 +110,7 @@ export default {
 
 .set-template
   background-color: var(--bg-event-orange-color) !important
+
+.set-template::after
+  content: var(--text-status)
 </style>