diff --git a/src/components/HeaderInputs.vue b/src/components/HeaderInputs.vue index bd379c1..ffa62a0 100644 --- a/src/components/HeaderInputs.vue +++ b/src/components/HeaderInputs.vue @@ -13,10 +13,10 @@ .icon-wrapper.mr-2.flex.justify-center .icon-ok.text-xs.flex.justify-center.items-center(v-if="filter === selectedFilter") .flex.items-center {{ filter }} - base-input.p-4( + q-input.px-4( type="text", placeholder="Искать ...", - text-color="var(--btn-blue-color)", + :input-style="{color: 'var(--btn-blue-color)'}", borderless, square ) @@ -109,4 +109,7 @@ export default { .icon-down-arrow width: 16px height: 16px + +.input-height + height: 38px diff --git a/src/components/base/BaseAddingNetwork.vue b/src/components/base/BaseAddingNetwork.vue index dd9056c..56e0ca9 100644 --- a/src/components/base/BaseAddingNetwork.vue +++ b/src/components/base/BaseAddingNetwork.vue @@ -1,25 +1,34 @@ diff --git a/src/components/base/BaseClientFormCreate.vue b/src/components/base/BaseClientFormCreate.vue index 70383e7..5d9d1f3 100644 --- a/src/components/base/BaseClientFormCreate.vue +++ b/src/components/base/BaseClientFormCreate.vue @@ -61,38 +61,36 @@ @click="closeAddImage", icon="app:icon-ok" ) - base-input.w-full(v-model="infoClient.basic.full_name", placeholder="ФИО*", outlined) - .flex.flex-col.flex-auto.l.gap-y-8 - .flex - button.title-info.px-6.py-2.cursor-pointer.w-full.text-sm( - v-for="form in forms", - @click="selectForm(form.component)", - :class="{active: form.component === currentForm}", - :key="form.id", - :id="form.id" - ) {{form.title}} - component( - v-bind:is="currentForm", - :basic-info="infoClient.basic", - :phone="infoClient.phone", - :email="infoClient.email", - :save-network-id="saveNetworkId", - :add-network="addNewNetwork", - :choose-option="chooseOptionNetworks", - :choose-priority="choosePriority", - :priority-list="priorityList", - :identity-document="infoClient.identity_document", - :addresses="infoClient.addresses", - :save-file="saveDocFile", - ) - q-btn( - label="Создать клиента", - color="primary", - style="height: 40px; width: 180px", - no-caps, - padding="8px 24px", - @click="saveClient", - ) + base-input.w-full(v-model="infoClient.basic.full_name", placeholder="ФИО*", outlined) + .flex.flex-col.flex-auto.l.gap-y-8 + .flex + button.title-info.px-6.py-2.cursor-pointer.w-full.text-sm( + v-for="form in forms", + @click="selectForm(form.component)", + :class="{active: form.component === currentForm}", + :key="form.id", + :id="form.id" + ) {{form.title}} + component( + v-bind:is="currentForm", + :basic-info="infoClient.basic", + :phone="infoClient.phone", + :email="infoClient.email", + :add-network="addNewNetwork", + :priority-list="priorityList", + :identity-document="infoClient.identity_document", + :addresses="infoClient.addresses", + :save-file="saveDocFile", + :networks-list="getNetworksList", + ) + q-btn( + label="Создать клиента", + color="primary", + style="height: 40px; width: 180px", + no-caps, + padding="8px 24px", + @click="saveClient", + ) diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue index 21d9572..1b9b2c8 100644 --- a/src/pages/clients/components/ClientsTableRow.vue +++ b/src/pages/clients/components/ClientsTableRow.vue @@ -381,11 +381,14 @@ export default { }); }, addNetwork(network) { - this.dataClient.contacts.push(network); + this.dataClient.contacts.push({ + kind: network.kind?.id, + username: network.username, + }); }, deleteNetwork(e) { this.dataClient.contacts = this.dataClient.contacts.filter( - (el) => el.kind !== e.target.id + (el) => el.kind !== e.currentTarget.id ); }, choosePriority(e) { diff --git a/src/pages/clients/components/FormCreateBasicInfo.vue b/src/pages/clients/components/FormCreateBasicInfo.vue index 12efb74..92afdc2 100644 --- a/src/pages/clients/components/FormCreateBasicInfo.vue +++ b/src/pages/clients/components/FormCreateBasicInfo.vue @@ -28,16 +28,13 @@ ) .flex.flex-col.col-start-1.col-end-3.w-100(class="gap-y-1.5") span.text-sm.font-semibold.opacity-40.input-info Ссылки на соцсети - .flex(class="gap-x-1.5" v-for="network in basicInfo.contacts" :key="network.id") + .flex(class="gap-x-1.5" v-for="network in basicInfo.contacts" :key="network.kind.id") base-adding-network( - :list-adding-networks="networks.settings", - :selected-option="network.icon", - :value="network", - :choose-network="chooseOption", - :save-network-id="saveNetworkId" + :items="networksList", + :network="network", ) span.add-network.cursor-pointer( - v-show="networks.settings.length !== basicInfo.contacts.length", + v-show="networksList.length !== 0", @click="addNetwork" ) Добавить соцсеть @@ -45,7 +42,6 @@ diff --git a/src/pages/clients/components/cells/TableCellBodyNetworks.vue b/src/pages/clients/components/cells/TableCellBodyNetworks.vue index 4000b54..151f4a1 100644 --- a/src/pages/clients/components/cells/TableCellBodyNetworks.vue +++ b/src/pages/clients/components/cells/TableCellBodyNetworks.vue @@ -1,40 +1,43 @@