admin/astra-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #136 from dderbentsov/UC-52

Browse Source 
Фикс багов и исправления
This commit is contained in:
frontgavrilin
2022-11-17 16:59:21 +03:00
committed by GitHub
parent 875e214b5b 26dc8b37fa
commit 7e8755d7b3
17 changed files with 153 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/pages/calendar/components/CalendarEventCard.vue
View File

@@ -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)

4
src/pages/calendar/components/CalendarFormAddEvent.vue
View File

@@ -1,5 +1,7 @@
<template lang="pug">
.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

2
src/pages/calendar/components/CalendarSchedule.vue
View File

@@ -383,8 +383,8 @@ export default {
<style lang="sass" scoped>
.schedule
border-top-left-radius: 4px
border-top-right-radius: 4px
position: relative
border-top-left-radius: 4px
background-color: var(--default-white)
width: calc(100% - (var(--sidebar-width) + 16px))
height: calc(100vh - 56px - 8px)

21
src/pages/calendar/components/CalendarSidebar.vue
View File

@@ -21,15 +21,15 @@
) Создать событие
calendar-sidebar-event(:is-open="isOpen", :event-type="eventTypes")
calendar-sidebar-teammate(:team-data="teamData", :is-open="isOpen")
.button-wrapper.flex.justify-center.mb-23px
base-button(
left-icon="icon-long-arrow",
rounded, :size="40",
:icon-left-size="18",
secondary,
:style="{ transform: `rotate(${turnButton})`}",
@click="changeSize"
)
//- .button-wrapper.flex.justify-center.mb-23px
//- base-button(
//- left-icon="icon-long-arrow",
//- rounded, :size="40",
//- :icon-left-size="18",
//- secondary,
//- :style="{ transform: `rotate(${turnButton})`}",
//- @click="changeSize"
//- )
</template>
<script>
@@ -88,6 +88,9 @@ export default {
</script>
<style lang="sass" scoped>
.sidebar
border-top-right-radius: 4px
.sidebar-wrapper
border-left: 2px solid var(--btn-blue-color-3)

3
src/pages/clients/TheClients.vue
View File

@@ -1,5 +1,5 @@
<template lang="pug">
clients-wrapper(:open-form="openForm")
clients-wrapper(:open-form="openForm", :current-year="currentYear")
</template>
<script>
@@ -9,6 +9,7 @@ export default {
components: { ClientsWrapper },
props: {
openForm: Function,
currentYear: Number,
},
};
</script>

31
src/pages/clients/components/ClientDetailInfoSection.vue
View File

@@ -1,6 +1,6 @@
<template lang="pug">
.section-wrapper.flex.flex-col.h-fit.cursor-pointer(
:style="{ flexDirection:settings[section].rowFlex&&'row', width : settings[section].width + 'px', height : settings[section].height+'px'}"
:style="{flexDirection:settings[section].rowFlex && 'row', width : settings[section].width + 'px', height : settings[section].height + 'px', background: changeBackground}"
)
.section-header.flex.items-center.justify-between.pl-4.pr-3(:class="{small:settings[section].rowFlex}")
span.text-sm.font-semibold.whitespace-nowrap {{settings[section].title}}
@@ -41,16 +41,24 @@
:save-additional="saveDocs"
)
.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.gap-y-4
.flex.flex-col(v-for="(item, key) in sectionInfo", class="gap-y-1.5")
span.title-section.font-semibold.text-xs(
v-if="settings[section].options") {{settings[section].options[key]}}
span.title-section.font-semibold.text-xs(v-if="item.header") {{item.header}}
client-detail-input.text-sm.text-sm.w-max-fit(
v-if="section!=='docs' && isChange",
:style="{fontWeight:key === 'numba'&&600}",
v-if="section!=='docs' && isChange && settings[section].options[key] !== 'Дата выдачи'",
:style="{fontWeight:key === 'numba'&&600, maxHeight: settings[section].options[key] !== 'Выдан' ? '40px' : ''}",
v-model:value="sectionInfo[key]",
:width="settings[section].width"
:width="settings[section].width",
:placeholder="settings[section].placeholder[key]"
)
base-input.max-h-10.py-2.pl-3(
v-if="settings[section].options[key] === 'Дата выдачи' && isChange",
type="date",
v-model:value="sectionInfo.issued_by_date"
:max-date="`${currentYear}-12-31`",
dateInput
)
.copy.icon-copy.cursor-pointer(
v-if="item.copy",
@@ -95,12 +103,14 @@ import BaseButton from "@/components/base/BaseButton";
import TableAddingNewDoc from "@/pages/clients/components/TableAddingNewDoc";
import TableAddingNewAdditional from "@/pages/clients/components/TableAddingNewAdditional";
import ClientDetailSectionAddress from "@/pages/clients/components/ClientDetailSectionAddress";
import BaseInput from "@/components/base/BaseInput";
import { detail } from "@/pages/clients/utils/tableConfig";
export default {
name: "ClientDetailInfoSection",
components: {
TableAddingNewAdditional,
BaseButton,
BaseInput,
ClientDetailInput,
TableAddingNewDoc,
ClientDetailSectionAddress,
@@ -119,9 +129,11 @@ export default {
createDocument: Function,
addressId: String,
docId: String,
currentYear: Number,
},
data() {
return {
tip: "text",
additionalData: {
header: "",
value: "",
@@ -141,6 +153,13 @@ export default {
isAddress: true,
};
},
computed: {
changeBackground() {
return this.isChange
? "var(--light-grey-bg-color)"
: "var(--default-white)";
},
},
methods: {
openAddDoc() {
this.isChange = true;
@@ -271,5 +290,5 @@ export default {
.text-separation
width: 38px
z-index: 1
background: white
background: var(--light-grey-bg-color)
</style>

32
src/pages/clients/components/ClientDetailInfoWrapper.vue
View File

@@ -1,28 +1,29 @@
<template lang="pug">
.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"
)
</template>
@@ -48,6 +49,7 @@ export default {
createDocument: Function,
addressId: String,
docId: String,
currentYear: Number,
},
};
</script>

12
src/pages/clients/components/ClientDetailInput.vue
View File

@@ -1,9 +1,10 @@
<template lang="pug">
.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
</template>
@@ -15,6 +16,9 @@ export default {
value: String,
width: Number,
sharp: String,
placeholder: {
default: "Поиск",
},
},
computed: {

16
src/pages/clients/components/ClientsTable.vue
View File

@@ -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"
)
</template>
@@ -33,6 +34,7 @@ export default {
},
props: {
openForm: Function,
currentYear: Number,
},
data() {

2
src/pages/clients/components/ClientsTableRow.vue
View File

@@ -82,6 +82,7 @@
:create-document="postCreateIdentityDocument"
:address-id="addressId"
:doc-id="docId"
:current-year="currentYear"
)
</template>
@@ -149,6 +150,7 @@ export default {
isCheck: Boolean,
client: Object,
fetchDataClients: Function,
currentYear: Number,
},
created() {
this.dataClient = {

4
src/pages/clients/components/ClientsWrapper.vue
View File

@@ -1,6 +1,6 @@
<template lang="pug">
.wrapper.flex.w-full.relative.mx-6
clients-table(:open-form="openForm")
clients-table(:open-form="openForm", :current-year="currentYear")
</template>
<script>
@@ -10,6 +10,7 @@ export default {
components: { ClientsTable },
props: {
openForm: Function,
currentYear: Number,
},
};
</script>
@@ -17,4 +18,5 @@ export default {
<style lang="sass" scoped>
.wrapper
overflow: auto
border-top-left-radius: 4px
</style>

15
src/pages/clients/utils/tableConfig.js
View File

@@ -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: {