verdnatura/salix-front
verdnatura
/
salix-front
1
2
Fork 1
Code Issues Pull Requests 64 Releases Wiki Activity

feat: remove More options separator #1007

Merged
jsegarra merged 2 commits from hotfix_remove_moreOptions into master 2024-11-27 06:58:07 +00:00
Conversation 0 Commits 2 Files Changed 5 +128 -145
5 changed files with 128 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/i18n/locale/en.yml
View File

@ -861,7 +861,6 @@ components:
cardDescriptor: cardDescriptor:
mainList: Main list mainList: Main list
summary: Summary summary: Summary
moreOptions: More options
leftMenu: leftMenu:
addToPinned: Add to pinned addToPinned: Add to pinned
removeFromPinned: Remove from pinned removeFromPinned: Remove from pinned

69
src/pages/Customer/CustomerFilter.vue
View File

@ -101,8 +101,8 @@ const exprBuilder = (param, value) => {
</QItemSection> </QItemSection>
</QItem> </QItem>
<QItem class="q-mb-sm"> <QItem class="q-mb-sm">
<QItemSection <QItemSection>
><VnSelect <VnSelect
url="Provinces" url="Provinces"
:label="t('Province')" :label="t('Province')"
v-model="params.provinceFk" v-model="params.provinceFk"
@ -120,32 +120,31 @@ const exprBuilder = (param, value) => {
/> />
</QItemSection> </QItemSection>
</QItem> </QItem>
<QItem class="q-mb-md"> <QItem class="q-mb-sm">
<QItemSection> <QItemSection>
<VnInput :label="t('City')" v-model="params.city" is-outlined /> <VnInput :label="t('City')" v-model="params.city" is-outlined />
</QItemSection> </QItemSection>
</QItem> </QItem>
<QSeparator /> <QItem class="q-mb-sm">
<QExpansionItem :label="t('More options')" expand-separator> <QItemSection>
<QItem> <VnInput :label="t('Phone')" v-model="params.phone" is-outlined>
<QItemSection> <template #prepend>
<VnInput :label="t('Phone')" v-model="params.phone" is-outlined> <QIcon name="phone" size="xs" />
<template #prepend> </template>
<QIcon name="phone" size="xs" /> </VnInput>
</template> </QItemSection>
</VnInput> </QItem>
</QItemSection> <QItem class="q-mb-sm">
</QItem> <QItemSection>
<QItem> <VnInput :label="t('Email')" v-model="params.email" is-outlined>
<QItemSection> <template #prepend>
<VnInput :label="t('Email')" v-model="params.email" is-outlined> <QIcon name="email" size="sm" />
<template #prepend> </template>
<QIcon name="email" size="sm" /> </VnInput>
</template> </QItemSection>
</VnInput> </QItem>
</QItemSection> <QItem class="q-mb-sm">
</QItem> <QItemSection>
<QItem>
<VnSelect <VnSelect
url="Zones" url="Zones"
:label="t('Zone')" :label="t('Zone')"
@ -160,18 +159,17 @@ const exprBuilder = (param, value) => {
outlined outlined
rounded rounded
auto-load auto-load
/></QItemSection>
</QItem>
<QItem class="q-mb-sm">
<QItemSection>
<VnInput
:label="t('Postcode')"
v-model="params.postcode"
is-outlined
/> />
</QItem> </QItemSection>
<QItem> </QItem>
<QItemSection>
<VnInput
:label="t('Postcode')"
v-model="params.postcode"
is-outlined
/>
</QItemSection>
</QItem>
</QExpansionItem>
</template> </template>
</VnFilterPanel> </VnFilterPanel>
</template> </template>
@ -203,7 +201,6 @@ es:
Salesperson: Comercial Salesperson: Comercial
Province: Provincia Province: Provincia
City: Ciudad City: Ciudad
More options: Más opciones
Phone: Teléfono Phone: Teléfono
Email: Email Email: Email
Zone: Zona Zone: Zona

1
src/pages/InvoiceIn/InvoiceInFilter.vue
View File

@ -184,5 +184,4 @@ es:
Amount: Importe Amount: Importe
Issued: Fecha factura Issued: Fecha factura
Id or supplier: Id o proveedor Id or supplier: Id o proveedor
More options: Más opciones
</i18n> </i18n>

54
src/pages/InvoiceOut/InvoiceOutFilter.vue
View File

@ -83,36 +83,29 @@ const states = ref();
/> />
</QItemSection> </QItemSection>
</QItem> </QItem>
<QSeparator /> <QItem>
<QExpansionItem :label="t('More options')" expand-separator> <QItemSection>
<QItem> <VnInputDate
<QItemSection> v-model="params.issued"
<VnInputDate :label="t('Issued')"
v-model="params.issued" is-outlined
:label="t('Issued')" />
is-outlined </QItemSection>
/> </QItem>
</QItemSection> <QItem>
</QItem> <QItemSection>
<QItem> <VnInputDate
<QItemSection> v-model="params.created"
<VnInputDate :label="t('Created')"
v-model="params.created" is-outlined
:label="t('Created')" />
is-outlined </QItemSection>
/> </QItem>
</QItemSection> <QItem>
</QItem> <QItemSection>
<QItem> <VnInputDate v-model="params.dued" :label="t('Dued')" is-outlined />
<QItemSection> </QItemSection>
<VnInputDate </QItem>
v-model="params.dued"
:label="t('Dued')"
is-outlined
/>
</QItemSection>
</QItem>
</QExpansionItem>
</template> </template>
</VnFilterPanel> </VnFilterPanel>
</template> </template>
@ -149,5 +142,4 @@ es:
Issued: Fecha emisión Issued: Fecha emisión
Created: Fecha creación Created: Fecha creación
Dued: Fecha vencimiento Dued: Fecha vencimiento
More options: Más opciones
</i18n> </i18n>

148
src/pages/Ticket/TicketFilter.vue
View File

@ -212,81 +212,78 @@ const getGroupedStates = (data) => {
/> />
</QItemSection> </QItemSection>
</QItem> </QItem>
<QSeparator /> <QItem>
<QExpansionItem :label="t('More options')" expand-separator> <QItemSection v-if="!provinces">
<QItem> <QSkeleton type="QInput" class="full-width" />
<QItemSection v-if="!provinces"> </QItemSection>
<QSkeleton type="QInput" class="full-width" /> <QItemSection v-if="provinces">
</QItemSection> <QSelect
<QItemSection v-if="provinces"> :label="t('Province')"
<QSelect v-model="params.provinceFk"
:label="t('Province')" @update:model-value="searchFn()"
v-model="params.provinceFk" :options="provinces"
@update:model-value="searchFn()" option-value="id"
:options="provinces" option-label="name"
option-value="id" emit-value
option-label="name" map-options
emit-value use-input
map-options dense
use-input outlined
dense rounded
outlined />
rounded </QItemSection>
/> </QItem>
</QItemSection> <QItem>
</QItem> <QItemSection v-if="!agencies">
<QItem> <QSkeleton type="QInput" class="full-width" />
<QItemSection v-if="!agencies"> </QItemSection>
<QSkeleton type="QInput" class="full-width" /> <QItemSection v-if="agencies">
</QItemSection> <QSelect
<QItemSection v-if="agencies"> :label="t('Agency')"
<QSelect v-model="params.agencyModeFk"
:label="t('Agency')" @update:model-value="searchFn()"
v-model="params.agencyModeFk" :options="agencies"
@update:model-value="searchFn()" option-value="id"
:options="agencies" option-label="name"
option-value="id" emit-value
option-label="name" map-options
emit-value use-input
map-options dense
use-input outlined
dense rounded
outlined />
rounded </QItemSection>
/> </QItem>
</QItemSection> <QItem>
</QItem> <QItemSection v-if="!warehouses">
<QItem> <QSkeleton type="QInput" class="full-width" />
<QItemSection v-if="!warehouses"> </QItemSection>
<QSkeleton type="QInput" class="full-width" /> <QItemSection v-if="warehouses">
</QItemSection> <QSelect
<QItemSection v-if="warehouses"> :label="t('Warehouse')"
<QSelect v-model="params.warehouseFk"
:label="t('Warehouse')" @update:model-value="searchFn()"
v-model="params.warehouseFk" :options="warehouses"
@update:model-value="searchFn()" option-value="id"
:options="warehouses" option-label="name"
option-value="id" emit-value
option-label="name" map-options
emit-value use-input
map-options dense
use-input outlined
dense rounded
outlined />
rounded </QItemSection>
/> </QItem>
</QItemSection> <QItem>
</QItem> <QItemSection>
<QItem> <VnInput
<QItemSection> v-model="params.collectionFk"
<VnInput :label="t('Collection')"
v-model="params.collectionFk" is-outlined
:label="t('Collection')" />
is-outlined </QItemSection>
/> </QItem>
</QItemSection>
</QItem>
</QExpansionItem>
</template> </template>
</VnFilterPanel> </VnFilterPanel>
</template> </template>
@ -340,7 +337,6 @@ es:
With problems: Con problemas With problems: Con problemas
Invoiced: Facturado Invoiced: Facturado
Routed: Enrutado Routed: Enrutado
More options: Más opciones
Province: Provincia Province: Provincia
Agency: Agencia Agency: Agencia
Warehouse: Almacén Warehouse: Almacén