[WIP] Фикс конфига статусов

This commit is contained in:
megavrilinvv
2023-07-26 17:02:48 +03:00
parent f113e8ebf5
commit d4aa75a690
3 changed files with 50 additions and 46 deletions

View File

@@ -43,8 +43,7 @@
<script>
import * as moment from "moment/moment";
import {
recordingStatuses,
medicalСardStatuses,
statuses,
networks,
} from "@/pages/newCalendar/utils/calendarConfig.js";
import { trimName } from "@/pages/newCalendar/utils/calendarFunctions.js";
@@ -80,12 +79,12 @@ export default {
return !this.bodyClass?.["flex-col"] && !this.expandedType;
},
recordingStatus() {
return recordingStatuses.find(
return statuses[0].data.find(
(elem) => elem.value === this.record?.status
);
},
medicalСardStatus() {
return medicalСardStatuses.find(
return statuses[1].data.find(
(elem) => elem.value === this.record?.medicalCard?.status
);
},

View File

@@ -52,7 +52,7 @@ import { trimName } from "@/pages/newCalendar/utils/calendarFunctions.js";
import {
recordList,
recordPreviewConfig,
recordingStatuses,
statuses,
} from "@/pages/newCalendar/utils/calendarConfig.js";
export default {
name: "CalendarRecordPreview",
@@ -93,14 +93,12 @@ export default {
return this.start?.format("HH:mm") + " " + this.end?.format("HH:mm");
},
statusLabel() {
return recordingStatuses.find(
(elem) => elem.value === this.record?.status
).label;
return statuses[0].data.find((elem) => elem.value === this.record?.status)
.label;
},
statusIcon() {
return recordingStatuses.find(
(elem) => elem.value === this.record?.status
).icon;
return statuses[0].data.find((elem) => elem.value === this.record?.status)
.icon;
},
memberData() {
return this.record?.member;

View File

@@ -42,7 +42,10 @@ export const networks = [
},
];
export const recordingStatuses = [
export const statuses = [
{
name: "recording",
data: [
{
label: "Не принят",
icon: not_accepted,
@@ -63,9 +66,11 @@ export const recordingStatuses = [
icon: reception,
value: "reception",
},
];
export const medicalСardStatuses = [
],
},
{
name: "medicalCard",
data: [
{
label: "Не заполнена",
icon: not_filled,
@@ -81,6 +86,8 @@ export const medicalСardStatuses = [
icon: filled,
value: "filled",
},
],
},
];
// TODO Статусы приема и статусы заполнения медкарты должны быть общими, чтобы не дублировать в каждом экспорте. Исправить