WIP Сделала BaseButton
This commit is contained in:
@@ -45,19 +45,21 @@
|
||||
v-if="isEdit"
|
||||
@click="() => deleteAllergy(index)"
|
||||
)
|
||||
base-button(
|
||||
v-if="isEdit"
|
||||
left-icon="icon-plus"
|
||||
added-border-none
|
||||
q-btn.ml-2px(
|
||||
v-if="isEdit",
|
||||
color="primary",
|
||||
flat,
|
||||
:style="{'font-weight': 500, width: '104px', height: '24px'}",
|
||||
no-caps,
|
||||
padding="0",
|
||||
@click="(e) => addNewAllergy(e)"
|
||||
:icon-left-size="12"
|
||||
)
|
||||
span.font-medium.text-base Добавить
|
||||
)
|
||||
q-icon(name="app:icon-plus", size="12px", left)
|
||||
span Добавить
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import MedicalFormWrapper from "@/pages/newMedicalCard/components/MedicalFormWrapper.vue";
|
||||
import BaseButton from "@/components/base/BaseButton.vue";
|
||||
import BaseInput from "@/components/base/BaseInput.vue";
|
||||
import TheNotificationProvider from "@/components/Notifications/TheNotificationProvider.vue";
|
||||
import { getFieldsNameUnvalidated } from "@/shared/utils/changesObjects";
|
||||
@@ -71,7 +73,6 @@ export default {
|
||||
name: "AllergiesForm",
|
||||
components: {
|
||||
MedicalFormWrapper,
|
||||
BaseButton,
|
||||
BaseInput,
|
||||
TheNotificationProvider,
|
||||
},
|
||||
@@ -164,4 +165,8 @@ export default {
|
||||
color: var(--font-grey-color)
|
||||
.label-field
|
||||
color: var(--font-grey-color)
|
||||
.on-left
|
||||
margin-right: 10px
|
||||
.q-btn :deep(.q-ripple)
|
||||
display: none
|
||||
</style>
|
||||
|
||||
@@ -58,20 +58,22 @@
|
||||
v-if="isEdit"
|
||||
@click="() => deleteContact(key, index)"
|
||||
)
|
||||
base-button.ml-6px(
|
||||
v-if="isEdit"
|
||||
left-icon="icon-plus"
|
||||
added-border-none
|
||||
:icon-left-size="12"
|
||||
@click="(e) => addNewContact(e, key)"
|
||||
)
|
||||
span.font-medium.text-base Добавить
|
||||
q-btn.ml-2px(
|
||||
v-if="isEdit",
|
||||
color="primary",
|
||||
flat,
|
||||
:style="{'font-weight': 500, width: '104px', height: '24px'}",
|
||||
no-caps,
|
||||
padding="0",
|
||||
@click="(e) => addNewContact(e, key)"
|
||||
)
|
||||
q-icon(name="app:icon-plus", size="12px", left)
|
||||
span Добавить
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import MedicalFormWrapper from "@/pages/newMedicalCard/components/MedicalFormWrapper.vue";
|
||||
import BaseInput from "@/components/base/BaseInput.vue";
|
||||
import BaseButton from "@/components/base/BaseButton.vue";
|
||||
import BaseSelectNetworks from "@/components/base/BaseSelectNetworks.vue";
|
||||
import { mapNetworks } from "@/pages/newMedicalCard/utils/medicalConfig";
|
||||
import TheNotificationProvider from "@/components/Notifications/TheNotificationProvider.vue";
|
||||
@@ -90,7 +92,6 @@ export default {
|
||||
MedicalFormWrapper,
|
||||
BaseInput,
|
||||
BaseSelectNetworks,
|
||||
BaseButton,
|
||||
TheNotificationProvider,
|
||||
},
|
||||
data() {
|
||||
@@ -233,4 +234,8 @@ export default {
|
||||
color: var(--font-grey-color)
|
||||
.delete-contact
|
||||
color: var(--font-grey-color)
|
||||
.on-left
|
||||
margin-right: 10px
|
||||
.q-btn :deep(.q-ripple)
|
||||
display: none
|
||||
</style>
|
||||
|
||||
@@ -26,8 +26,8 @@
|
||||
component(v-bind:is="form.component", :data="form", :fill-inspection="fillInspection", :abc="abc")
|
||||
.protocol.flex.justify-between.p-6(v-if="fillInspection")
|
||||
.flex.h-fit.w-fit.gap-2
|
||||
base-button.text-base.font-semibold(outlined, :size="40") Отменить
|
||||
base-button.text-base.font-semibold(:size="40") Сохранить
|
||||
base-button(label="Отменить", type="secondary", width="126px")
|
||||
base-button(label="Сохранить", width="132px")
|
||||
.flex.items-center.gap-x-3(:style="{color: 'var(--font-grey-color)'}")
|
||||
.flex.font-semibold.text-7xl {{ percent + "%" }}
|
||||
.flex.font-medium.text-smm.w-20 заполнение осмотра
|
||||
|
||||
@@ -2,24 +2,26 @@
|
||||
.wrapper.flex.flex-col.gap-27px.h-full.pb-4
|
||||
.flex.flex-col.gap-2
|
||||
confidant-form(v-for="(confidant, index) in confidants" :index="index" :confidant="confidant")
|
||||
base-button.ml-30px(
|
||||
left-icon="icon-plus"
|
||||
added-border-none
|
||||
:icon-left-size="12"
|
||||
@click="addNewConfidant"
|
||||
)
|
||||
span.font-medium.text-base Добавить контакт
|
||||
q-btn.ml-2px(
|
||||
color="primary",
|
||||
flat,
|
||||
:style="{'font-weight': 500, width: '174px', height: '24px'}",
|
||||
no-caps,
|
||||
padding="0",
|
||||
@click="addNewConfidant"
|
||||
)
|
||||
q-icon(name="app:icon-plus", size="12px", left)
|
||||
span Добавить контакт
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ConfidantForm from "@/pages/newMedicalCard/components/ConfidantForms/ConfidantForm.vue";
|
||||
import BaseButton from "@/components/base/BaseButton.vue";
|
||||
import { getConfidantObject } from "@/pages/newMedicalCard/utils/gettersObjects";
|
||||
import { mapState } from "vuex";
|
||||
|
||||
export default {
|
||||
name: "MedicalConfidantWrapper",
|
||||
components: { ConfidantForm, BaseButton },
|
||||
components: { ConfidantForm },
|
||||
computed: {
|
||||
...mapState({
|
||||
confidants: (state) => state.medical.confidantData,
|
||||
@@ -43,4 +45,8 @@ export default {
|
||||
width: fit-content
|
||||
&::-webkit-scrollbar
|
||||
width: 0
|
||||
.on-left
|
||||
margin-right: 10px
|
||||
.q-btn :deep(.q-ripple)
|
||||
display: none
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user