diff --git a/package-lock.json b/package-lock.json
index 909a36b..63c3fd2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,6 @@
"moment": "^2.29.4",
"vue": "^3.2.13",
"vue-router": "^4.1.5",
- "vue-the-mask": "^0.11.1",
"vuex": "^4.0.2"
},
"devDependencies": {
@@ -11575,11 +11574,6 @@
"integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
"dev": true
},
- "node_modules/vue-the-mask": {
- "version": "0.11.1",
- "resolved": "https://registry.npmjs.org/vue-the-mask/-/vue-the-mask-0.11.1.tgz",
- "integrity": "sha512-UquSfnSWejD0zAfcD+3jJ1chUAkOAyoxya9Lxh9acCRtrlmGcAIvd0cQYraWqKenbuZJUdum+S174atv2AuEHQ=="
- },
"node_modules/vuex": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/vuex/-/vuex-4.0.2.tgz",
@@ -20940,11 +20934,6 @@
"integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
"dev": true
},
- "vue-the-mask": {
- "version": "0.11.1",
- "resolved": "https://registry.npmjs.org/vue-the-mask/-/vue-the-mask-0.11.1.tgz",
- "integrity": "sha512-UquSfnSWejD0zAfcD+3jJ1chUAkOAyoxya9Lxh9acCRtrlmGcAIvd0cQYraWqKenbuZJUdum+S174atv2AuEHQ=="
- },
"vuex": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/vuex/-/vuex-4.0.2.tgz",
diff --git a/package.json b/package.json
index 8ded5fd..d9502ff 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,6 @@
"moment": "^2.29.4",
"vue": "^3.2.13",
"vue-router": "^4.1.5",
- "vue-the-mask": "^0.11.1",
"vuex": "^4.0.2"
},
"devDependencies": {
diff --git a/src/components/base/BaseInput.vue b/src/components/base/BaseInput.vue
index 1276fbf..5fd9780 100644
--- a/src/components/base/BaseInput.vue
+++ b/src/components/base/BaseInput.vue
@@ -2,33 +2,51 @@
.flex.flex-col.gap-y-2
.label.font-semibold.text-sm.opacity-40(
v-if="label",
- :class="labelClass"
+ :class="labelClass",
+ :style="{color: 'var(--font-black-color)'}"
) {{ label }}
- .input-wrapper.flex.gap-x-2.px-4.box-border.py-10px(
- :class="{'border-none': borderNone, 'border-error': borderError }"
- :style="disabledBackgroundStyle"
+ q-input(
+ v-model="value",
+ :input-class="textClass",
+ :placeholder="placeholder",
+ :outlined="outlined",
+ :dense="dense",
+ :type="type",
+ :filled="filled",
+ :disable="disabled",
+ :rules="rule",
+ :mask="mask",
+ :maxlength="maxLength"
+ hide-bottom-space,
+ autogrow
)
- input.input.w-full.outline-0.not-italic(
- v-model="value",
- :class="textClass",
- :placeholder="placeholder",
- :disabled="disabled",
- :type="type"
- )
- slot(name='icon')
+ slot.cursor-pointer
-
-
diff --git a/src/components/base/BaseInputDate.vue b/src/components/base/BaseInputDate.vue
index e94ca5a..ceb7a5a 100644
--- a/src/components/base/BaseInputDate.vue
+++ b/src/components/base/BaseInputDate.vue
@@ -1,13 +1,12 @@
.flex.flex-col.gap-y-2
.label(v-if="!!label") {{label}}
- .field(:class="{'placeholder-color': !modelValue}")
- input(
- v-model="value",
- type="date",
- max="9999-12-31",
- min="0000-01-01"
-)
+ q-input(
+ v-model="value",
+ type="date",
+ outlined,
+ dense
+ )
-
-
diff --git a/src/pages/clients/components/ClientDetailSectionAddress.vue b/src/pages/clients/components/ClientDetailSectionAddress.vue
index 3e8d9de..f0bb291 100644
--- a/src/pages/clients/components/ClientDetailSectionAddress.vue
+++ b/src/pages/clients/components/ClientDetailSectionAddress.vue
@@ -43,7 +43,7 @@
)
base-input(
disabled,
- v-mask="'######'",
+ mask="######",
placeholder="000000",
label="Индекс",
v-model="dopeAddress.index",
@@ -55,7 +55,7 @@
diff --git a/src/pages/clients/components/ClientsTableHat.vue b/src/pages/clients/components/ClientsTableHat.vue
index a0aa22e..5bbb8f9 100644
--- a/src/pages/clients/components/ClientsTableHat.vue
+++ b/src/pages/clients/components/ClientsTableHat.vue
@@ -9,7 +9,8 @@
placeholder="Введите фамилию",
@keyup.enter="searchLastName"
)
- .icon-search
+ .flex.items-center.cursor-pointer
+ .icon-search
base-button.font-semibold(
v-if="createdClientName === ''",
@click="searchLastName",
diff --git a/src/pages/clients/components/FormCreateAddresses.vue b/src/pages/clients/components/FormCreateAddresses.vue
index ca03c76..139e516 100644
--- a/src/pages/clients/components/FormCreateAddresses.vue
+++ b/src/pages/clients/components/FormCreateAddresses.vue
@@ -12,38 +12,44 @@
.grid.grid-cols-2.gap-y-6.gap-x-4
base-input.input-info(
disabled,
+ filled,
placeholder="Введите город",
v-model="addresses.city",
label="Город"
)
base-input.input-info(
disabled,
+ filled,
placeholder="Введите область",
v-model="addresses.region",
label="Область"
)
base-input.input-info(
disabled,
+ filled,
placeholder="Введите улицу",
v-model="addresses.street",
label="Введите улицу"
)
base-input.input-info(
disabled,
+ filled,
placeholder="Номер дома",
v-model="addresses.house_number",
label="Дом"
)
base-input.input-info(
disabled,
+ filled,
placeholder="Номер квартиры",
v-model="addresses.apartment_number",
label="Квартира"
)
base-input.input-info(
disabled,
+ filled,
placeholder="000000",
- v-mask="'######'",
+ mask="######",
v-model="addresses.zip_code",
label="Индекс"
)
@@ -56,7 +62,7 @@
import BaseButton from "@/components/base/BaseButton";
import BaseInput from "@/components/base/BaseInput";
import BaseCustomSelect from "@/components/base/BaseCustomSelect";
-import { mask } from "vue-the-mask";
+
export default {
name: "FormCreateAddresses",
components: { BaseInput, BaseButton, BaseCustomSelect },
@@ -65,7 +71,6 @@ export default {
saveClient: Function,
saveFile: Function,
},
- directives: { mask },
};
diff --git a/src/pages/clients/components/FormCreateBasicInfo.vue b/src/pages/clients/components/FormCreateBasicInfo.vue
index a134313..7d7d51f 100644
--- a/src/pages/clients/components/FormCreateBasicInfo.vue
+++ b/src/pages/clients/components/FormCreateBasicInfo.vue
@@ -14,7 +14,7 @@
base-input.input-info(
v-model="phone.username",
placeholder="+7 (915) 644–92–23",
- v-mask="'+7 (###) ###-##-##'",
+ mask="+7 (###) ###-##-##",
label="Номер телефона"
)
base-input.input-info(
@@ -48,7 +48,7 @@ import BaseInputDate from "@/components/base/BaseInputDate";
import BaseAddingNetwork from "@/components/base/BaseAddingNetwork";
import { column } from "@/pages/clients/utils/tableConfig";
import BaseCustomSelect from "@/components/base/BaseCustomSelect";
-import { mask } from "vue-the-mask";
+
export default {
name: "FormCreateBasicInfo",
components: {
@@ -69,7 +69,6 @@ export default {
saveClient: Function,
addNetwork: Function,
},
- directives: { mask },
data() {
return {
networks: column.find((el) => el.name === "networks"),
diff --git a/src/pages/clients/components/FormCreateIdentityDocuments.vue b/src/pages/clients/components/FormCreateIdentityDocuments.vue
index b104114..0347a21 100644
--- a/src/pages/clients/components/FormCreateIdentityDocuments.vue
+++ b/src/pages/clients/components/FormCreateIdentityDocuments.vue
@@ -4,7 +4,7 @@
span.title-info.text-base.font-bold Паспортные данные
.grid.grid-cols-2.gap-x-4.gap-y-6
base-input.input-info(
- v-mask="'#### ######'",
+ mask="#### ######",
v-model="identityDocument.pass.series_number",
placeholder="0000 000000",
label="Серия и номер"
@@ -15,7 +15,7 @@
label="Кем выдан"
)
base-input.input-info(
- v-mask="'###-###'",
+ mask="###-###",
v-model="identityDocument.pass.issued_by_org_code",
placeholder="000–000",
label="Код подразделения"
@@ -30,14 +30,16 @@
.grid.grid-cols-2.gap-x-4.gap-y-6
base-input.input-info(
disabled,
- v-mask="'###-###-### ##'",
+ filled,
+ mask="###-###-### ##",
v-model="identityDocument.snils.number",
placeholder="000–000–000 00",
label="Номер СНИЛС"
)
base-input.input-info(
disabled,
- v-mask="'############'",
+ filled,
+ mask="############",
v-model="identityDocument.inn.number",
placeholder="000000000000",
label="Номер ИНН"
@@ -51,7 +53,7 @@
import BaseButton from "@/components/base/BaseButton";
import BaseInput from "@/components/base/BaseInput";
import BaseInputDate from "@/components/base/BaseInputDate";
-import { mask } from "vue-the-mask";
+
export default {
name: "FormCreateIdentityDocuments",
components: { BaseInput, BaseInputDate, BaseButton },
@@ -59,7 +61,6 @@ export default {
identityDocument: Object,
saveClient: Function,
},
- directives: { mask },
};
diff --git a/src/pages/clients/components/FormsAgreementCreate/AgreementPerson.vue b/src/pages/clients/components/FormsAgreementCreate/AgreementPerson.vue
index f58e5a1..8328737 100644
--- a/src/pages/clients/components/FormsAgreementCreate/AgreementPerson.vue
+++ b/src/pages/clients/components/FormsAgreementCreate/AgreementPerson.vue
@@ -16,7 +16,7 @@
base-input(
v-model="patient.seriesAndNumber",
disabled,
- v-mask="'#### ######'"
+ mask="#### ######"
label="Серия и номер"
)
.flex.justify-between
@@ -48,7 +48,7 @@
base-input(
v-model="patient.seriesAndNumber",
disabled,
- v-mask="'#### ######'"
+ mask="#### ######"
label="Серия и номер"
)
.flex.justify-between
@@ -73,7 +73,6 @@ import KitShortList from "@/components/kit/KitShortList.vue";
import KitToggle from "@/components/kit/KitToggle.vue";
//import { fetchWrapper } from "@/shared/fetchWrapper";
-import { mask } from "vue-the-mask";
export default {
name: "AgreementPerson",
components: {
@@ -84,7 +83,6 @@ export default {
KitShortList,
KitToggle,
},
- directives: { mask },
data() {
return {
patientEqualClient: true,
diff --git a/src/pages/clients/components/cells/TableCellBodyPhone.vue b/src/pages/clients/components/cells/TableCellBodyPhone.vue
index 7d90f55..f0b2cc5 100644
--- a/src/pages/clients/components/cells/TableCellBodyPhone.vue
+++ b/src/pages/clients/components/cells/TableCellBodyPhone.vue
@@ -8,13 +8,13 @@
@click.stop,
v-model="value.phone.username",
:placeholder="value.phone.username",
- v-mask="'+7 (###) ###-##-##'"
+ mask="+7 (###) ###-##-##"
)
diff --git a/src/pages/login/TheLogin.vue b/src/pages/login/TheLogin.vue
index 6047fae..7addb8a 100644
--- a/src/pages/login/TheLogin.vue
+++ b/src/pages/login/TheLogin.vue
@@ -1,29 +1,35 @@
- .login-wrapper.flex
- .left-col.flex.flex-col.items-center
+ .flex.h-full.w-full.relative.overflow-hidden
+ .left-col.flex.flex-col.items-center.justify-center
.logo-wrapper.absolute.left-12.top-12
img(:src="logoMark")
.login-panel.flex.flex-col.justify-center.gap-y-10
.flex.flex-col.gap-y-2
.text-welcome.flex.not-italic.font-bold.text-5xl Добро пожаловать!
.text-under.flex.not-italic.font-medium.text-base(
- :style="{color: this.underTextColor}") Войдите в аккаунт, чтобы начать пользоваться сервисом «Астра».
- .flex.flex-col.gap-y-5
+ :style="{color: this.underTextColor}"
+ ) Войдите в аккаунт, чтобы начать пользоваться сервисом «Астра».
+ .flex.flex-col.gap-y-2
base-input.font-medium(
- :borderError="wrongData",
+ :rule="[wrongData => !!wrongData]",
v-model="user.username",
placeholder="Введите ваш логин",
label="Логин"
)
- .flex.flex-col.gap-y-6px.relative
- .flex.non-italic.font-semibold.text-sm.opacity-40 Пароль
- base-input(
- :borderError="wrongData",
- v-model="user.password",
- :type="changeType",
- placeholder="Введите ваш пароль"
- )
- img.absolute.z-10.right-4.bottom-10px.cursor-pointer(:src="changeIcon", alt="eyePassword", @click="changeView")
+ base-input(
+ :rule="[wrongData => !!wrongData]",
+ v-model="user.password",
+ :type="changeType",
+ placeholder="Введите ваш пароль",
+ label="Пароль",
+ withIcon
+ )
+ .flex.items-center.cursor-pointer
+ q-icon(
+ v-if="!wrongData && user.password"
+ :name="isView ? 'visibility_off' : 'visibility'",
+ @click="changeView"
+ )
span.font-medium(:style="{color: this.redColor}", v-show="wrongData") Неверный логин или пароль
.flex.items-center.gap-x-11px
input.w-4.h-4.checkbox.cursor-pointer(@click="persist", type="checkbox")
@@ -37,8 +43,6 @@
import { fetchWrapper } from "@/shared/fetchWrapper";
import BaseInput from "@/components/base/BaseInput";
import BaseButton from "@/components/base/BaseButton";
-import viewPasswordIcon from "@/assets/icons/eye.svg";
-import hidePasswordIcon from "@/assets/icons/openEye.svg";
import logoMark from "@/assets/images/logoMark.svg";
export default {
name: "TheLogin",
@@ -47,8 +51,6 @@ export default {
return {
underTextColor: "var(--font-grey-color)",
isView: false,
- viewPassword: viewPasswordIcon,
- hidePassword: hidePasswordIcon,
logoMark,
authorized: true,
user: { username: "", password: "" },
@@ -60,9 +62,6 @@ export default {
wrongData() {
return !this.authorized && !this.user.username && !this.user.password;
},
- changeIcon() {
- return !this.isView ? this.viewPassword : this.hidePassword;
- },
changeType() {
return !this.isView ? "password" : "text";
},
@@ -118,28 +117,26 @@ export default {