Исправила мелкие несоответствия
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
<template lang="pug">
|
<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(
|
q-input.input(
|
||||||
v-model="value",
|
v-model="value",
|
||||||
:name="name",
|
:name="name",
|
||||||
@@ -58,6 +58,10 @@ export default {
|
|||||||
readonly: Boolean,
|
readonly: Boolean,
|
||||||
name: String,
|
name: String,
|
||||||
height: String,
|
height: String,
|
||||||
|
padding: {
|
||||||
|
type: String,
|
||||||
|
default: "12px 16px",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
emits: ["update:modelValue"],
|
emits: ["update:modelValue"],
|
||||||
computed: {
|
computed: {
|
||||||
@@ -69,6 +73,11 @@ export default {
|
|||||||
this.$emit("update:modelValue", value);
|
this.$emit("update:modelValue", value);
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
paddingVariable() {
|
||||||
|
return {
|
||||||
|
"--padding": this.padding,
|
||||||
|
};
|
||||||
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
@@ -82,7 +91,7 @@ export default {
|
|||||||
font-size: 16px
|
font-size: 16px
|
||||||
line-height: normal
|
line-height: normal
|
||||||
color: var(--font-dark-blue-color)
|
color: var(--font-dark-blue-color)
|
||||||
padding: 12px 16px
|
padding: var(--padding)
|
||||||
&::placeholder
|
&::placeholder
|
||||||
color: var(--font-grey-color)
|
color: var(--font-grey-color)
|
||||||
opacity: 1
|
opacity: 1
|
||||||
|
|||||||
@@ -23,6 +23,7 @@
|
|||||||
no-caps,
|
no-caps,
|
||||||
label="Полная медкарта",
|
label="Полная медкарта",
|
||||||
:style="{'font-weight': 500}"
|
:style="{'font-weight': 500}"
|
||||||
|
size="14px"
|
||||||
)
|
)
|
||||||
q-icon.arrow(name="app:long-arrow", size="18px", right)
|
q-icon.arrow(name="app:long-arrow", size="18px", right)
|
||||||
.flex.gap-x-1.flex-1.h-full(v-if="field?.title === 'Услуги'")
|
.flex.gap-x-1.flex-1.h-full(v-if="field?.title === 'Услуги'")
|
||||||
|
|||||||
@@ -52,7 +52,7 @@
|
|||||||
)
|
)
|
||||||
.footer.flex.gap-2
|
.footer.flex.gap-2
|
||||||
base-button(type="secondary", label="Отменить", width="126px", @click="closeForm")
|
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>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|||||||
@@ -54,7 +54,7 @@
|
|||||||
size="M"
|
size="M"
|
||||||
)
|
)
|
||||||
base-input(
|
base-input(
|
||||||
v-if="field.type === 'text'",
|
v-if="field.type === 'text' && field.key !== 'issued_by_org'",
|
||||||
v-model="docData[data.dataKey][field.key]",
|
v-model="docData[data.dataKey][field.key]",
|
||||||
:name="field.key",
|
:name="field.key",
|
||||||
@update:model-value="checkChangeDocData",
|
@update:model-value="checkChangeDocData",
|
||||||
@@ -63,13 +63,27 @@
|
|||||||
:width="302",
|
:width="302",
|
||||||
:mask="field?.inputMask",
|
:mask="field?.inputMask",
|
||||||
:rule="[(val) => !personDataField.includes(field.key) ? checkPassportFields(val, field.rules) : field.rules(val)]",
|
:rule="[(val) => !personDataField.includes(field.key) ? checkPassportFields(val, field.rules) : field.rules(val)]",
|
||||||
:autogrow="field.key === 'issued_by_org'",
|
size="M"
|
||||||
:size="field.key !== 'issued_by_org' ? 'M' : 'auto'"
|
|
||||||
)
|
)
|
||||||
.icon-copy.my-auto.text-lg.label-field.cursor-pointer(
|
.icon-copy.my-auto.text-lg.label-field.cursor-pointer(
|
||||||
v-if="checkCopiedFields(field.key) && !!docData[data.dataKey][field.key]",
|
v-if="checkCopiedFields(field.key) && !!docData[data.dataKey][field.key]",
|
||||||
@click="copyValue(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>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
@@ -87,6 +101,7 @@ import TheNotificationProvider from "@/components/Notifications/TheNotificationP
|
|||||||
import { addNotification } from "@/components/Notifications/notificationContext";
|
import { addNotification } from "@/components/Notifications/notificationContext";
|
||||||
import BaseInput from "@/components/base/BaseInput.vue";
|
import BaseInput from "@/components/base/BaseInput.vue";
|
||||||
import BaseInputDate from "@/components/base/BaseInputDate.vue";
|
import BaseInputDate from "@/components/base/BaseInputDate.vue";
|
||||||
|
import BaseTextarea from "@/components/base/BaseTextarea.vue.vue";
|
||||||
export default {
|
export default {
|
||||||
name: "DocumentsForm",
|
name: "DocumentsForm",
|
||||||
components: {
|
components: {
|
||||||
@@ -97,6 +112,7 @@ export default {
|
|||||||
BaseUploadPhoto,
|
BaseUploadPhoto,
|
||||||
TheNotificationProvider,
|
TheNotificationProvider,
|
||||||
BaseInputDate,
|
BaseInputDate,
|
||||||
|
BaseTextarea,
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
multiple,
|
multiple,
|
||||||
title-type="снимок",
|
title-type="снимок",
|
||||||
:returned-fields="['photo', 'id', 'name', 'size']"
|
: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")
|
.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
|
.flex.items-center
|
||||||
img.grey-border.rounded.w-8.h-8.mr-3(:src="picture.photo")
|
img.grey-border.rounded.w-8.h-8.mr-3(:src="picture.photo")
|
||||||
@@ -36,7 +36,7 @@
|
|||||||
label="Отменить"
|
label="Отменить"
|
||||||
)
|
)
|
||||||
base-button(
|
base-button(
|
||||||
width="126px",
|
width="132px",
|
||||||
label="Сохранить",
|
label="Сохранить",
|
||||||
@click="createNewEntry",
|
@click="createNewEntry",
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user