From 5863c07e70aa9a44a9343ad71bca456615aa3749 Mon Sep 17 00:00:00 2001 From: DwCay Date: Mon, 31 Oct 2022 21:51:13 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20=D0=B2=20=D0=BE?= =?UTF-8?q?=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=20=D1=81?= =?UTF-8?q?=D0=B5=D0=BB=D0=B5=D0=BA=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/calendar-input.svg | 4 ++ src/components/base/BaseSelect.vue | 54 ++++++++----------- .../clients/components/ClientsFormCreate.vue | 18 ++----- .../components/FormCreateBasicInfo.vue | 5 +- 4 files changed, 33 insertions(+), 48 deletions(-) create mode 100644 src/assets/icons/calendar-input.svg diff --git a/src/assets/icons/calendar-input.svg b/src/assets/icons/calendar-input.svg new file mode 100644 index 0000000..0df5d98 --- /dev/null +++ b/src/assets/icons/calendar-input.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/components/base/BaseSelect.vue b/src/components/base/BaseSelect.vue index 3f7a42a..f03dc5b 100644 --- a/src/components/base/BaseSelect.vue +++ b/src/components/base/BaseSelect.vue @@ -3,36 +3,34 @@ @click="openSelect" :class="{border: styleBorder, 'py-2.5 px-4':!forNetworks, 'justify-center':forNetworks, 'justify-between':!forNetworks}" ) - .flex.mr-2 + .flex.mr-2(v-if="!forNetworks") input.text-base.select.cursor-pointer( :size="sizeInput" - v-if="!forNetworks" v-model="optionData" :placeholder="placeholder" disabled - ) - .absolute.options.top-12.left-0( - v-show="isSelectOpen" - :id="id" - ) - .option.px-4.py-1( - v-for="responsible in listData" - @click="(e) => chooseOption(e)" - :key="responsible" - :id="responsible" - ) {{responsible}} - .flex.select.cursor-pointer.w-full.text-xl.items-center.networks(v-if="forNetworks" :class="optionData") - .absolute.options.top-5( - v-show="isSelectOpen" - class="left-[-11px]" - :id="id") - .flex.option.justify-center.py-1.text-xl( - v-for="responsible in listData" - @click="(e) => chooseOption(e)" - :key="responsible.network" - :id="responsible.network" - :class="responsible.icon" - ) + ) + .absolute.options.top-12.left-0( + v-show="isSelectOpen" + :id="id" + ) + .option.px-4.py-1( + v-for="responsible in listData" + @click="(e) => chooseOption(e)" + :key="responsible" + :id="responsible" + ) {{responsible}} + .flex.select.cursor-pointer.w-full.text-xl.items-center.networks(v-if="forNetworks" :class="optionData, 'px-2.5'") + .absolute.options.top-11.left-0( + v-show="isSelectOpen" + :id="id") + .flex.option.justify-center.py-1.text-xl( + v-for="responsible in listData" + @click="(e) => chooseOption(e)" + :key="responsible.network" + :id="responsible.network" + :class="responsible.icon" + ) .select-form-separator.cursor-pointer.mr-6px(v-if="separator") .text-xsm.ml-2.pt-1.icon-down-arrow.icon.text-center(v-if="!forNetworks" :class="{ open: isSelectOpen}") @@ -41,7 +39,6 @@ export default { name: "BaseSelect", props: { - defaultOption: String, id: String, styleBorder: { default: false, @@ -60,17 +57,12 @@ export default { data() { return { isSelectOpen: false, - isSelectedOption: false, }; }, methods: { openSelect() { this.isSelectOpen = !this.isSelectOpen; }, - selectOption(e) { - this.chooseOption(e); - this.isSelectedOption = true; - }, }, }; diff --git a/src/pages/clients/components/ClientsFormCreate.vue b/src/pages/clients/components/ClientsFormCreate.vue index 7254b0a..7971a72 100644 --- a/src/pages/clients/components/ClientsFormCreate.vue +++ b/src/pages/clients/components/ClientsFormCreate.vue @@ -21,7 +21,6 @@ :choose-option="chooseOptionNetworks" :choose-priority="choosePriority" :priority-list="priorityList" - :priority-option="getPriorityOption" ) .flex(:style="{display :'none'}" ref="doc") form-create-identity-documents(:identity-document="infoClient.identity_document" :save-client="saveClient") @@ -61,7 +60,7 @@ export default { basic: { full_name: "", birth_date: "", - priority: null, + priority: "", contacts: [ { id: "network", @@ -130,13 +129,6 @@ export default { priorityList: ["Высокий", "Средний", "Низкий", "-"], }; }, - computed: { - getPriorityOption() { - return this.prioritySettings.settings.find( - (el) => el.priority === this.infoClient.basic.priority - ).text; - }, - }, methods: { createIdentityDocument(id) { fetch("http://45.84.227.122:8080/general/identity_document/create/", { @@ -161,7 +153,9 @@ export default { body: JSON.stringify({ full_name: this.infoClient.basic.full_name, birth_date: this.infoClient.basic.birth_date, - priority: this.infoClient.basic.priority, + priority: this.prioritySettings.settings.find( + (el) => el.text === this.infoClient.basic.priority + ).priority, }), }) .then((res) => res.json()) @@ -171,9 +165,7 @@ export default { this.networkId = e.currentTarget.id; }, choosePriority(e) { - this.infoClient.basic.priority = this.prioritySettings.settings.find( - (el) => el.text === e.target.id - ).priority; + this.infoClient.basic.priority = e.target.id; }, chooseOptionNetworks(e) { let index = this.infoClient.basic.contacts.findIndex( diff --git a/src/pages/clients/components/FormCreateBasicInfo.vue b/src/pages/clients/components/FormCreateBasicInfo.vue index d26c207..dc699a6 100644 --- a/src/pages/clients/components/FormCreateBasicInfo.vue +++ b/src/pages/clients/components/FormCreateBasicInfo.vue @@ -3,7 +3,7 @@ .grid.grid-cols-2.gap-x-4.gap-y-6.px-4 .flex.flex-col(class="gap-y-1.5") span.text-sm Приоритет - base-select(:list-data="priorityList" :option-data="priorityOption" default-option="Приоритет клиента" :for-networks="false" :style-border="true" :choose-option="choosePriority" :width-select="277") + base-select(:list-data="priorityList" :option-data="basicInfo.priority" placeholder="Приоритет клиента" :for-networks="false" :style-border="true" :choose-option="choosePriority" :size-input="22") .flex.flex-col(class="gap-y-1.5") span.text-sm Дата рождения span.obligatory * @@ -37,9 +37,6 @@ export default { props: { choosePriority: Function, priorityList: Array, - priorityOption: { - default: "Приоритет", - }, saveNetworkId: Function, chooseOption: Function, phone: Object,