From 68fad367650db5fb65e5d32b063083c7e14fa2eb Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Fri, 19 May 2023 14:38:22 +0300 Subject: [PATCH 1/2] =?UTF-8?q?[WIP]=20=D0=A4=D0=B8=D0=BA=D1=81=20=D1=80?= =?UTF-8?q?=D0=B0=D0=B7=D0=BC=D0=B5=D1=80=D0=B0=20=D0=BA=D0=BD=D0=BE=D0=BF?= =?UTF-8?q?=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/newMedicalCard/components/MedicalFormWrapper.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/newMedicalCard/components/MedicalFormWrapper.vue b/src/pages/newMedicalCard/components/MedicalFormWrapper.vue index c718ae4..de5f76d 100644 --- a/src/pages/newMedicalCard/components/MedicalFormWrapper.vue +++ b/src/pages/newMedicalCard/components/MedicalFormWrapper.vue @@ -11,7 +11,7 @@ .flex.w-full.gap-11px.items-center.justify-between(v-else) span.font-bold.text-base.whitespace-nowrap {{title}} .flex.items-center.h-5(v-if="!template", :style="{color: 'var(--btn-blue-color)'}") - q-btn(no-caps, outline) + q-btn(no-caps, outline, padding="10px 24px") img.mr-2(:src="layers") span.text-smm.font-medium Шаблоны .flex.w-fit.gap-10px.items-center.delete-button.cursor-pointer(v-if="!isEdit && titleDelete" @click="deleteItem") From d6c6fc47fd8d6c3fbfb3f8fc6fc521f94c39b1ac Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Fri, 19 May 2023 18:11:47 +0300 Subject: [PATCH 2/2] =?UTF-8?q?[WIP]=20=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BA?= =?UTF-8?q?=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8,=20=D0=B4=D0=BE=D0=B1=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20?= =?UTF-8?q?=D1=84=D0=BE=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Forms/DataForm.vue | 22 ++++- .../Forms/MedicalFormTag.vue | 6 +- .../newMedicalCard/utils/medicalConfig.js | 92 +++++++++++++++++-- 3 files changed, 109 insertions(+), 11 deletions(-) diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/DataForm.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/DataForm.vue index f67cfe2..a4985e8 100644 --- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/DataForm.vue +++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/DataForm.vue @@ -33,7 +33,7 @@ .flex.flex-col.gap-y-1(v-else) .doc-text.font-medium.text-smm {{item.name.substr(0, item.name.lastIndexOf('.'))}} .title.font-medium.text-xsx {{item.size + " Мб"}} - .filter.flex.flex-col.gap-y-4(v-if="change || fillInspection") + .filter.flex.flex-col.gap-y-4.relative(v-if="change || fillInspection") .flex.gap-x-2 base-input(placeholder="Поиск", outlined, :width="232", iconLeft) q-icon(name="app:icon-search", size="20px", style="color: var(--font-grey-color)") @@ -55,11 +55,14 @@ .line.flex.gap-x-4.h-9.items-center(v-for="name in complaint?.array") q-checkbox( dense, - v-model="data.selected", + v-model="selected", :val="name?.label", :style="{border: 'none', width: '16px', height: '16px'}" ) .name.flex.items-center.font-medium.text-smm {{ name?.label }} + .flex.h-10.w-10.absolute.right-4.bottom-4 + q-btn(color="primary", dense, padding="4px 12px") + q-icon(name="app:icon-plus", size="17px") .flex.gap-x-20.w-full(v-if="change || fillInspection") .flex.flex-col.gap-y-3.w-full(v-for="file in data.results.files") .title.text-smm.font-semibold {{file.name}} @@ -109,6 +112,7 @@ export default { data() { return { change: false, + selected: [], }; }, methods: { @@ -168,6 +172,17 @@ export default { reader.readAsDataURL(file); }); }, + checkSelected() { + this.data.results.tags.forEach((com) => { + this.data.results.complaints.forEach((tag) => { + if ( + tag.label === com.label && + !this.selected.find((e) => e.label === com.label) + ) + this.selected.push(tag.label); + }); + }); + }, }, watch: { fillInspection: { @@ -177,6 +192,9 @@ export default { }, }, }, + mounted() { + this.checkSelected(); + }, }; diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue index 991ea21..6dc1467 100644 --- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue +++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue @@ -7,7 +7,6 @@ :tag="fillInspection || change" ) .protocol-body.flex.flex-col - .flex.items-center.gap-x-11px(:class="{'open-header': change || fillInspection}") .flex.gap-x-4(:style="{height: change || fillInspection ? '300px' : ''}") .flex.flex-col.gap-y-1(:class="{'open-textarea': change || fillInspection}") .tag-wrap.flex.gap-x-1.gap-y-1(v-if="!fillInspection") @@ -51,6 +50,11 @@ .flex.h-10.w-10.absolute.right-4.bottom-4 q-btn(color="primary", dense, padding="4px 12px") q-icon(name="app:icon-plus", size="17px") + + .flex(v-if="data.title === 'Осмотр полости рта' && (fillInspection || change)", :style="{color: 'var(--btn-blue-color)'}") + q-btn(no-caps, flat padding="2px 4px") + q-icon(left, name="app:plus", size="11px") + span.text-smm.font-medium Добавить описание зуба