Merge branch 'ASTRA-69' into 'master'

WIP Поправил адаптив и ошибку обновления данных

See merge request andrusyakka/urban-couscous!354
This commit is contained in:
Aleksey Demin
2023-05-05 13:44:42 +00:00
5 changed files with 17 additions and 8 deletions

View File

@@ -203,13 +203,13 @@ export default {
passportFormData.append(elem.name, elem.modelValue ?? ""); passportFormData.append(elem.name, elem.modelValue ?? "");
} else documentsFormData.append(elem.name, elem.modelValue ?? ""); } else documentsFormData.append(elem.name, elem.modelValue ?? "");
}); });
this.checkChengePhoto("passport", "photo", passportFormData); this.checkChangePhoto("passport", "photo", passportFormData);
this.checkChengePhoto( this.checkChangePhoto(
"insurance_number", "insurance_number",
"photo_insurance_number", "photo_insurance_number",
documentsFormData documentsFormData
); );
this.checkChengePhoto( this.checkChangePhoto(
"tax_identification_number", "tax_identification_number",
"photo_tax_identification_number", "photo_tax_identification_number",
documentsFormData documentsFormData
@@ -280,7 +280,7 @@ export default {
} }
}); });
}, },
checkChengePhoto(updatedObjId, field, formData) { checkChangePhoto(updatedObjId, field, formData) {
if (this.docData[updatedObjId][field]?.file) if (this.docData[updatedObjId][field]?.file)
formData.append(field, this.docData[updatedObjId][field]?.file[0]); formData.append(field, this.docData[updatedObjId][field]?.file[0]);
}, },

View File

@@ -1,5 +1,5 @@
<template lang="pug"> <template lang="pug">
.flex.flex-col.gap-y-2.wrapper.h-full .flex.flex-col.gap-y-2.wrapper.h-full.w-full
basic-data-form basic-data-form
contacts-form contacts-form
documents-form documents-form
@@ -21,6 +21,8 @@ export default {
.wrapper .wrapper
flex: 1 flex: 1
overflow-y: auto overflow-y: auto
min-width: 560px
min-height: 350px
@media (max-width: 600px) @media (max-width: 600px)
width: fit-content width: fit-content
&::-webkit-scrollbar &::-webkit-scrollbar

View File

@@ -37,6 +37,8 @@ export default {
.wrapper .wrapper
width: 83.2% width: 83.2%
overflow-y: auto overflow-y: auto
min-width: 560px
min-height: 350px
@media (max-width: 600px) @media (max-width: 600px)
width: fit-content width: fit-content
&::-webkit-scrollbar &::-webkit-scrollbar

View File

@@ -63,7 +63,7 @@
span.date-color {{ updatedDate }} span.date-color {{ updatedDate }}
.flex.justify-between.pt-4 .flex.justify-between.pt-4
.flex .flex
.menu-item.px-6.py-10px.cursor-pointer.text-base( .menu-item.px-6.py-10px.cursor-pointer.text-base.whitespace-nowrap(
v-for="item in menuItem", v-for="item in menuItem",
@click="selectItem(item)", @click="selectItem(item)",
:class="{'menu-item-active': item.component === modelValue}", :class="{'menu-item-active': item.component === modelValue}",
@@ -169,6 +169,7 @@ export default {
width: 83.2% width: 83.2%
height: 18.7% height: 18.7%
background-color: var(--default-white) background-color: var(--default-white)
min-width: 1050px
min-height: 190px min-height: 190px
.menu-item .menu-item
color: var(--font-grey-color) color: var(--font-grey-color)

View File

@@ -1,6 +1,6 @@
<template lang="pug"> <template lang="pug">
.sidebar-wrapper.h-full.rounded.px-2.py-6.flex.flex-col .sidebar-wrapper.h-full.rounded.px-2.py-6.flex.flex-col
.menu-item.text-base.px-4.py-3.rounded.cursor-pointer( .menu-item.text-base.px-4.py-3.rounded.cursor-pointer.whitespace-nowrap(
v-for="item in menuItem", v-for="item in menuItem",
:key="item.id", :key="item.id",
:id="item.id", :id="item.id",
@@ -20,6 +20,9 @@ export default {
menuItem: baseInfoMenu, menuItem: baseInfoMenu,
}; };
}, },
updated() {
this.$store.dispatch("returnInitData");
},
methods: { methods: {
selectItem(item) { selectItem(item) {
this.value = item?.component; this.value = item?.component;
@@ -29,7 +32,8 @@ export default {
</script> </script>
<style lang="sass" scoped> <style lang="sass" scoped>
.sidebar-wrapper .sidebar-wrapper
width: 16.3% min-width: 300px
min-height: 350px
background-color: var(--default-white) background-color: var(--default-white)
.menu-item .menu-item
color: var(--font-grey-color) color: var(--font-grey-color)