From 4f9041d7f06f280f1f1e2aab1e24eeb9b9bcea03 Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Mon, 24 Apr 2023 12:41:31 +0300 Subject: [PATCH] =?UTF-8?q?WIP=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BE=D1=87=D0=B8=D1=81=D1=82=D0=BA=D0=B8=20=D0=BF?= =?UTF-8?q?=D0=B0=D1=81=D0=BF=D0=BE=D1=80=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/BasicDataForms/DocumentsForm.vue | 5 ++++- src/pages/newMedicalCard/utils/medicalConfig.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/newMedicalCard/components/BasicDataForms/DocumentsForm.vue b/src/pages/newMedicalCard/components/BasicDataForms/DocumentsForm.vue index 95742fe..40cd6ae 100644 --- a/src/pages/newMedicalCard/components/BasicDataForms/DocumentsForm.vue +++ b/src/pages/newMedicalCard/components/BasicDataForms/DocumentsForm.vue @@ -137,7 +137,10 @@ export default { }, methods: { checkPassportFields(val, defaultRule) { - if (this.passportFields.every((elem) => !this.docData.passport[elem])) { + if ( + this.passportFields.every((elem) => !this.docData.passport[elem]) && + !this.initialDocData.passport.series + ) { this.$refs.documentForm .getValidationComponents() .filter((elem) => !this.personDataField.includes(elem.name)) diff --git a/src/pages/newMedicalCard/utils/medicalConfig.js b/src/pages/newMedicalCard/utils/medicalConfig.js index a739be9..e9d4c6c 100644 --- a/src/pages/newMedicalCard/utils/medicalConfig.js +++ b/src/pages/newMedicalCard/utils/medicalConfig.js @@ -417,7 +417,7 @@ export const documentForm = [ rules: (val) => ruleDateValue(val), errorMessage: { title: "Ошибка валидации", - message: "Дата выдачи паспорта позднее текущего дня", + message: "Дата выдачи паспорта позднее текущего дня или не заполнена", }, }, {