diff --git a/src/components/base/BaseClientFormCreate.vue b/src/components/base/BaseClientFormCreate.vue index 41e5176..948764f 100644 --- a/src/components/base/BaseClientFormCreate.vue +++ b/src/components/base/BaseClientFormCreate.vue @@ -260,15 +260,14 @@ export default { }, postNewClient() { const formData = new FormData(); + formData.append("full_name", this.infoClient.basic.full_name); this.imageData.forEach((e) => { formData.append("photo", e); - formData.append("full_name", this.infoClient.basic.full_name); }); if (this.infoClient.basic.birth_date) formData.append("birth_date", this.infoClient.basic.birth_date); - let foundElement = this.prioritySettings.settings.find( - (el) => el.text === this.infoClient.basic.priority + (el) => el.priority === this.infoClient.basic.priority.id ); if (foundElement) formData.append("priority", foundElement.priority); fetchWrapper diff --git a/src/pages/clients/components/ClientDetailInfoSection.vue b/src/pages/clients/components/ClientDetailInfoSection.vue index fe42fff..6c0bcfa 100644 --- a/src/pages/clients/components/ClientDetailInfoSection.vue +++ b/src/pages/clients/components/ClientDetailInfoSection.vue @@ -68,15 +68,13 @@ v-model:value="sectionInfo[key]", :width="settings[section].width", :placeholder="settings[section].placeholder[key]" + :sharp="settings[section].sharps[key] && section === 'pass' ? settings[section].sharps[key] : ''" ) - base-input.max-h-10.py-2.pl-3( + base-input-date.input( v-else-if="isChange && section !== 'docs'", - type="date", v-model:value="sectionInfo.issued_by_date" - :max-date="`${currentYear}-12-31`", - dateInput ) - .copy.icon-copy.cursor-pointer( + .copy.icon-copy.cursor-pointer( v-if="item.copy", @click="() => copyValue(item)" ) @@ -123,9 +121,9 @@ import TableAddingNewAdditional from "@/pages/clients/components/TableAddingNewA import TableCreatePackageDoc from "@/pages/clients/components/TableCreatePackageDoc"; import ClientDetailSectionAddress from "@/pages/clients/components/ClientDetailSectionAddress"; import TableChoiceAddingDoc from "@/pages/clients/components/TableChoiceAddingDoc"; -import BaseInput from "@/components/base/BaseInput"; import BasePopup from "@/components/base/BasePopup"; import BaseModal from "@/components/base/BaseModal"; +import BaseInputDate from "@/components/base/BaseInputDate"; import { detail } from "@/pages/clients/utils/tableConfig"; import pdfIcon from "@/assets/icons/pdf.svg"; import wordIcon from "@/assets/icons/word.svg"; @@ -134,7 +132,7 @@ export default { name: "ClientDetailInfoSection", components: { BaseButton, - BaseInput, + BaseInputDate, BasePopup, BaseModal, ClientDetailInput, @@ -367,4 +365,7 @@ export default { width: 38px z-index: 1 background: var(--light-grey-bg-color) + +.input + border: 1.5px solid var(--border-light-grey-color) diff --git a/src/pages/clients/components/ClientDetailInput.vue b/src/pages/clients/components/ClientDetailInput.vue index f683dd1..228f432 100644 --- a/src/pages/clients/components/ClientDetailInput.vue +++ b/src/pages/clients/components/ClientDetailInput.vue @@ -1,15 +1,25 @@