Merge branch 'H-1' into 'master'
Изменил роутинг на страницу новой мед-карты See merge request andrusyakka/urban-couscous!287
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import { dentalСonditionMap } from "@/pages/medicalCard/utils/medicalConfig";
|
||||
import { dentalСonditionMap } from "@/pages/oldMedicalCard/utils/medicalConfig";
|
||||
const dentalCondition = dentalСonditionMap.map((den) => den.name);
|
||||
export const ruleDentalCondition = (val) => {
|
||||
return dentalCondition.includes(val);
|
||||
|
||||
@@ -21,9 +21,9 @@
|
||||
<script>
|
||||
import BaseInput from "@/components/base/BaseInput";
|
||||
import BaseSelect from "@/components/base/BaseSelect";
|
||||
import MedicalBaseData from "@/pages/medicalCard/components/MedicalBaseData";
|
||||
import MedicalIdentityDocuments from "@/pages/medicalCard/components/MedicalIdentityDocuments";
|
||||
import MedicalPolicyDocuments from "@/pages/medicalCard/components/MedicalPolicyDocuments";
|
||||
import MedicalBaseData from "@/pages/oldMedicalCard/components/MedicalBaseData";
|
||||
import MedicalIdentityDocuments from "@/pages/oldMedicalCard/components/MedicalIdentityDocuments";
|
||||
import MedicalPolicyDocuments from "@/pages/oldMedicalCard/components/MedicalPolicyDocuments";
|
||||
import { requestMedicalCardData } from "@/pages/clients/utils/wrapperClientForm";
|
||||
import { fetchWrapper } from "@/shared/fetchWrapper.js";
|
||||
import { v_model } from "@/shared/mixins/v-model";
|
||||
|
||||
8
src/pages/newMedicalCard/TheMedicalCard.vue
Normal file
8
src/pages/newMedicalCard/TheMedicalCard.vue
Normal file
@@ -0,0 +1,8 @@
|
||||
<template lang="pug">
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: "TheMedicalCard",
|
||||
};
|
||||
</script>
|
||||
@@ -3,7 +3,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import MedicalCardWrapper from "@/pages/medicalCard/components/MedicalCardWrapper";
|
||||
import MedicalCardWrapper from "@/pages/oldMedicalCard/components/MedicalCardWrapper";
|
||||
export default {
|
||||
name: "TheMedicalCard",
|
||||
components: { MedicalCardWrapper },
|
||||
@@ -66,7 +66,7 @@
|
||||
import BaseInput from "@/components/base/BaseInput";
|
||||
import BaseSelect from "@/components/base/BaseSelect";
|
||||
import BaseRadioButtonsGroup from "@/components/base/BaseRadioButtonsGroup.vue";
|
||||
import { medicalDetailConfig } from "@/pages/medicalCard/utils/medicalConfig.js";
|
||||
import { medicalDetailConfig } from "@/pages/oldMedicalCard/utils/medicalConfig.js";
|
||||
|
||||
export default {
|
||||
name: "MedicalBaseData",
|
||||
@@ -109,19 +109,19 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import MedicalCardHeader from "@/pages/medicalCard/components/MedicalCardHeader.vue";
|
||||
import MedicalDentalFormula from "@/pages/medicalCard/components/MedicalDentalFormula.vue";
|
||||
import MedicalCardHeader from "@/pages/oldMedicalCard/components/MedicalCardHeader.vue";
|
||||
import MedicalDentalFormula from "@/pages/oldMedicalCard/components/MedicalDentalFormula.vue";
|
||||
import BaseDetailInput from "@/components/base/BaseDetailInput.vue";
|
||||
import BaseDetailInfo from "@/components/base/BaseDetailInfo.vue";
|
||||
import { formulaDataMap } from "@/pages/medicalCard/utils/medicalConfig";
|
||||
import { medicalDetailConfig } from "@/pages/medicalCard/utils/medicalConfig";
|
||||
import { mobilityMap } from "@/pages/medicalCard/utils/medicalConfig";
|
||||
import { formulaDataMap } from "@/pages/oldMedicalCard/utils/medicalConfig";
|
||||
import { medicalDetailConfig } from "@/pages/oldMedicalCard/utils/medicalConfig";
|
||||
import { mobilityMap } from "@/pages/oldMedicalCard/utils/medicalConfig";
|
||||
import {
|
||||
getDentalEntiesValue,
|
||||
requestUpdateMedicalCard,
|
||||
requestCreateMedicalCard,
|
||||
getRequestDataPerson,
|
||||
} from "@/pages/medicalCard/utils/wrapperMedicalCard";
|
||||
} from "@/pages/oldMedicalCard/utils/wrapperMedicalCard";
|
||||
import { fetchWrapper } from "@/shared/fetchWrapper";
|
||||
import BaseInput from "@/components/base/BaseInput.vue";
|
||||
import ClientDetailInput from "@/pages/clients/components/ClientDetailInput.vue";
|
||||
@@ -17,8 +17,8 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { dentalСonditionMap } from "@/pages/medicalCard/utils/medicalConfig";
|
||||
import MedicalFormulaTable from "@/pages/medicalCard/components/MedicalFormulaTable.vue";
|
||||
import { dentalСonditionMap } from "@/pages/oldMedicalCard/utils/medicalConfig";
|
||||
import MedicalFormulaTable from "@/pages/oldMedicalCard/components/MedicalFormulaTable.vue";
|
||||
export default {
|
||||
name: "MedicalDentalFormula",
|
||||
components: { MedicalFormulaTable },
|
||||
@@ -15,7 +15,7 @@
|
||||
import { ruleDentalCondition } from "@/assets/rules/rulesInput";
|
||||
import BaseInput from "@/components/base/BaseInput.vue";
|
||||
import BaseSelect from "@/components/base/BaseSelect.vue";
|
||||
import { mobilityMap } from "@/pages/medicalCard/utils/medicalConfig";
|
||||
import { mobilityMap } from "@/pages/oldMedicalCard/utils/medicalConfig";
|
||||
export default {
|
||||
name: "MedicalFormulaTable",
|
||||
components: { BaseInput, BaseSelect },
|
||||
@@ -64,7 +64,7 @@
|
||||
import BaseInput from "@/components/base/BaseInput";
|
||||
import BaseSelect from "@/components/base/BaseSelect";
|
||||
import BaseRadioButtonsGroup from "@/components/base/BaseRadioButtonsGroup.vue";
|
||||
import { medicalDetailConfig } from "@/pages/medicalCard/utils/medicalConfig.js";
|
||||
import { medicalDetailConfig } from "@/pages/oldMedicalCard/utils/medicalConfig.js";
|
||||
|
||||
export default {
|
||||
name: "MedicalPolicyDocuments",
|
||||
@@ -4,7 +4,7 @@ import TheUser from "@/pages/clients/TheClients";
|
||||
import TheSettings from "@/pages/settings/TheSettings";
|
||||
import TheLogin from "@/pages/login/TheLogin";
|
||||
import LoggedInLayout from "@/components/LoggedInLayout";
|
||||
import TheMedicalCard from "@/pages/medicalCard/TheMedicalCard";
|
||||
import TheMedicalCard from "@/pages/newMedicalCard/TheMedicalCard";
|
||||
|
||||
const ifNotAuthenticated = (to, from, next) => {
|
||||
if (!localStorage.getItem("tokenAccess")) {
|
||||
|
||||
Reference in New Issue
Block a user