admin/astra-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '8-editing-documents-block' into 'master'

Browse Source 
Редактирование блока документы и страховка на мед.карте, исправить отображение плашек в календаре для пациента с большим количеством контактов

See merge request astra/astra-frontend!507
This commit is contained in:
Kirill Andrusyak
2023-08-29 18:03:22 +00:00
parent 817f881159 15e31ebcd7
commit e7b9cce5a2
10 changed files with 389 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/base/BaseInput.vue
View File

@@ -55,6 +55,7 @@ export default {
default: false,
},
type: {
type: String,
default: "text",
},
accept: {

52
src/components/base/BaseInputDate.vue
View File

@@ -9,7 +9,7 @@
:readonly="readonly",
:disable="disabled",
mask="##.##.####",
:rules="[checkInput]",
:rules="[(val) => rule ? rule(val) : defaultRule(val)]",
:lazy-rules="lazyRule",
:item-aligned="itemAligned",
no-error-icon,
@@ -60,7 +60,8 @@ export default {
width: Number,
lazyRule: [Boolean, String],
itemAligned: Boolean,
modelValue: Date,
rule: Function,
modelValue: String,
placeholder: String,
disabled: Boolean,
label: String,
@@ -79,27 +80,15 @@ export default {
computed: {
value: {
get() {
if (
moment(this.modelValue).isValid() &&
typeof this.modelValue === "object"
) {
this.changeInternalDate(moment(this.modelValue));
return moment(this.modelValue).format("DD.MM.YYYY");
}
if (moment(this.convertFormat(this.modelValue)).isValid()) {
this.changeInternalDate(moment(this.modelValue));
return this.modelValue;
}
this.changeInternalDate(null);
return null;
},
set(value) {
this.$emit(
"update:modelValue",
moment(this.convertFormat(value)).isValid()
? new Date(moment(this.convertFormat(value)))
this.changeInternalDate(
moment(this.checkFormat(this.modelValue)).isValid()
? moment(this.modelValue)
: null
);
return this.convertISOFormat(this.modelValue);
},
set(value) {
this.$emit("update:modelValue", this.convertRUFormat(value));
},
},
sizeVariable() {
@@ -148,13 +137,22 @@ export default {
},
},
methods: {
convertFormat(date) {
return date && date?.length === 10
? date.split(".").reverse().join("-")
: null;
convertISOFormat(date) {
return date?.split("-")?.reverse()?.join(".");
},
checkInput(val) {
return moment(this.convertFormat(val)).isValid();
convertRUFormat(date) {
return date?.split(".")?.reverse()?.join("-");
},
checkFormat(date) {
return date && date?.length === 10 ? date : null;
},
defaultRule(val) {
return (
!val ||
moment(
this.checkFormat(val) ? this.convertRUFormat(val) : null
).isValid()
);
},
closeCalendar() {
this.calendarVisibility = false;

30
src/pages/newCalendar/components/CalendarRecordCard.vue
View File

@@ -64,15 +64,27 @@ export default {
},
computed: {
contacts() {
let contactList = this.record?.person?.contacts
?.filter(
(elem) => elem.category === "PHONE" || elem.category === "EMAIL"
)
?.map((elem) => ({
kind: elem.category,
icon: networks.find((item) => item.id === elem.category)?.icon,
value: elem.value,
}));
let contactList = [];
this.record?.person?.contacts?.find((elem) => {
if (elem.category === "PHONE") {
contactList.push({
kind: elem?.category,
icon: networks?.find((item) => item.id === elem.category)?.icon,
value: elem?.value,
});
return true;
}
});
this.record?.person?.contacts?.find((elem) => {
if (elem.category === "EMAIL") {
contactList.push({
kind: elem?.category,
icon: networks?.find((item) => item.id === elem.category)?.icon,
value: elem?.value,
});
return true;
}
});
if (this.collapsedDisplayCondition) {
contactList.length = 1;
return contactList;

2
src/pages/newCalendar/components/CreateEventForm.vue
View File

@@ -57,7 +57,7 @@ export default {
return {
patient: {},
phone: "",
birth_date: {},
birth_date: "",
time: {},
patientData: patientData,
currentStatus: patientData.statuses.find((e) => e.name === "Не принят"),

229
src/pages/newMedicalCard/components/BasicDataForms/DocumentsForm.vue
View File

@@ -19,19 +19,20 @@
q-avatar(
rounded,
size="40px",
v-if="docData[data.dataKey][field.key]?.photo"
v-if="docData[data.dataKey]?.attachments?.photo"
)
img.h-10.w-10.object-cover(
:src="docData[data.dataKey][field.key]?.photo",
:src="docData[data.dataKey]?.attachments?.photo",
:alt="docData[data.dataKey][field.label]"
)
q-badge.delete(
floating,
v-if="isEdit",
rounded,
@click="removeImage(data?.dataKey, field?.key)"
@click="removeImage(data?.dataKey, field?.key)",
:style="{padding: 0}"
)
q-icon.icon-cancel(name="app:cancel", size="8px")
q-icon.cancel-icon(name="app:cancel-mini", size="16px")
.replace-photo.font-medium.text-base.cursor-pointer(
v-if="isEdit",
@click="openModal(data.dataKey)",
@@ -44,46 +45,30 @@
base-input-date(
v-if="field.type === 'date'",
v-model="docData[data.dataKey][field.key]",
:name="field.key",
:name="data.dataKey + ':' + field.key",
@update:model-value="checkChangeDocData",
:readonly="!isEdit",
:width="302",
:mask="field?.inputMask",
:rule="[(val) => !personDataField.includes(field.key) ? checkPassportFields(val, field.rules) : field.rules(val)]",
:autogrow="field.key === 'issued_by_org'",
size="M"
:rule="(val) => !personDataField.includes(data.dataKey + ':' + field.key) ? checkPassportFields(val, field.rules) : field.rules(val)",
size="M",
)
base-input(
v-if="field.type === 'text' && field.key !== 'issued_by_org'",
v-if="field.type === 'text'",
v-model="docData[data.dataKey][field.key]",
:name="field.key",
:name="data.dataKey + ':' + 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)]",
:rule="[(val) => !personDataField.includes(data.dataKey + ':' + field.key) ? checkPassportFields(val, field.rules) : field.rules(val, initialDocData?.[data.dataKey]?.id)]",
size="M"
)
.icon-copy.my-auto.text-lg.label-field.cursor-pointer(
v-if="checkCopiedFields(field.key) && !!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>
<script>
@@ -101,7 +86,7 @@ import TheNotificationProvider from "@/components/Notifications/TheNotificationP
import { addNotification } from "@/components/Notifications/notificationContext";
import BaseInput from "@/components/base/BaseInput.vue";
import BaseInputDate from "@/components/base/BaseInputDate.vue";
import BaseTextarea from "@/components/base/BaseTextarea.vue.vue";
import { mapActions } from "vuex";
export default {
name: "DocumentsForm",
components: {
@@ -112,7 +97,6 @@ export default {
BaseUploadPhoto,
TheNotificationProvider,
BaseInputDate,
BaseTextarea,
},
data() {
return {
@@ -121,7 +105,6 @@ export default {
docData: null,
isCheckChange: false,
isLoadingData: true,
approvedPassportData: false,
copiedFields: [
"series",
"number",
@@ -130,34 +113,42 @@ export default {
],
initializationData: {
passport: {
category: "passport",
id: null,
series: null,
number: null,
issued_by_org: null,
issued_by: null,
issued_by_org_code: null,
issued_by_date: null,
photo: null,
issued_at: null,
attachments: null,
},
insurance_number: {
insurance_number: null,
photo_insurance_number: null,
id: null,
category: "insurance_number",
number: null,
attachments: null,
},
tax_identification_number: {
tax_identification_number: null,
photo_tax_identification_number: null,
id: null,
category: "tax_identification_number",
number: null,
attachments: null,
},
},
personDataField: ["insurance_number", "tax_identification_number"],
personDataField: [
"insurance_number:number",
"tax_identification_number:number",
],
showModal: false,
photoId: "",
};
},
computed: {
initialDocData() {
return this.$store.state.medical?.documents;
return this.$store.state.medical.documents;
},
passportFields() {
let excludedFields = ["photo", "id"];
let excludedFields = ["attachments", "id", "category"];
return Object.keys(this.docData.passport).filter(
(key) => !excludedFields.includes(key)
);
@@ -173,15 +164,13 @@ export default {
.getValidationComponents()
.filter((elem) => !this.personDataField.includes(elem.name))
.forEach((elem) => elem.resetValidation());
this.approvedPassportData = true;
return true;
}
this.approvedPassportData = false;
return defaultRule(val);
},
removeImage(docKey, field) {
this.docData[docKey][field] = {};
this.isCheckChange = true;
this.checkChangeDocData();
},
copyValue(text) {
navigator.clipboard.writeText(text);
@@ -190,9 +179,7 @@ export default {
return !this.isEdit && this.copiedFields.some((elem) => elem === key);
},
cancelEdit() {
this.docData = JSON.parse(JSON.stringify(this.initialDocData));
this.docData.passport.issued_by_date =
this.initialDocData?.passport?.issued_by_date;
this.docData = this.destruct(this.initialDocData);
this.isEdit = false;
this.isCheckChange = false;
this.$refs.documentForm.resetValidation();
@@ -201,7 +188,10 @@ export default {
this.isEdit = true;
},
checkChangeDocData() {
this.isCheckChange = checkChangeData(this.initialDocData, this.docData);
this.isCheckChange = checkChangeData(
this.destruct(this.initialDocData),
this.docData
);
},
openModal(id) {
this.photoId = id;
@@ -217,95 +207,48 @@ export default {
if (!validate) {
getFieldsNameUnvalidated(form).forEach((elem) => {
let error = {};
this.configData.forEach(({ fields }) => {
let findedElem = fields.find((el) => el.key === elem);
this.configData.forEach(({ dataKey, fields }) => {
let findedElem = fields.find(
(el) => dataKey + ":" + el.key === elem
);
if (findedElem) error = findedElem?.errorMessage;
});
this.addErrorNotification(error?.title, error?.message);
});
} else {
let passportFormData = new FormData();
let documentsFormData = new FormData();
form.getValidationComponents().forEach((elem) => {
if (!this.personDataField.includes(elem.name)) {
if (elem.name === "issued_by_date") {
passportFormData.append(
elem.name,
this.convertFormat(elem.modelValue) ?? ""
);
} else passportFormData.append(elem.name, elem.modelValue ?? "");
} else documentsFormData.append(elem.name, elem.modelValue ?? "");
});
this.checkChangePhoto("passport", "photo", passportFormData);
this.checkChangePhoto(
"insurance_number",
"photo_insurance_number",
documentsFormData
);
this.checkChangePhoto(
"tax_identification_number",
"photo_tax_identification_number",
documentsFormData
);
let request = [];
if (!this.approvedPassportData) {
if (!this.initialDocData.passport?.id) {
passportFormData.append("kind", "PASSPORT");
passportFormData.append(
"person",
this.$store.state.medical?.basicData?.personalData?.id
);
request.push(
this.sendData(
"general/identity_document/create/",
passportFormData
)
Object.keys(this.docData).forEach((elem) => {
this.checkChangePhoto(elem, "attachments");
let newData = JSON.parse(JSON.stringify(this.docData[elem]));
newData.attachments = {};
if (!checkChangeData(this.initialDocData?.[elem], newData)) return;
delete newData.id;
if (newData?.issued_by_org_code) {
console.log(
"passport issued_by_org_code",
newData.issued_by_org_code
);
delete newData.issued_by_org_code;
}
delete newData.attachments;
Object.keys(this.docData[elem])?.forEach((key) => {
if (!this.docData[elem]?.[key]) delete newData?.[key];
});
if (!this.initialDocData?.[elem]?.id) {
newData.person_id =
this.$store.state.medical?.basicData?.personalData?.id;
request.push(this.createData("documents/", newData));
} else {
if (this.checkPhotoDeletion("passport", "photo"))
request.push(
this.deletePhoto(
`general/identity_document/${this.initialDocData.passport?.id}/delete_photo/`
)
);
request.push(
this.sendData(
`general/identity_document/${this.initialDocData.passport?.id}/update/`,
passportFormData
this.updateData(
`documents/${this.initialDocData?.[elem]?.id}`,
newData
)
);
}
}
if (
this.checkPhotoDeletion(
"insurance_number",
"photo_insurance_number"
)
)
request.push(
this.deletePhoto(
`general/person/${this.$store.state.medical?.basicData?.personalData?.id}/delete_photo_insurance_number/`
)
);
if (
this.checkPhotoDeletion(
"tax_identification_number",
"photo_tax_identification_number"
)
)
request.push(
this.deletePhoto(
`general/person/${this.$store.state.medical?.basicData?.personalData?.id}/delete_photo_tax_identification_number/`
)
);
request.push(
this.sendData(
`general/person/${this.$store.state.medical?.basicData?.personalData?.id}/update/`,
documentsFormData
)
);
});
Promise.allSettled(request).then(() => {
this.$store.dispatch("getMedicalCardData");
this.getMedicalDataById(this.$route.params.id);
this.isEdit = false;
this.isCheckChange = false;
this.$refs.form?.resetValidation();
@@ -313,18 +256,19 @@ export default {
}
});
},
checkChangePhoto(updatedObjId, field, formData) {
checkChangePhoto(updatedObjId, field) {
if (this.docData[updatedObjId][field]?.file)
formData.append(field, this.docData[updatedObjId][field]?.file[0]);
console.log(
updatedObjId,
field,
this.docData[updatedObjId][field]?.file[0]
);
},
checkPhotoDeletion(updatedObjId, field) {
return (
!Object.keys(this.docData[updatedObjId][field]).length &&
this.initialDocData[updatedObjId][field]?.photo
);
async createData(url, body) {
return await fetchWrapper.post(url, body);
},
async sendData(url, body) {
return await fetchWrapper.post(url, body, "formData");
async updateData(url, body) {
return await fetchWrapper.patch(url, body);
},
async deletePhoto(url) {
return await fetchWrapper.del(url);
@@ -333,7 +277,19 @@ export default {
addNotification(title + message, title, message, "error", 5000);
},
convertFormat(date) {
return date ? date.split(".").reverse().join("-") : null;
return date ? date.split(".").reverse().join("-") : "";
},
...mapActions({
getMedicalDataById: "getMedicalDataById",
}),
destruct(data) {
const { passport, insurance_number, tax_identification_number } =
JSON.parse(JSON.stringify(data));
return {
passport: passport,
insurance_number: insurance_number,
tax_identification_number: tax_identification_number,
};
},
},
watch: {
@@ -341,11 +297,8 @@ export default {
deep: true,
immediate: true,
handler(value) {
if (Object.keys(value).length) {
this.docData = JSON.parse(JSON.stringify(this.initialDocData));
this.docData.passport.issued_by_date =
this.initialDocData?.passport?.issued_by_date;
} else this.docData = this.initializationData;
if (Object.keys(value).length) this.docData = this.destruct(value);
else this.docData = this.initializationData;
},
},
},
@@ -377,4 +330,6 @@ export default {
cursor: pointer
.delete
background-color: var(--btn-red-color)
.cancel-icon :deep(path)
fill: white
</style>

346
src/pages/newMedicalCard/components/BasicDataForms/InsuranceForm.vue
View File

@@ -8,7 +8,7 @@
:save="saveChange",
:cancel="cancelEdit"
)
.form-wrap.gap-24.w-full
q-form.form-wrap.gap-24.w-full(ref="insuranceForm", :no-error-focus="true")
.flex.flex-col.gap-4(v-for="insurance in insuranceConfig", :key="insurance.insuranceKey")
.font-semibold.text-sm.whitespace-nowrap {{insurance.insuranceLabel}}
.flex.w-full.justify-between.items-center.gap-4(
@@ -17,23 +17,27 @@
:style="{marginTop: field.label === 'Документы' ? '20px' : null}"
)
.label-field.font-sm.text-sm.whitespace-nowrap {{`${field.label} :`}}
.avatar-field.flex.gap-3.items-center.h-10.w-10(v-if="field.type === 'avatar'")
.flex.w-10.h-10.relative(v-if="basic[insurance.insuranceKey][field.key]?.photo")
.flex.gap-3.items-center.h-10.w-10(
v-if="field.type === 'photo'",
:style="{'min-width': field.label === 'Документы' ? '324px' : '302px'}"
)
.flex.w-10.h-10.relative(v-if="insuranceData[insurance.insuranceKey]?.attachments?.photo")
img.rounded.avatar.object-cover(
:src="basic[insurance.insuranceKey][field.key].photo",
:src="insuranceData[insurance.insuranceKey]?.attachments?.photo",
alt="AV"
)
q-badge.delete(
floating,
v-if="isEdit",
@click="removeImage(insurance?.insuranceKey, field?.key)",
rounded
rounded,
:style="{padding: 0}"
)
q-icon.icon-cancel(name="app:cancel", size="8px")
q-icon.cancel-icon(name="app:cancel-mini", size="16px")
.replace-photo.font-medium.text-base.cursor-pointer(
v-if="isEdit",
@click="changeModal(insurance.insuranceKey)"
) {{ basic[insurance.insuranceKey][field.key]?.photo ? "Заменить фото" : "Добавить фото" }}
) {{ insuranceData[insurance.insuranceKey]?.attachments?.photo ? "Заменить фото" : "Добавить фото" }}
base-modal(
v-if="insurance.insuranceKey === photoId"
v-model="showModal",
@@ -41,14 +45,14 @@
)
base-upload-photo(
:key="insurance.insuranceKey"
v-model="basic[photoId][field.key]"
v-model="insuranceData[photoId][field.key]"
:confirm-upload="confirmChangePhoto"
)
.category.flex.h-10.relative.gap-x-2(v-else-if="field.type === 'select'")
.category-select.flex.items-center.change.px-4.rounded {{selectCategory(basic[insurance.insuranceKey][field.key])}}
q-btn.change.flex.w-7.h-9.rounded-md(
v-if="isEdit",
@click="showModalCategories = true",
@click="openModalCategories",
dense,
padding="8px"
)
@@ -77,33 +81,36 @@
) {{"\xa0" + basic?.benefit[insurance?.discount] + "%"}}
.input-container.flex.flex-col.relative(v-else)
base-input(
v-model="basic[insurance.insuranceKey][field.key]",
v-model="insuranceData[insurance.insuranceKey][field.key]",
@update:model-value="checkChangeInput",
:mask="field?.inputMask",
:readonly="!isEdit",
:type="field.type",
size="M"
size="M",
:name="insurance.insuranceKey + ':' + field.key",
:rule="[(val) => checkFields(val, insurance.insuranceKey, field.rules)]"
)
q-icon.my-auto.text-lg.label-field.cursor-pointer.copy(
size="18px",
name="app:copy",
v-if="checkCopiedFields(field.key, basic[insurance.insuranceKey])",
@click="copyValue(basic[insurance.insuranceKey][field.key])"
v-if="checkCopiedFields(field.key, insuranceData[insurance.insuranceKey])",
@click="copyValue(insuranceData[insurance.insuranceKey][field.key])"
)
</template>
<script>
import { baseInsuranceForm } from "@/pages/newMedicalCard/utils/medicalConfig";
import { mapGetters, mapState } from "vuex";
import { mapActions, mapGetters, mapState } from "vuex";
import MedicalFormWrapper from "@/pages/newMedicalCard/components/MedicalFormWrapper.vue";
import BaseAvatar from "@/components/base/BaseAvatar.vue";
import { fetchWrapper } from "@/shared/fetchWrapper";
import BaseModal from "@/components/base/BaseModal.vue";
import BaseUploadPhoto from "@/components/base/BaseUploadPhoto.vue";
import BaseCategorySelection from "@/components/base/BaseCategorySelection.vue";
import { checkChangeData } from "@/shared/utils/changesObjects";
import { addNotification } from "@/components/Notifications/notificationContext";
import BaseInput from "@/components/base/BaseInput.vue";
import {
checkChangeData,
getFieldsNameUnvalidated,
} from "@/shared/utils/changesObjects.js";
export default {
name: "InsuranceForm",
@@ -125,28 +132,70 @@ export default {
showModalCategories: false,
photoId: "",
copiedFields: ["series", "number"],
insuranceData: {},
initializationData: {
OMS: {
category: "OMS",
id: null,
series: null,
number: null,
issued_by: null,
issued_at: "",
attachments: null,
},
DMS: {
category: "OMS",
id: null,
series: null,
number: null,
issued_by: null,
issued_at: "",
attachments: null,
},
},
};
},
computed: {
...mapGetters({
url: "getUrl",
avatar: "getAvatar",
initDataBasic: "getBasicData",
}),
...mapState({
basic: (state) => state.medical?.basicData,
benefitData: (state) => state.medical?.benefitData,
}),
initialDocData() {
return this.$store.state.medical.documents;
},
},
methods: {
checkFields(val, insuranceKey, defaultRule) {
const filteredFields = ["series", "number"];
if (
filteredFields?.every(
(elem) => !this.insuranceData?.[insuranceKey]?.[elem]
) &&
!this.initialDocData?.[insuranceKey]?.id
) {
this.$refs.insuranceForm
.getValidationComponents()
.filter(
(elem) =>
elem.name === `${insuranceKey}:series` ||
elem.name === `${insuranceKey}:number`
)
.forEach((elem) => elem.resetValidation());
return true;
}
return defaultRule(val);
},
filterDataBenefit(text) {
if (text.length > 1)
return this.$store.dispatch("getBenefitDataSearch", text);
this.$store.dispatch("getBenefitData", text);
},
removeImage(docKey, field) {
this.basic[docKey][field] = {};
this.isCheckChange = true;
this.insuranceData[docKey][field] = {};
this.checkChangeInput();
},
checkCopiedFields(key, item) {
return (
@@ -170,194 +219,125 @@ export default {
this.isCheckChange = true;
},
changeModal(id) {
if (id === "benefit") return;
this.photoId = id;
this.showModal = true;
},
closeModalCategories() {
this.showModalCategories = false;
},
openModalCategories() {
//if (this.isEdit) this.showModalCategories = true;
},
checkChangeInput() {
this.isCheckChange =
JSON.stringify(this.initDataBasic) !== JSON.stringify(this.basic)
? true
: false;
this.isCheckChange = checkChangeData(
this.destruct(this.initialDocData),
this.insuranceData
);
},
confirmChangePhoto() {
this.showModal = false;
this.isCheckChange = true;
},
updateBasicData() {
let insuranceDMS = this.basic.insuranceDMS;
let insuranceOMS = this.basic.insuranceOMS;
let personal = this.basic.personalData;
let benefit = this.basic.benefit;
const insuranceFormDataDMS = new FormData();
const insuranceFormDataOMS = new FormData();
const benefitFormData = new FormData();
if (insuranceDMS.series && insuranceDMS.number) {
for (let key in insuranceDMS) {
if (insuranceDMS[key] && key !== "photo" && key !== "id")
insuranceFormDataDMS.append(key, insuranceDMS[key]);
}
}
if (
insuranceDMS.photo.file &&
insuranceDMS.photo.photo !== this.initDataBasic.insuranceDMS.photo.photo
)
insuranceFormDataDMS.append("photo", insuranceDMS.photo.file[0]);
if (insuranceOMS.series && insuranceOMS.number) {
for (let key in insuranceOMS) {
if (insuranceOMS[key] && key !== "photo" && key !== "id")
insuranceFormDataOMS.append(key, insuranceOMS[key]);
}
}
if (
insuranceOMS.photo.file &&
insuranceOMS.photo.photo !== this.initDataBasic.insuranceOMS.photo.photo
)
insuranceFormDataOMS.append("photo", insuranceOMS.photo.file[0]);
const request = Object.keys(this.basic).map((key) => {
if (
key === "insuranceDMS" &&
!insuranceDMS?.id &&
insuranceDMS.series &&
insuranceDMS.number
) {
insuranceFormDataDMS.append("title", "DMS");
insuranceFormDataDMS.append("person", personal.id);
return this.sendData(
`general/insurance_policy/create/`,
insuranceFormDataDMS
);
}
if (
key === "insuranceOMS" &&
!insuranceOMS?.id &&
insuranceOMS.series &&
insuranceOMS.number
) {
insuranceFormDataOMS.append("title", "OMS");
insuranceFormDataOMS.append("person", personal.id);
return this.sendData(
`general/insurance_policy/create/`,
insuranceFormDataOMS
);
}
if (
checkChangeData(this.initDataBasic.insuranceDMS, insuranceDMS) &&
key === "insuranceDMS" &&
insuranceDMS.id
) {
this.checkedPhoto(
insuranceDMS.photo,
insuranceDMS.id,
"insurance_policy",
"delete_photo"
);
insuranceFormDataDMS.append("title", "DMS");
return this.sendData(
`general/insurance_policy/${insuranceDMS.id}/update/`,
insuranceFormDataDMS
);
} else if (
insuranceDMS.id &&
(!insuranceDMS.series || !insuranceDMS.number)
) {
this.addErrorNotification(
"Ошибка заполнения формы ДМС",
"Пожалуйста заполните все поля"
);
}
if (
checkChangeData(this.initDataBasic.insuranceOMS, insuranceOMS) &&
key === "insuranceOMS" &&
insuranceOMS.id
) {
this.checkedPhoto(
insuranceOMS.photo,
insuranceOMS.id,
"insurance_policy",
"delete_photo"
);
insuranceFormDataOMS.append("title", "OMS");
return this.sendData(
`general/insurance_policy/${insuranceOMS.id}/update/`,
insuranceFormDataOMS
);
} else if (
insuranceOMS.id &&
(!insuranceOMS.series || !insuranceOMS.number)
) {
this.addErrorNotification(
"Ошибка заполнения формы ОМС",
"Пожалуйста заполните все поля"
);
}
if (
checkChangeData(this.initDataBasic.benefit, benefit) &&
key === "benefit"
) {
this.checkedPhoto(
benefit.photo,
personal.id,
"person",
"delete_photo_benefit"
);
fetchWrapper.post(`general/person/${personal.id}/update/`, {
benefit: benefit.id,
saveChange() {
const form = this.$refs.insuranceForm;
form.validate().then((validate) => {
if (!validate) {
getFieldsNameUnvalidated(form).forEach((elem) => {
let error = {};
this.insuranceConfig.forEach(({ insuranceKey, fields }) => {
let findedElem = fields.find(
(el) => insuranceKey + ":" + el.key === elem
);
if (findedElem) error = findedElem?.errorMessage;
});
this.addErrorNotification(error?.title, error?.message);
});
if (
benefit.photo.file &&
benefit.photo.photo !== this.initDataBasic.benefit.photo.photo
) {
benefitFormData.append("photo_benefit", benefit.photo.file[0]);
return this.sendData(
`general/person/${personal.id}/update/`,
benefitFormData
);
}
} else {
let request = [];
Object.keys(this.insuranceData).forEach((elem) => {
this.checkChangePhoto(elem, "attachments");
let newData = JSON.parse(JSON.stringify(this.insuranceData[elem]));
newData.attachments = {};
if (!checkChangeData(this.initialDocData?.[elem], newData)) return;
delete newData.id;
delete newData.attachments;
Object.keys(this.insuranceData[elem])?.forEach((key) => {
if (!this.insuranceData?.[elem]?.[key]) delete newData?.[key];
});
if (!this.initialDocData?.[elem]?.id) {
newData.person_id =
this.$store.state.medical?.basicData?.personalData?.id;
request.push(this.createData("documents/", newData));
} else
request.push(
this.updateData(
`documents/${this.initialDocData?.[elem]?.id}`,
newData
)
);
});
if (request.length)
Promise.allSettled(request).then(() => {
this.getMedicalDataById(this.$route.params.id);
this.isEdit = false;
this.isCheckChange = false;
this.$refs.form?.resetValidation();
});
}
});
return request;
},
checkedPhoto(photo, id, key, title) {
if (!photo?.photo) {
return this.delPhoto(`general/${key}/${id}/${title}/`);
}
checkChangePhoto(updatedObjId, field) {
if (this.insuranceData[updatedObjId][field]?.file)
console.log(
updatedObjId,
field,
this.insuranceData[updatedObjId][field]?.file[0]
);
},
addErrorNotification(title, message) {
addNotification(title + message, title, message, "error", 5000);
},
async sendData(url, body) {
return await fetchWrapper.post(url, body, "formData");
async createData(url, body) {
return await fetchWrapper.post(url, body);
},
async delPhoto(url) {
return await fetchWrapper.del(url);
async updateData(url, body) {
return await fetchWrapper.patch(url, body);
},
cancelEdit() {
this.$store.dispatch("returnInitData");
this.insuranceData = this.destruct(this.initialDocData);
this.isEdit = false;
this.isCheckChange = false;
},
openEdit() {
this.isEdit = true;
},
saveChange() {
this.isLoadingData = true;
let updateBasic = this.updateBasicData();
Promise.allSettled(updateBasic)
.then(() => this.$store.dispatch("getMedicalCardData"))
.then(() => {
this.isLoadingData = false;
this.isEdit = false;
this.isCheckChange = false;
});
destruct(data) {
const { OMS, DMS } = JSON.parse(JSON.stringify(data));
return {
OMS: OMS,
DMS: DMS,
};
},
...mapActions({
getMedicalDataById: "getMedicalDataById",
}),
},
watch: {
showModalCategories: {
immediate: true,
handler(newVal) {
if (newVal) this.$store.dispatch("getBenefitData");
},
},
initialDocData: {
deep: true,
immediate: true,
handler(newVal) {
if (Object.keys(newVal).length) {
this.insuranceData = this.destruct(newVal);
} else this.insuranceData = this.initializationData;
},
},
},
};
@@ -371,9 +351,6 @@ export default {
background: rgba(0, 0, 0, 0.05)
color: var(--font-dark-blue-color)
.avatar-field
min-width: 302px
.avatar
height: 100%
@@ -434,4 +411,7 @@ export default {
.q-field--outlined.q-field--readonly :deep(.q-field__native)
cursor: default
.cancel-icon :deep(path)
fill: white
</style>

18
src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolCreateModal.vue
View File

@@ -64,7 +64,7 @@ export default {
data() {
return {
protocolData: {
date: null,
date: "",
startTime: null,
},
};
@@ -96,19 +96,27 @@ export default {
...mapActions({
createProtocol: "createProtocol",
}),
checkFormat(date) {
return date && date?.length === 10 ? date : null;
},
saveProtocol() {
if (
!Object.keys(this.protocolData).every((key) => this.protocolData[key])
) {
)
return;
}
let time = this.protocolData.startTime.split(":");
let start = moment(this.protocolData.date).hour(time[0]).minute(time[1]);
let start = moment(this.checkFormat(this.protocolData.date))
?.hour(time[0])
?.minute(time[1]);
let createdProtocol = {
start: start.isValid() ? start.format() : null,
end: start.isValid() ? start.add(30, "m").format() : null,
status: null,
};
if (
Object.keys(createdProtocol)?.some((elem) => !createdProtocol?.[elem])
)
return;
createdProtocol.status = null;
this.createProtocol(createdProtocol);
this.changeShownCreateModal(false);
this.createInspection();

56
src/pages/newMedicalCard/utils/medicalConfig.js
View File

@@ -379,47 +379,63 @@ export const baseInfoMenu = [
export const baseInsuranceForm = [
{
insuranceLabel: "ОМС",
insuranceKey: "insuranceOMS",
insuranceKey: "OMS",
fields: [
{
key: "series",
label: "Серия",
type: "text",
inputMask: "####",
rules: (val) => ruleNotValue(val),
errorMessage: {
title: "Ошибка валидации",
message: "Серия полиса ОМС не заполнена",
},
},
{
key: "number",
label: "Номер",
type: "text",
inputMask: "####-####-####",
rules: (val) => ruleNotValue(val),
errorMessage: {
title: "Ошибка валидации",
message: "Номер полиса ОМС не заполнен",
},
},
{
key: "photo",
key: "attachments",
label: "Фото ОМС",
type: "avatar",
type: "photo",
},
],
},
{
insuranceLabel: "ДМС",
insuranceKey: "insuranceDMS",
insuranceKey: "DMS",
fields: [
{
key: "series",
label: "Серия",
type: "text",
inputMask: "####",
rules: (val) => ruleNotValue(val),
errorMessage: {
title: "Ошибка валидации",
message: "Серия полиса ДМС не заполнена",
},
},
{
key: "number",
label: "Номер",
type: "text",
inputMask: "####-####-####",
rules: (val) => ruleNotValue(val),
errorMessage: {
title: "Ошибка валидации",
message: "Номер полиса ДМС не заполнен",
},
},
{
key: "photo",
key: "attachments",
label: "Фото ДМС",
type: "avatar",
type: "photo",
},
],
},
@@ -436,7 +452,7 @@ export const baseInsuranceForm = [
{
key: "photo",
label: "Документы",
type: "avatar",
type: "photo",
},
],
},
@@ -475,7 +491,7 @@ export const documentForm = [
rules: (val) => ruleLengthValue(val, 6),
},
{
key: "issued_by_org",
key: "issued_by",
label: "Кем выдан",
type: "text",
errorMessage: {
@@ -496,7 +512,7 @@ export const documentForm = [
rules: (val) => ruleLengthValue(val, 7),
},
{
key: "issued_by_date",
key: "issued_at",
label: "Дата выдачи",
type: "date",
rules: (val) => ruleDateValue(val),
@@ -506,7 +522,7 @@ export const documentForm = [
},
},
{
key: "photo",
key: "attachments",
label: "Фото паспорта",
type: "photo",
},
@@ -517,7 +533,7 @@ export const documentForm = [
dataKey: "insurance_number",
fields: [
{
key: "insurance_number",
key: "number",
label: "Номер СНИЛС",
type: "text",
inputMask: "###-###-### ##",
@@ -525,10 +541,10 @@ export const documentForm = [
title: "Ошибка валидации",
message: "СНИЛС содержит менее 11 цифр",
},
rules: (val) => ruleOptionalFields(val, 14),
rules: (val, id) => ruleOptionalFields(val, 14, id),
},
{
key: "photo_insurance_number",
key: "attachments",
label: "Фото СНИЛС",
type: "photo",
},
@@ -539,7 +555,7 @@ export const documentForm = [
dataKey: "tax_identification_number",
fields: [
{
key: "tax_identification_number",
key: "number",
label: "Номер ИНН",
type: "text",
inputMask: "############",
@@ -547,10 +563,10 @@ export const documentForm = [
title: "Ошибка валидации",
message: "ИНН содержит менее 12 цифр",
},
rules: (val) => ruleOptionalFields(val, 12),
rules: (val, id) => ruleOptionalFields(val, 12, id),
},
{
key: "photo_tax_identification_number",
key: "attachments",
label: "Фото ИНН",
type: "photo",
},

11
src/shared/utils/rulesInputs.js
View File

@@ -1,4 +1,5 @@
import * as moment from "moment/moment";
export function ruleNotValue(val, text) {
return !!val || text || false;
}
@@ -7,8 +8,8 @@ export function ruleLengthValue(val, minLength, text) {
return (val && val.length === minLength) || text || false;
}
export function ruleOptionalFields(val, minLength, text) {
return !val || val.length === minLength || text || false;
export function ruleOptionalFields(val, minLength, id, text) {
return (!val && !id) || val.length === minLength || text || false;
}
export function ruleEmailValue(val, text) {
@@ -21,12 +22,16 @@ export function ruleMaxLength(val, maxLength, text) {
}
export function ruleDateValue(val, text) {
let date = moment(
val && val?.length === 10 ? val.split(".").reverse().join("-") : null
);
return (
(val && !moment(val).isAfter(moment().format("YYYY-MM-DD"))) ||
(date.isValid() && !date.isAfter(moment().format("YYYY-MM-DD"))) ||
text ||
false
);
}
export function ruleNumberInput(val, max, min, text) {
return (val <= max && val >= min) || text || false;
}

106
src/store/modules/medicalCard.js
View File

@@ -34,20 +34,6 @@ const state = () => ({
house: null,
flat: null,
},
insuranceDMS: {
series: null,
number: null,
photo: null,
id: null,
organization: null,
},
insuranceOMS: {
series: null,
number: null,
photo: null,
id: null,
organization: null,
},
benefit: {
id: null,
discount: null,
@@ -142,8 +128,6 @@ const getters = {
(el) => el.category === "CURRENT_ADDRESS"
) || {};
let person = state.medicalCard.person;
let OMS = person?.insurance_policy?.find((e) => e.title === "OMS");
let DMS = person?.insurance_policy?.find((e) => e.title === "DMS");
return {
personalData: {
last_name: person?.last_name || "",
@@ -153,7 +137,7 @@ const getters = {
(person?.gender &&
genderOptions.find((el) => el.id === person?.gender)) ||
"",
birth_date: person?.birth_date ? new Date(person?.birth_date) : "",
birth_date: person?.birth_date || "",
photo: person?.photo
? {
photo: rootState.getUrl + person.photo,
@@ -176,30 +160,6 @@ const getters = {
house: residenceAddress?.house || "",
flat: residenceAddress?.flat || "",
},
insuranceDMS: {
series: DMS?.series,
number: DMS?.number,
photo: DMS?.photo
? {
photo: rootState.getUrl + DMS?.photo,
file: null,
}
: {},
id: DMS?.id,
organization: DMS?.organization,
},
insuranceOMS: {
series: OMS?.series,
number: OMS?.number,
photo: OMS?.photo
? {
photo: rootState.getUrl + OMS?.photo,
file: null,
}
: {},
id: OMS?.id,
organization: OMS?.organization,
},
benefit: {
name: person?.benefit?.name,
id: person?.benefit?.id,
@@ -214,46 +174,38 @@ const getters = {
};
},
getDocumentsData(state, rootState) {
let person = state.medicalCard?.person;
const passport = person?.identity_document?.find(
(el) => el.kind === "PASSPORT"
);
return {
passport: {
id: passport?.id ?? "",
series: passport?.series ?? "",
number: passport?.number ?? "",
issued_by_org: passport?.issued_by_org ?? "",
issued_by_org_code: passport?.issued_by_org_code ?? "",
issued_by_date: passport?.issued_by_date
? new Date(passport?.issued_by_date)
: null,
photo: passport?.photo
const fields = [
"passport",
"insurance_number",
"tax_identification_number",
"OMS",
"DMS",
];
let result = {};
fields.forEach((elem) => {
const document = state.medicalCard?.person?.documents?.find(
({ category }) => category === elem
);
const isPassport = elem === "passport";
const isPolicy = elem === "OMS" || elem === "DMS";
result[elem] = {
category: elem,
id: document?.id || "",
series: document?.series || (isPolicy || isPassport ? "" : "000"),
number: document?.number || "",
issued_by: document?.issued_by || (isPassport ? "" : "000"),
issued_by_org_code:
document?.issued_by_org_code || (isPassport ? "000-000" : ""),
issued_at: document?.issued_at || "",
attachments: document?.attachments?.length
? {
photo: rootState.getUrl + passport.photo,
photo: rootState.getUrl + document?.attachments?.[0],
file: null,
}
: {},
},
insurance_number: {
insurance_number: person?.insurance_number ?? "",
photo_insurance_number: person?.photo_insurance_number
? {
photo: rootState.getUrl + person.photo_insurance_number,
file: null,
}
: {},
},
tax_identification_number: {
tax_identification_number: person?.tax_identification_number ?? "",
photo_tax_identification_number: person?.photo_tax_identification_number
? {
photo: rootState.getUrl + person?.photo_tax_identification_number,
file: null,
}
: {},
},
};
};
});
return result;
},
getContactsData(state) {
let phones =