[WIP] Заменил селекты, шрифт инпута, поправил отображение смен на расписании

This commit is contained in:
megavrilinvv
2023-01-24 12:09:19 +03:00
parent 1fcf29463b
commit 7d5341e61a
6 changed files with 20 additions and 13 deletions

View File

@@ -2,7 +2,7 @@
base-input-container.gap-y-2(:label="label") base-input-container.gap-y-2(:label="label")
q-input( q-input(
v-model="value", v-model="value",
:class="{'circle': circle}", :class="{'circle': circle, 'font-input': true}",
:input-style="{ color: textColor, width: width + 'px' }", :input-style="{ color: textColor, width: width + 'px' }",
:borderless="borderless", :borderless="borderless",
:placeholder="placeholder", :placeholder="placeholder",
@@ -85,6 +85,9 @@ export default {
</script> </script>
<style lang="sass" scoped> <style lang="sass" scoped>
.font-input
font-feature-settings: 'pnum' on, 'lnum' on
.circle .circle
width: 100% width: 100%
height: 100% height: 100%

View File

@@ -1,7 +1,7 @@
<template lang="pug"> <template lang="pug">
.flex.flex-col.gap-y-6 .flex.flex-col.gap-y-6
span.font-bold Общая информация span.font-bold Общая информация
base-custom-select( base-select(
placeholder="Категория договора", placeholder="Категория договора",
v-model="category", v-model="category",
:items="categories", :items="categories",
@@ -26,7 +26,7 @@
label="Окончание оказания услуг" label="Окончание оказания услуг"
outlined outlined
) )
base-custom-select( base-select(
placeholder="Поручить", placeholder="Поручить",
v-model="employee", v-model="employee",
:items="employees", :items="employees",
@@ -37,14 +37,14 @@
<script> <script>
import BaseStepper from "@/components/base/BaseStepper"; import BaseStepper from "@/components/base/BaseStepper";
import BaseInput from "@/components/base/BaseInput"; import BaseInput from "@/components/base/BaseInput";
import BaseCustomSelect from "@/components/base/BaseCustomSelect.vue"; import BaseSelect from "@/components/base/BaseSelect.vue";
export default { export default {
name: "AgreementCommon", name: "AgreementCommon",
components: { components: {
BaseStepper, BaseStepper,
BaseInput, BaseInput,
BaseCustomSelect, BaseSelect,
}, },
data() { data() {
return { return {

View File

@@ -8,7 +8,7 @@
outlined outlined
) )
//-.flex.justify-between //-.flex.justify-between
base-custom-select.w-80( base-select.w-80(
placeholder="Тип документа", placeholder="Тип документа",
v-model="patient.doc_type", v-model="patient.doc_type",
:items="patentIdentityDocumentTypes", :items="patentIdentityDocumentTypes",
@@ -40,7 +40,7 @@
v-model="clientFullName", v-model="clientFullName",
label='Заказчик') label='Заказчик')
//-.flex.justify-between //-.flex.justify-between
base-custom-select.w-80( base-select.w-80(
placeholder="Тип документа", placeholder="Тип документа",
v-model="patient.doc_type", v-model="patient.doc_type",
:items="patentIdentityDocumentTypes", :items="patentIdentityDocumentTypes",
@@ -67,7 +67,6 @@
<script> <script>
import BaseInput from "@/components/base/BaseInput"; import BaseInput from "@/components/base/BaseInput";
import BaseCustomSelect from "@/components/base/BaseCustomSelect.vue";
import BaseSelect from "@/components/base/BaseSelect.vue"; import BaseSelect from "@/components/base/BaseSelect.vue";
import KitLongList from "@/components/kit/KitLongList.vue"; import KitLongList from "@/components/kit/KitLongList.vue";
import KitShortList from "@/components/kit/KitShortList.vue"; import KitShortList from "@/components/kit/KitShortList.vue";
@@ -78,7 +77,6 @@ export default {
name: "AgreementPerson", name: "AgreementPerson",
components: { components: {
BaseInput, BaseInput,
BaseCustomSelect,
BaseSelect, BaseSelect,
KitLongList, KitLongList,
KitShortList, KitShortList,

View File

@@ -1,7 +1,7 @@
<template lang="pug"> <template lang="pug">
.flex.flex-col.gap-y-6 .flex.flex-col.gap-y-6
span.font-bold Общая информация span.font-bold Общая информация
base-custom-select( base-select(
placeholder="Категория договора", placeholder="Категория договора",
v-model="category", v-model="category",
:items="categories", :items="categories",
@@ -26,7 +26,7 @@
label="Окончание оказания услуг" label="Окончание оказания услуг"
outlined outlined
) )
base-custom-select( base-select(
placeholder="Поручить", placeholder="Поручить",
v-model="employee", v-model="employee",
:items="employees", :items="employees",
@@ -36,13 +36,13 @@
<script> <script>
import BaseInput from "@/components/base/BaseInput"; import BaseInput from "@/components/base/BaseInput";
import BaseCustomSelect from "@/components/base/BaseCustomSelect.vue"; import BaseSelect from "@/components/base/BaseSelect.vue";
export default { export default {
name: "AgreementServices", name: "AgreementServices",
components: { components: {
BaseInput, BaseInput,
BaseCustomSelect, BaseSelect,
}, },
data() { data() {
return { return {

View File

@@ -119,4 +119,7 @@ export default {
.set-template .set-template
background-color: var(--bg-event-orange-color) !important background-color: var(--bg-event-orange-color) !important
.set-template::after
content: var(--text-status)
</style> </style>

View File

@@ -110,4 +110,7 @@ export default {
.set-template .set-template
background-color: var(--bg-event-orange-color) !important background-color: var(--bg-event-orange-color) !important
.set-template::after
content: var(--text-status)
</style> </style>