diff --git a/src/components/LoggedInLayout.vue b/src/components/LoggedInLayout.vue
index ea8b749..29cc8f5 100644
--- a/src/components/LoggedInLayout.vue
+++ b/src/components/LoggedInLayout.vue
@@ -1,9 +1,14 @@
.flex.flex-col.w-full.h-full.gap-y-2
- the-header(:is-open-form="isOpenForm", :close-form="closeForm", :open-form="openForm")
+ the-header(
+ :is-open-form="isOpenForm",
+ :close-form="closeForm",
+ :open-form="openForm",
+ :current-year="currentYear"
+ )
.flex.flex-auto
the-sidebar
- router-view(:open-form="openForm")
+ router-view(:open-form="openForm", :current-year="currentYear")
diff --git a/src/components/TheHeader.vue b/src/components/TheHeader.vue
index e21ba51..fffa46d 100644
--- a/src/components/TheHeader.vue
+++ b/src/components/TheHeader.vue
@@ -1,6 +1,10 @@
.header-wrapper.relative.flex.justify-center.box-border.py-2.pl-4_75px.pr-6
- base-client-form-create(v-if="isOpenForm", :close-form="closeForm")
+ base-client-form-create(
+ v-if="isOpenForm",
+ :close-form="closeForm",
+ :current-year="currentYear"
+ )
.flex.items-center.box-border.cursor-pointer.mr-auto
img.logo-img.mr-29_25px(src="@/assets/images/logo.svg", alt="Logo")
header-inputs
@@ -38,6 +42,7 @@ export default {
openForm: Function,
closeForm: Function,
isOpenForm: Boolean,
+ currentYear: Number,
},
data() {
return {
diff --git a/src/components/TheSidebar.vue b/src/components/TheSidebar.vue
index d6786ac..c46d900 100644
--- a/src/components/TheSidebar.vue
+++ b/src/components/TheSidebar.vue
@@ -1,10 +1,23 @@
- .sidebar.flex.flex-col.justify-between.flex-auto.py-6.box-border
+ .sidebar.flex.flex-col.justify-between.flex-auto.py-6.box-border(
+ :style="{borderTopRightRadius: this.currenPageBorder ? '0px' : '4px'}"
+ )
.flex.flex-col.gap-y-6
- the-button-sidebar( v-for="button in pageSettings.filter((el) => el.id !== 'settings')" :path="button.path" :id="button.id" :active="button.active" :change-style-page="changeStylePage")
+ the-button-sidebar(
+ v-for="button in pageSettings.filter((el) => el.id !== 'settings')",
+ :path="button.path",
+ :id="button.id",
+ :active="button.active",
+ :change-style-page="changeStylePage"
+ )
.icon(:class="button.icon")
.flex.text-4xl.flex-col.gap-y-6
- the-button-sidebar(:path="getSettings.path" :id="getSettings.id" :active="getSettings.active" :change-style-page="changeStylePage")
+ the-button-sidebar(
+ :path="getSettings.path",
+ :id="getSettings.id",
+ :active="getSettings.active",
+ :change-style-page="changeStylePage"
+ )
.icon(:class="getSettings.icon")
@@ -36,6 +49,7 @@ export default {
active: false,
},
],
+ currenPageBorder: true,
};
},
methods: {
@@ -46,6 +60,9 @@ export default {
: (this.pageSettings[index].active = false);
});
},
+ changePage() {
+ console.log(this.$router.currentRoute._value.fullPath);
+ },
},
computed: {
getSettings() {
@@ -60,6 +77,13 @@ export default {
: (this.pageSettings[index].active = false);
});
},
+ watch: {
+ "$route.path"() {
+ if (this.$router.currentRoute._value.fullPath === "/calendar") {
+ this.currenPageBorder = true;
+ } else this.currenPageBorder = false;
+ },
+ },
};
@@ -68,7 +92,6 @@ export default {
max-width: 80px
min-width: 80px
background-color: var(--default-white)
- border-top-right-radius: 4px
.icon
min-width: 44px
diff --git a/src/components/base/BaseClientFormCreate.vue b/src/components/base/BaseClientFormCreate.vue
index 841adf2..6e458ef 100644
--- a/src/components/base/BaseClientFormCreate.vue
+++ b/src/components/base/BaseClientFormCreate.vue
@@ -1,5 +1,5 @@
- .wrapper-create.flex.flex-col.fixed.right-0.bottom-4.px-4.py-7.gap-y-8
+ .wrapper-create.flex.flex-col.fixed.right-6.bottom-6.px-4.py-7.gap-y-8
.icon-cancel.close.absolute.top-5.right-5.cursor-pointer(@click="closeForm")
span.title.text-xl.font-bold.px-4 Создание клиента
.flex.gap-x-4.h-fit.px-4
@@ -65,6 +65,7 @@ export default {
},
props: {
closeForm: Function,
+ currentYear: Number,
},
data() {
return {
@@ -165,7 +166,6 @@ export default {
label: "-",
},
],
- currentYear: 2022,
};
},
computed: {
@@ -287,19 +287,13 @@ export default {
}
return true;
},
- printCurrentYear() {
- return new Date().getFullYear();
- },
- },
- mounted: function () {
- this.currentYear = this.printCurrentYear();
},
};
diff --git a/src/pages/calendar/components/CalendarEventCard.vue b/src/pages/calendar/components/CalendarEventCard.vue
index 1a94c39..9fd3dfc 100644
--- a/src/pages/calendar/components/CalendarEventCard.vue
+++ b/src/pages/calendar/components/CalendarEventCard.vue
@@ -247,6 +247,7 @@ export default {
height: 23px
.default-theme
+ z-index: 0
.card
background-color: var(--bg-color)
border: 2px solid var(--border-color)
diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue
index 25b337c..a2a1b28 100644
--- a/src/pages/calendar/components/CalendarFormAddEvent.vue
+++ b/src/pages/calendar/components/CalendarFormAddEvent.vue
@@ -1,5 +1,7 @@
- .flex.flex-col.gap-y-6.pt-6.pb-7.px-8.event-form.fixed.right-0.bottom-4(v-click-outside="clearForm")
+ .flex.flex-col.gap-y-6.pt-6.pb-7.px-8.event-form.fixed.right-6.bottom-6(
+ v-click-outside="clearForm"
+ )
.flex.justify-between
span.title.text-xl.font-bold {{!selectedEventData.id ? "Назначение события" : "Изменение события"}}
.flex.pt-2
diff --git a/src/pages/calendar/components/CalendarSchedule.vue b/src/pages/calendar/components/CalendarSchedule.vue
index a75515a..c9b0691 100644
--- a/src/pages/calendar/components/CalendarSchedule.vue
+++ b/src/pages/calendar/components/CalendarSchedule.vue
@@ -367,8 +367,8 @@ export default {
diff --git a/src/pages/clients/components/ClientDetailInfoWrapper.vue b/src/pages/clients/components/ClientDetailInfoWrapper.vue
index 29dce75..f88b6a6 100644
--- a/src/pages/clients/components/ClientDetailInfoWrapper.vue
+++ b/src/pages/clients/components/ClientDetailInfoWrapper.vue
@@ -1,28 +1,29 @@
.w-full.h-fit.pt-4.flex.gap-x-4(class="px-[52px] pb-[30px]")
client-detail-info-section(
- v-model:section-info="dataDocument"
- section="pass"
- :update-document="updateDocument"
- :lack-data="lackData"
- :create-document="createDocument"
- :doc-id="docId"
+ v-model:section-info="dataDocument",
+ section="pass",
+ :update-document="updateDocument",
+ :lack-data="lackData",
+ :create-document="createDocument",
+ :doc-id="docId",
+ :current-year="currentYear"
)
.flex.flex-col
client-detail-info-section(
- :section-info="dataAddress"
- section="addresses"
- :update-address="updateAddress"
- :lack-address="lackAddress"
- :dope-address="dopeAddress"
- :create-address="createAddress"
+ :section-info="dataAddress",
+ section="addresses",
+ :update-address="updateAddress",
+ :lack-address="lackAddress",
+ :dope-address="dopeAddress",
+ :create-address="createAddress",
:address-id="addressId"
)
.flex.flex-col
client-detail-info-section(
- :section-info="dataAttachments"
- section="docs"
- :save-new-doc="saveNewDoc"
+ :section-info="dataAttachments",
+ section="docs",
+ :save-new-doc="saveNewDoc",
:delete-doc="deleteDoc"
)
@@ -48,6 +49,7 @@ export default {
createDocument: Function,
addressId: String,
docId: String,
+ currentYear: Number,
},
};
diff --git a/src/pages/clients/components/ClientDetailInput.vue b/src/pages/clients/components/ClientDetailInput.vue
index 3b37d11..f683dd1 100644
--- a/src/pages/clients/components/ClientDetailInput.vue
+++ b/src/pages/clients/components/ClientDetailInput.vue
@@ -1,9 +1,10 @@
.input-wrapper.flex.gap-x-2.px-3.box-border.w-max-fit(class="py-2.5")
- textarea.place-input.w-full.outline-0.text-sm.not-italic.resize-none(
- :rows="Math.ceil(value.length/heightInput)"
- :value="value"
- @input="$emit('update:value', $event.target.value)"
+ textarea.place-input.w-full.outline-0.text-sm.not-italic.resize-none.font-medium(
+ :rows="Math.ceil(value.length/heightInput)",
+ :value="value",
+ @input="$emit('update:value', $event.target.value)",
+ :placeholder="placeholder",
)
slot
@@ -15,6 +16,9 @@ export default {
value: String,
width: Number,
sharp: String,
+ placeholder: {
+ default: "Поиск",
+ },
},
computed: {
diff --git a/src/pages/clients/components/ClientsTable.vue b/src/pages/clients/components/ClientsTable.vue
index 8c174d2..9d92969 100644
--- a/src/pages/clients/components/ClientsTable.vue
+++ b/src/pages/clients/components/ClientsTable.vue
@@ -5,13 +5,14 @@
clients-table-header(:check="selectedCheck" :is-check="selectAll")
.flex.flex-col
clients-table-row(
- v-for="client in dataClients"
- :key="client.id"
- :id="client.id"
- :is-check="marked.includes(client.id)"
- :check="selectedCheck"
- :client="client"
- :fetch-data-clients="fetchDataClients"
+ v-for="client in dataClients",
+ :key="client.id",
+ :id="client.id",
+ :is-check="marked.includes(client.id)",
+ :check="selectedCheck",
+ :client="client",
+ :fetch-data-clients="fetchDataClients",
+ :current-year="currentYear"
)
@@ -33,6 +34,7 @@ export default {
},
props: {
openForm: Function,
+ currentYear: Number,
},
data() {
diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue
index 0a69efe..3746249 100644
--- a/src/pages/clients/components/ClientsTableRow.vue
+++ b/src/pages/clients/components/ClientsTableRow.vue
@@ -82,6 +82,7 @@
:create-document="postCreateIdentityDocument"
:address-id="addressId"
:doc-id="docId"
+ :current-year="currentYear"
)
@@ -149,6 +150,7 @@ export default {
isCheck: Boolean,
client: Object,
fetchDataClients: Function,
+ currentYear: Number,
},
created() {
this.dataClient = {
diff --git a/src/pages/clients/components/ClientsWrapper.vue b/src/pages/clients/components/ClientsWrapper.vue
index 50a2dbc..98796bb 100644
--- a/src/pages/clients/components/ClientsWrapper.vue
+++ b/src/pages/clients/components/ClientsWrapper.vue
@@ -1,6 +1,6 @@
.wrapper.flex.w-full.relative.mx-6
- clients-table(:open-form="openForm")
+ clients-table(:open-form="openForm", :current-year="currentYear")
@@ -17,4 +18,5 @@ export default {
diff --git a/src/pages/clients/utils/tableConfig.js b/src/pages/clients/utils/tableConfig.js
index d836fba..7c0a801 100644
--- a/src/pages/clients/utils/tableConfig.js
+++ b/src/pages/clients/utils/tableConfig.js
@@ -119,6 +119,12 @@ export const detail = {
issued_by_org_code: "###-###",
issued_by_date: "##.##.####",
},
+ placeholder: {
+ numba: "0000 000000",
+ issued_by_org: "Точно как в паспорте",
+ issued_by_org_code: "000-000",
+ issued_by_date: "Дата",
+ },
width: 280,
},
snils: {
@@ -126,6 +132,9 @@ export const detail = {
options: {
numba: "Номер",
},
+ placeholder: {
+ numba: "000-000-000 00",
+ },
width: 180,
},
inn: {
@@ -133,6 +142,9 @@ export const detail = {
options: {
numba: "Номер",
},
+ placeholder: {
+ numba: "000000000000",
+ },
width: 180,
},
birthday: {
@@ -145,6 +157,9 @@ export const detail = {
options: {
join_adress: "Полный адрес",
},
+ placeholder: {
+ join_adress: "Введите адрес целиком",
+ },
width: 292,
},
docs: {