From cfc24483155224c3b9a4acbec32ab68a92da105c Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Tue, 13 Dec 2022 18:35:29 +0300 Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D1=80=D0=BD=D1=83=D1=8E?= =?UTF-8?q?=20=D1=84=D0=BE=D1=80=D0=BC=D1=83=20=D0=BC=D0=B5=D0=B4=20=D0=BA?= =?UTF-8?q?=D0=B0=D1=80=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ClientDetailInfoSection.vue | 2 +- .../clients/components/ClientsActionPopup.vue | 6 +- src/pages/clients/components/ClientsTable.vue | 9 ++ .../clients/components/ClientsTableRow.vue | 6 +- .../components/FormCreateMedicalCard.vue | 139 ++++++++++++++++++ src/pages/clients/utils/tableConfig.js | 4 +- src/pages/medicalCard/TheMedicalCard.vue | 13 ++ .../components/MedicalBaseData.vue | 40 +++++ .../components/MedicalCardWrapper.vue | 17 +++ 9 files changed, 230 insertions(+), 6 deletions(-) create mode 100644 src/pages/clients/components/FormCreateMedicalCard.vue create mode 100644 src/pages/medicalCard/TheMedicalCard.vue create mode 100644 src/pages/medicalCard/components/MedicalBaseData.vue create mode 100644 src/pages/medicalCard/components/MedicalCardWrapper.vue diff --git a/src/pages/clients/components/ClientDetailInfoSection.vue b/src/pages/clients/components/ClientDetailInfoSection.vue index 1cd3985..533c4fe 100644 --- a/src/pages/clients/components/ClientDetailInfoSection.vue +++ b/src/pages/clients/components/ClientDetailInfoSection.vue @@ -106,7 +106,7 @@ :style="{fontWeight:key === 'numba'&&600}", v-model:value="sectionInfo[key]", :rows="section ==='pass' ? 2 : 1", - :placeholder="settings[section].placeholder[key]" + :placeholder="settings[section].placeholder[key] || settings[section].placeholder" :sharp="settings[section].sharps[key] && section === 'pass' ? settings[section].sharps[key] : ''" ) base-input-date.input.text-sm( diff --git a/src/pages/clients/components/ClientsActionPopup.vue b/src/pages/clients/components/ClientsActionPopup.vue index ce26080..78d6b90 100644 --- a/src/pages/clients/components/ClientsActionPopup.vue +++ b/src/pages/clients/components/ClientsActionPopup.vue @@ -8,6 +8,9 @@ .button.keep-redaction.flex.gap-x-3 .icon-star-off.icon span На ведение + .button.keep-redaction.flex.gap-x-3(@click="createMedicalCard") + .icon-star-off.icon + span Мед. карта .button.delete.flex.gap-x-3( @click="transmitDeleteClient", :style="{'opacity': disabledDelete && '0.7'}" @@ -25,6 +28,7 @@ export default { props: { openChangeData: Function, disabledDelete: Boolean, + createMedicalCard: Function, }, methods: { transmitDeleteClient() { @@ -47,7 +51,7 @@ export default { diff --git a/src/pages/clients/utils/tableConfig.js b/src/pages/clients/utils/tableConfig.js index 79346ab..a6ceebf 100644 --- a/src/pages/clients/utils/tableConfig.js +++ b/src/pages/clients/utils/tableConfig.js @@ -159,9 +159,7 @@ export const detail = { join_adress: "Полный адрес", }, sharps: { join_adress: "" }, - placeholder: { - join_adress: "Введите адрес целиком", - }, + placeholder: "Введите адрес целиком", width: 292, voidHeight: 86, }, diff --git a/src/pages/medicalCard/TheMedicalCard.vue b/src/pages/medicalCard/TheMedicalCard.vue new file mode 100644 index 0000000..20d6cb4 --- /dev/null +++ b/src/pages/medicalCard/TheMedicalCard.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/medicalCard/components/MedicalBaseData.vue b/src/pages/medicalCard/components/MedicalBaseData.vue new file mode 100644 index 0000000..d6315f2 --- /dev/null +++ b/src/pages/medicalCard/components/MedicalBaseData.vue @@ -0,0 +1,40 @@ + + + + + diff --git a/src/pages/medicalCard/components/MedicalCardWrapper.vue b/src/pages/medicalCard/components/MedicalCardWrapper.vue new file mode 100644 index 0000000..4edbbf2 --- /dev/null +++ b/src/pages/medicalCard/components/MedicalCardWrapper.vue @@ -0,0 +1,17 @@ + + + + +