From 6894aa0a14de8ca19098d042b30f1c0f7d166eaf Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Tue, 15 Nov 2022 13:27:08 +0300 Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20?= =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B0=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D1=81=D0=BE=D0=B2=20=D0=B8=20=D0=BF=D0=B0=D1=81?= =?UTF-8?q?=D0=BF=D0=BE=D1=80=D1=82=D0=BD=D1=8B=D1=85=20=D0=B4=D0=B0=D0=BD?= =?UTF-8?q?=D0=BD=D1=8B=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ClientDetailInfoSection.vue | 25 ++++++++----------- .../components/ClientDetailInfoWrapper.vue | 4 +-- .../clients/components/ClientsTableRow.vue | 14 +++++++++-- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/pages/clients/components/ClientDetailInfoSection.vue b/src/pages/clients/components/ClientDetailInfoSection.vue index 65e0ac2..3879f3f 100644 --- a/src/pages/clients/components/ClientDetailInfoSection.vue +++ b/src/pages/clients/components/ClientDetailInfoSection.vue @@ -14,15 +14,6 @@ :size="20" ) .icon-ok.text-xsm(class="pt-[3px]") - //- base-button( - //- v-if="isChange && this.isData", - //- @click="createNewAddress", - //- confirm, - //- rounded, - //- outlined, - //- :size="20" - //- ) - .icon-ok.text-xsm(class="pt-[3px]") .edit.icon-edit.cursor-pointer.text-sm( v-if="!isChange", @click="changeClientData" @@ -49,7 +40,7 @@ :add-new-additional="addDocAdditional", :save-additional="saveDocs" ) - .section-body.w-full.flex.flex-col.px-4.pt-3.pb-4.gap-y-4(v-if="this.isData") + .section-body.w-full.flex.flex-col.px-4.pt-3.pb-4.gap-y-4(v-if="this.isData || this.isAddress") .flex.flex-col(class="gap-y-1.5") .flex.flex-col(v-for="(item, key) in sectionInfo", class="gap-y-1.5") span.title-section.font-semibold.text-xs( @@ -144,6 +135,7 @@ export default { updateDocument: Function, updateAddress: Function, lackData: Boolean, + lackAddress: Boolean, dopeAddress: Object, createAddress: Function, createDocument: Function, @@ -160,7 +152,6 @@ export default { }, docData: [], isOpenAddingWrap: false, - isOpenChange: false, isChange: false, settings: detail, cities: [ @@ -169,15 +160,17 @@ export default { { id: 1, label: "Луховицы" }, ], isData: true, + isAddress: true, }; }, methods: { changeData() { - this.isData = true; this.isChange = true; if (this.section === "pass") { + this.isData = true; this.createDocument(); } else if (this.section === "addresses") { + this.isAddress = true; this.createAddress(); } }, @@ -190,7 +183,6 @@ export default { } }, saveChange() { - this.isOpenChange = false; this.isChange = false; if (this.section === "pass") { this.updateDocument(); @@ -217,7 +209,6 @@ export default { this.saveNewDoc(this.section, this.docData); } this.isOpenAddingWrap = false; - this.isOpenChange = false; this.docData = []; this.additionalData = { header: "", @@ -234,6 +225,12 @@ export default { this.isData = newValue; }, }, + lackAddress: { + immediate: true, + handler(newValue) { + this.isAddress = newValue; + }, + }, }, }; diff --git a/src/pages/clients/components/ClientDetailInfoWrapper.vue b/src/pages/clients/components/ClientDetailInfoWrapper.vue index ec2438a..12de812 100644 --- a/src/pages/clients/components/ClientDetailInfoWrapper.vue +++ b/src/pages/clients/components/ClientDetailInfoWrapper.vue @@ -12,7 +12,7 @@ :section-info="dataAddress" section="addresses" :update-address="updateAddress" - :lack-data="lackData" + :lack-address="lackAddress" :dope-address="dopeAddress" :create-address="createAddress" ) @@ -22,7 +22,6 @@ section="docs" :save-new-doc="saveNewDoc" :delete-doc="deleteDoc" - :lack-data="lackData" ) @@ -41,6 +40,7 @@ export default { updateDocument: Function, updateAddress: Function, lackData: Boolean, + lackAddress: Boolean, dopeAddress: Object, createAddress: Function, createDocument: Function, diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue index b22986c..2308699 100644 --- a/src/pages/clients/components/ClientsTableRow.vue +++ b/src/pages/clients/components/ClientsTableRow.vue @@ -76,6 +76,7 @@ :update-document="postUpdateIdentityDocument" :update-address="postUpdateAddress" :lack-data="lackData" + :lack-address="lackAddress" :dope-address="dopeAddress" :create-address="postCreateAddress" :create-document="postCreateIdentityDocument" @@ -297,6 +298,7 @@ export default { ? data?.issued_by_date.split("-").reverse().join(".") : "", }; + this.lackData = true; } else { this.lackData = false; this.dataIdentityDocument = { @@ -327,9 +329,9 @@ export default { this.dataAddress = { join_adress: data?.join_adress, }; - this.lackData = true; + this.lackAddress = true; } else { - this.lackData = false; + this.lackAddress = false; this.dataAddress = { join_adress: "", }; @@ -394,6 +396,14 @@ export default { fetchWrapper .post("general/identity_document/create/", { person_id: this.id, + kind: "ПАСПОРТ", + series_number: this.dataIdentityDocument.numba, + issued_by_org: this.dataIdentityDocument.issued_by_org, + issued_by_org_code: this.dataIdentityDocument.issued_by_org_code, + issued_by_date: this.dataIdentityDocument.issued_by_date + .split(".") + .reverse() + .join("-"), }) .then(() => this.fetchClientDetail(this.id)); },