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

Searchbar propagation
gitea/salix-front/pipeline/head There was a failure building this commit Details

This commit is contained in:
Joan Sanchez 2023-02-24 11:04:02 +01:00
parent 48c4eccc08
commit c16df3efbc
14 changed files with 198 additions and 350 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/ui/VnSearchbar.vue
View File

@ -41,16 +41,13 @@ async function search() {
}); });
if (!props.redirect) return; if (!props.redirect) return;
const moduleRoute = route.matched[1];
console.log(moduleRoute);
const rows = store.data; const rows = store.data;
const module = route.matched[1];
if (rows.length === 1) { if (rows.length === 1) {
const firstRow = rows[0]; const [firstRow] = rows;
const stateName = `${moduleRoute.name}Card`; await router.push({ path: `/${module.name}/${firstRow.id}` });
await router.push({ name: stateName, params: { id: firstRow.id } });
} else if (route.matched.length > 3) { } else if (route.matched.length > 3) {
await router.push({ name: moduleRoute.name }); await router.push({ path: `/${module.name}` });
arrayData.updateStateParams(); arrayData.updateStateParams();
} }
} }

29
src/composables/useArrayData.js
View File

@ -25,13 +25,8 @@ export function useArrayData(key, userOptions) {
if (userOptions.url) store.url = userOptions.url; if (userOptions.url) store.url = userOptions.url;
if (userOptions.limit) store.limit = userOptions.limit; if (userOptions.limit) store.limit = userOptions.limit;
if (userOptions.order) store.order = userOptions.order; if (userOptions.order) store.order = userOptions.order;
//Object.assign(store.value, userOptions);
//console.log(options.value);
} }
// if (typeof userOptions === 'object' && userOptions.filter) {
// Object.assign(filter.value, userOptions.filter);
// }
onMounted(() => { onMounted(() => {
const query = route.query; const query = route.query;
if (query.params) { if (query.params) {
@ -91,6 +86,12 @@ export function useArrayData(key, userOptions) {
canceller = null; canceller = null;
} }
function clear() {
if (arrayDataStore.get(key)) {
arrayDataStore.clear(key);
}
}
function cancelRequest() { function cancelRequest() {
if (canceller) { if (canceller) {
canceller.abort(); canceller.abort();
@ -98,23 +99,6 @@ export function useArrayData(key, userOptions) {
} }
} }
// async function request({ userFilter }) {
// if (!store.url) return;
// const filter = {
// order: store.order,
// limit: store.limit,
// skip: store.skip,
// };
// Object.assign(filter, userFilter);
// const requestOptions = { params: { filter: filter } };
// const response = await axios.get(store.url, requestOptions);
// return response.data;
// }
async function applyFilter({ filter, params }) { async function applyFilter({ filter, params }) {
if (filter) store.userFilter = filter; if (filter) store.userFilter = filter;
if (params) store.userParams = Object.assign({}, params); if (params) store.userParams = Object.assign({}, params);
@ -161,6 +145,7 @@ export function useArrayData(key, userOptions) {
applyFilter, applyFilter,
addFilter, addFilter,
refresh, refresh,
clear,
loadMore, loadMore,
store, store,
hasMoreData, hasMoreData,

12
src/pages/Claim/Card/ClaimCard.vue
View File

@ -1,11 +1,18 @@
<script setup> <script setup>
import { useI18n } from 'vue-i18n';
import { useState } from 'composables/useState'; import { useState } from 'composables/useState';
import ClaimDescriptor from './ClaimDescriptor.vue'; import ClaimDescriptor from './ClaimDescriptor.vue';
import LeftMenu from 'components/LeftMenu.vue'; import LeftMenu from 'components/LeftMenu.vue';
import TeleportSlot from 'components/ui/TeleportSlot.vue';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
const state = useState(); const state = useState();
const { t } = useI18n();
</script> </script>
<template> <template>
<teleport-slot to="#searchbar">
<VnSearchbar data-key="ClaimList" :label="t('Search by claim id or name')" />
</teleport-slot>
<q-drawer v-model="state.drawer.value" show-if-above :width="256" :breakpoint="500"> <q-drawer v-model="state.drawer.value" show-if-above :width="256" :breakpoint="500">
<q-scroll-area class="fit"> <q-scroll-area class="fit">
<claim-descriptor /> <claim-descriptor />
@ -19,3 +26,8 @@ const state = useState();
</q-page> </q-page>
</q-page-container> </q-page-container>
</template> </template>
<i18n>
es:
Search by claim id or name: Buscar por id o nombre de la reclamación
</i18n>

223
src/pages/Claim/ClaimFilter.vue
View File

@ -1,223 +0,0 @@
<script setup>
// import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
import FetchData from 'components/FetchData.vue';
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
const { t } = useI18n();
const props = defineProps({
dataKey: {
type: String,
required: true,
},
});
</script>
<template>
<fetch-data
url="Workers/activeWithInheritedRole"
:filter="{ where: { role: 'salesPerson' } }"
@on-fetch="setWorkers"
auto-load
/>
<VnFilterPanel :data-key="props.dataKey" :search-button="true">
<template #tags="{ tag }">
<div class="q-gutter-x-xs">
<strong>{{ t(`params.${tag.label}`) }}: </strong>
<span>"{{ tag.value }}"</span>
</div>
</template>
<template #body="{ params, searchFn }">
<q-list>
<q-item>
<q-item-section>
<q-input :label="t('FI')" v-model="params.fi" lazy-rules>
<template #prepend>
<q-icon name="badge" size="sm"></q-icon>
</template>
</q-input>
</q-item-section>
</q-item>
<q-item>
<q-item-section>
<q-input :label="t('Name')" v-model="params.name" lazy-rules />
</q-item-section>
</q-item>
<q-item>
<q-item-section>
<q-input
:label="t('Social Name')"
v-model="params.socialName"
lazy-rules
/>
</q-item-section>
</q-item>
<q-item>
<q-item-section v-if="!workers">
<q-skeleton type="QInput" class="full-width" />
</q-item-section>
<q-item-section v-if="workers">
<q-select
@update:model-value="searchFn()"
:label="t('Salesperson')"
v-model="params.salesPersonFk"
:options="workers"
option-value="id"
option-label="name"
emit-value
map-options
use-input
:input-debounce="0"
>
<template #prepend>
<q-avatar color="orange" size="xs">
<q-img
v-if="params.salesPersonFk"
:src="`/api/Images/user/160x160/${params.salesPersonFk}/download?access_token=${token}`"
spinner-color="white"
/>
</q-avatar>
</template>
</q-select>
</q-item-section>
</q-item>
<q-item>
<q-item-section v-if="!provinces">
<q-skeleton type="QInput" class="full-width" />
</q-item-section>
<q-item-section v-if="provinces">
<q-select
@update:model-value="searchFn()"
:label="t('Province')"
v-model="params.provinceFk"
:options="provinces"
option-value="id"
option-label="name"
emit-value
map-options
/>
</q-item-section>
</q-item>
<q-item class="q-mb-md">
<q-item-section>
<q-input :label="t('City')" v-model="params.city" lazy-rules />
</q-item-section>
</q-item>
<q-separator />
<q-expansion-item :label="t('More options')" expand-separator>
<q-item>
<q-item-section>
<q-input
:label="t('Phone')"
v-model="params.phone"
lazy-rules
>
<template #prepend>
<q-icon name="phone" size="sm"></q-icon>
</template>
</q-input>
</q-item-section>
</q-item>
<q-item>
<q-item-section>
<q-input
:label="t('Email')"
v-model="params.email"
lazy-rules
>
<template #prepend>
<q-icon name="email" size="sm"></q-icon>
</template>
</q-input>
</q-item-section>
</q-item>
<q-item>
<q-item-section v-if="!zones">
<q-skeleton type="QInput" class="full-width" />
</q-item-section>
<q-item-section v-if="zones">
<q-select
@update:model-value="searchFn"
:label="t('Zone')"
v-model="params.zoneFk"
:options="zones"
option-value="id"
option-label="name"
emit-value
map-options
/>
</q-item-section>
</q-item>
<q-item>
<q-item-section>
<q-input
:label="t('Postcode')"
v-model="params.postcode"
lazy-rules
/>
</q-item-section>
</q-item>
</q-expansion-item>
</q-list>
</template>
</VnFilterPanel>
</template>
<i18n>
en:
params:
fi: FI
name: Name
socialName: Social Name
salesPersonFk: Salesperson
provinceFk: Province
city: City
phone: Phone
email: Email
zoneFk: Zone
postcode: Postcode
es:
params:
fi: NIF
name: Nombre
socialName: Razón Social
salesPersonFk: Comercial
provinceFk: Provincia
city: Ciudad
phone: Teléfono
email: Email
zoneFk: Zona
postcode: CP
FI: NIF
Name: Nombre
Social Name: Razón social
Salesperson: Comercial
Province: Provincia
City: Ciudad
More options: Más opciones
Phone: Teléfono
Email: Email
Zone: Zona
Postcode: Código postal
</i18n>
<!-- <i18n>
{
"en": {
"fi": "Fiscal ID",
"name": "Name",
"socialName": "Social Name",
"salesPersonFk": "Salesperson",
"provinceFk": "Province",
"city": "City",
"zoneFk": "Zone",
"postcode": "Postcode"
},
"es": {
"fi": "NIF",
"name": "Nombre",
"socialName": "Razón social",
"salesPersonFk": "Comercial"
}
}
</i18n> -->

93
src/pages/Claim/ClaimList.vue
View File

@ -1,31 +1,24 @@
<script setup> <script setup>
import { onMounted, onUnmounted } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import { useQuasar } from 'quasar'; import { useQuasar } from 'quasar';
import { useStateStore } from 'stores/useStateStore';
import { toDate } from 'src/filters/index'; import { toDate } from 'src/filters/index';
import Paginate from 'src/components/PaginateData.vue'; import Paginate from 'src/components/PaginateData.vue';
import ClaimSummaryDialog from './Card/ClaimSummaryDialog.vue'; import ClaimSummaryDialog from './Card/ClaimSummaryDialog.vue';
import CustomerDescriptorPopover from 'src/pages/Customer/Card/CustomerDescriptorPopover.vue'; import CustomerDescriptorPopover from 'src/pages/Customer/Card/CustomerDescriptorPopover.vue';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
import TeleportSlot from 'components/ui/TeleportSlot.vue'; import TeleportSlot from 'components/ui/TeleportSlot.vue';
import ClaimFilter from './ClaimFilter.vue'; import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
const state = useStateStore();
const router = useRouter(); const router = useRouter();
const quasar = useQuasar(); const quasar = useQuasar();
const { t } = useI18n(); const { t } = useI18n();
onMounted(() => state.toggleRightDrawer()); function stateColor(code) {
onUnmounted(() => state.toggleRightDrawer()); if (code === 'pending') return 'green';
if (code === 'managed') return 'orange';
// function stateColor(code) { if (code === 'resolved') return 'red';
// if (code === 'pending') return 'green'; }
// if (code === 'managed') return 'orange';
// if (code === 'resolved') return 'red';
// }
function navigate(id) { function navigate(id) {
router.push({ path: `/claim/${id}` }); router.push({ path: `/claim/${id}` });
@ -45,16 +38,8 @@ function viewSummary(id) {
<teleport-slot to="#searchbar"> <teleport-slot to="#searchbar">
<VnSearchbar data-key="ClaimList" :label="t('Search by claim id or name')" /> <VnSearchbar data-key="ClaimList" :label="t('Search by claim id or name')" />
</teleport-slot> </teleport-slot>
<teleport-slot to="#rightPanel">
<ClaimFilter data-key="ClaimList" />
</teleport-slot>
<q-page class="q-pa-md"> <q-page class="q-pa-md">
<paginate <paginate data-key="ClaimList" url="Claims/filter" sort-by="id DESC" auto-load>
data-key="ClaimList"
url="Claims/filter"
sort-by="id DESC"
auto-load
>
<template #body="{ rows }"> <template #body="{ rows }">
<q-card class="card" v-for="row of rows" :key="row.id"> <q-card class="card" v-for="row of rows" :key="row.id">
<q-item <q-item
@ -73,40 +58,41 @@ function viewSummary(id) {
<q-list> <q-list>
<q-item class="q-pa-none"> <q-item class="q-pa-none">
<q-item-section> <q-item-section>
<q-item-label caption>{{ <q-item-label caption>
t('claim.list.customer') {{ t('claim.list.customer') }}
}}</q-item-label> </q-item-label>
<q-item-label>{{ row.clientName }}</q-item-label> <q-item-label>{{ row.clientName }}</q-item-label>
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<q-item-label caption>{{ <q-item-label caption>
t('claim.list.assignedTo') {{ t('claim.list.assignedTo') }}
}}</q-item-label> </q-item-label>
<q-item-label>{{ row.workerName }}</q-item-label> <q-item-label>{{ row.workerName }}</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item class="q-pa-none"> <q-item class="q-pa-none">
<q-item-section> <q-item-section>
<q-item-label caption>{{ <q-item-label caption>
t('claim.list.created') {{ t('claim.list.created') }}
}}</q-item-label> </q-item-label>
<q-item-label>{{
toDate(row.created)
}}</q-item-label>
</q-item-section>
<!-- <q-item-section>
<q-item-label caption>{{
t('claim.list.state')
}}</q-item-label>
<q-item-label> <q-item-label>
<q-chip {{ toDate(row.created) }}
:color="stateColor(row.claimState.code)" </q-item-label>
</q-item-section>
<q-item-section>
<q-item-label caption>
{{ t('claim.list.state') }}
</q-item-label>
<q-item-label>
<q-badge
:color="stateColor(row.stateCode)"
class="q-ma-none"
dense dense
> >
{{ row.claimState.description }} {{ row.stateDescription }}
</q-chip> </q-badge>
</q-item-label> </q-item-label>
</q-item-section> --> </q-item-section>
</q-item> </q-item>
</q-list> </q-list>
</q-item-section> </q-item-section>
@ -139,9 +125,9 @@ function viewSummary(id) {
icon="arrow_circle_right" icon="arrow_circle_right"
@click="navigate(row.id)" @click="navigate(row.id)"
> >
<q-tooltip>{{ <q-tooltip>
t('components.smartCard.openCard') {{ t('components.smartCard.openCard') }}
}}</q-tooltip> </q-tooltip>
</q-btn> </q-btn>
<q-btn <q-btn
flat flat
@ -150,14 +136,14 @@ function viewSummary(id) {
icon="preview" icon="preview"
@click="viewSummary(row.id)" @click="viewSummary(row.id)"
> >
<q-tooltip>{{ <q-tooltip>
t('components.smartCard.openSummary') {{ t('components.smartCard.openSummary') }}
}}</q-tooltip> </q-tooltip>
</q-btn> </q-btn>
<q-btn flat round color="grey-7" icon="vn:client"> <q-btn flat round color="grey-7" icon="vn:client">
<q-tooltip>{{ <q-tooltip>
t('components.smartCard.viewDescription') {{ t('components.smartCard.viewDescription') }}
}}</q-tooltip> </q-tooltip>
<q-popup-proxy> <q-popup-proxy>
<customer-descriptor-popover :customer="row.client" /> <customer-descriptor-popover :customer="row.client" />
</q-popup-proxy> </q-popup-proxy>
@ -169,6 +155,7 @@ function viewSummary(id) {
</paginate> </paginate>
</q-page> </q-page>
</template> </template>
<i18n> <i18n>
es: es:
Search by claim id or name: Buscar por id o nombre de la reclamación Search by claim id or name: Buscar por id o nombre de la reclamación

2
src/pages/Claim/ClaimMain.vue
View File

@ -6,7 +6,7 @@ const state = useState();
</script> </script>
<template> <template>
<q-drawer v-model="state.drawer.value" show-if-above :width="256" :breakpoint="500"> <q-drawer v-model="state.drawer.value" show-if-above :width="256" :breakpoint="800">
<q-scroll-area class="fit text-grey-8"> <q-scroll-area class="fit text-grey-8">
<LeftMenu /> <LeftMenu />
</q-scroll-area> </q-scroll-area>

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

@ -70,9 +70,9 @@ function setWorkers(data) {
</q-item-section> </q-item-section>
<q-item-section v-if="workers"> <q-item-section v-if="workers">
<q-select <q-select
@update:model-value="searchFn()"
:label="t('Salesperson')" :label="t('Salesperson')"
v-model="params.salesPersonFk" v-model="params.salesPersonFk"
@update:model-value="searchFn()"
:options="workers" :options="workers"
option-value="id" option-value="id"
option-label="name" option-label="name"
@ -99,9 +99,9 @@ function setWorkers(data) {
</q-item-section> </q-item-section>
<q-item-section v-if="provinces"> <q-item-section v-if="provinces">
<q-select <q-select
@update:model-value="searchFn()"
:label="t('Province')" :label="t('Province')"
v-model="params.provinceFk" v-model="params.provinceFk"
@update:model-value="searchFn()"
:options="provinces" :options="provinces"
option-value="id" option-value="id"
option-label="name" option-label="name"
@ -149,9 +149,9 @@ function setWorkers(data) {
</q-item-section> </q-item-section>
<q-item-section v-if="zones"> <q-item-section v-if="zones">
<q-select <q-select
@update:model-value="searchFn"
:label="t('Zone')" :label="t('Zone')"
v-model="params.zoneFk" v-model="params.zoneFk"
@update:model-value="searchFn()"
:options="zones" :options="zones"
option-value="id" option-value="id"
option-label="name" option-label="name"

2
src/pages/Customer/CustomerMain.vue
View File

@ -10,7 +10,7 @@ const stateStore = useStateStore();
v-model="stateStore.leftDrawer" v-model="stateStore.leftDrawer"
show-if-above show-if-above
:width="256" :width="256"
:breakpoint="500" :breakpoint="800"
> >
<q-scroll-area class="fit text-grey-8"> <q-scroll-area class="fit text-grey-8">
<LeftMenu /> <LeftMenu />

16
src/pages/Dashboard/DashboardMain.vue
View File

@ -9,15 +9,13 @@ const state = useState();
const navigation = useNavigationStore(); const navigation = useNavigationStore();
const { t } = useI18n(); const { t } = useI18n();
onMounted(() => { onMounted(() => navigation.fetchPinned());
navigation.fetchPinned();
});
const pinnedModules = computed(() => navigation.getPinnedModules()); const pinnedModules = computed(() => navigation.getPinnedModules());
</script> </script>
<template> <template>
<q-drawer v-model="state.drawer.value" show-if-above :width="256" :breakpoint="500"> <q-drawer v-model="state.drawer.value" show-if-above :width="256" :breakpoint="800">
<q-scroll-area class="fit text-grey-8"> <q-scroll-area class="fit text-grey-8">
<LeftMenu /> <LeftMenu />
</q-scroll-area> </q-scroll-area>
@ -26,13 +24,19 @@ const pinnedModules = computed(() => navigation.getPinnedModules());
<q-page class="q-pa-md"> <q-page class="q-pa-md">
<div class="row items-start wrap q-col-gutter-md q-mb-lg"> <div class="row items-start wrap q-col-gutter-md q-mb-lg">
<div class="col-12 col-md"> <div class="col-12 col-md">
<div class="text-h6 text-grey-8 q-mb-sm">{{ t('globals.pinnedModules') }}</div> <div class="text-h6 text-grey-8 q-mb-sm">
{{ t('globals.pinnedModules') }}
</div>
<q-card class="row flex-container q-pa-md"> <q-card class="row flex-container q-pa-md">
<div class="text-grey-5" v-if="pinnedModules.length === 0"> <div class="text-grey-5" v-if="pinnedModules.length === 0">
{{ t('pinnedInfo') }} {{ t('pinnedInfo') }}
</div> </div>
<template v-if="pinnedModules.length"> <template v-if="pinnedModules.length">
<div v-for="item of pinnedModules" :key="item.title" class="row no-wrap q-pa-xs flex-item"> <div
v-for="item of pinnedModules"
:key="item.title"
class="row no-wrap q-pa-xs flex-item"
>
<q-btn <q-btn
align="evenly" align="evenly"
padding="16px" padding="16px"

17
src/pages/InvoiceOut/Card/InvoiceOutCard.vue
View File

@ -1,11 +1,21 @@
<script setup> <script setup>
import { useState } from 'src/composables/useState'; import { useI18n } from 'vue-i18n';
import { useState } from 'composables/useState';
import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue'; import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
import LeftMenu from 'components/LeftMenu.vue'; import LeftMenu from 'components/LeftMenu.vue';
import TeleportSlot from 'components/ui/TeleportSlot.vue';
import VnSearchbar from 'components/ui/VnSearchbar.vue';
const state = useState(); const state = useState();
const { t } = useI18n();
</script> </script>
<template> <template>
<teleport-slot to="#searchbar">
<VnSearchbar
data-key="InvoiceOutList"
:label="t('Search by invoice id or reference')"
/>
</teleport-slot>
<q-drawer v-model="state.drawer.value" show-if-above :width="256" :breakpoint="500"> <q-drawer v-model="state.drawer.value" show-if-above :width="256" :breakpoint="500">
<q-scroll-area class="fit"> <q-scroll-area class="fit">
<InvoiceOutDescriptor /> <InvoiceOutDescriptor />
@ -19,3 +29,8 @@ const state = useState();
</q-page> </q-page>
</q-page-container> </q-page-container>
</template> </template>
<i18n>
es:
Search by invoice id or reference: Buscar por id o referencia de la factura
</i18n>

95
src/pages/InvoiceOut/InvoiceOutList.vue
View File

@ -6,6 +6,9 @@ import Paginate from 'src/components/PaginateData.vue';
import InvoiceOutSummaryDialog from './Card/InvoiceOutSummaryDialog.vue'; import InvoiceOutSummaryDialog from './Card/InvoiceOutSummaryDialog.vue';
import { toDate, toCurrency } from 'src/filters/index'; import { toDate, toCurrency } from 'src/filters/index';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
import TeleportSlot from 'components/ui/TeleportSlot.vue';
const router = useRouter(); const router = useRouter();
const quasar = useQuasar(); const quasar = useQuasar();
const { t } = useI18n(); const { t } = useI18n();
@ -25,54 +28,107 @@ function viewSummary(id) {
</script> </script>
<template> <template>
<teleport-slot to="#searchbar">
<VnSearchbar
data-key="InvoiceOutList"
:label="t('Search by invoice id or reference')"
/>
</teleport-slot>
<q-page class="q-pa-md"> <q-page class="q-pa-md">
<paginate url="/InvoiceOuts/filter" sort-by="issued DESC, id DESC" auto-load> <paginate
data-key="InvoiceOutList"
url="InvoiceOuts/filter"
sort-by="issued DESC, id DESC"
auto-load
>
<template #body="{ rows }"> <template #body="{ rows }">
<q-card class="card" v-for="row of rows" :key="row.id"> <q-card class="card" v-for="row of rows" :key="row.id">
<q-item class="q-pa-none items-start cursor-pointer q-hoverable" v-ripple clickable> <q-item
class="q-pa-none items-start cursor-pointer q-hoverable"
v-ripple
clickable
>
<q-item-section class="q-pa-md" @click="navigate(row.id)"> <q-item-section class="q-pa-md" @click="navigate(row.id)">
<div class="text-h6">{{ row.ref }}</div> <div class="text-h6">{{ row.ref }}</div>
<q-item-label caption>#{{ row.id }}</q-item-label> <q-item-label caption>#{{ row.id }}</q-item-label>
<q-list> <q-list>
<q-item class="q-pa-none"> <q-item class="q-pa-none">
<q-item-section> <q-item-section>
<q-item-label caption>{{ t('invoiceOut.list.issued') }}</q-item-label> <q-item-label caption>
<q-item-label>{{ toDate(row.issued) }}</q-item-label> {{ t('invoiceOut.list.issued') }}
</q-item-label>
<q-item-label>
{{ toDate(row.issued) }}
</q-item-label>
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<q-item-label caption>{{ t('invoiceOut.list.amount') }}</q-item-label> <q-item-label caption>
<q-item-label>{{ toCurrency(row.amount) }}</q-item-label> {{ t('invoiceOut.list.amount') }}
</q-item-label>
<q-item-label>
{{ toCurrency(row.amount) }}
</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item class="q-pa-none"> <q-item class="q-pa-none">
<q-item-section> <q-item-section>
<q-item-label caption>{{ t('invoiceOut.list.client') }}</q-item-label> <q-item-label caption>
<q-item-label>{{ row.clientSocialName }}</q-item-label> {{ t('invoiceOut.list.client') }}
</q-item-label>
<q-item-label>
{{ row.clientSocialName }}
</q-item-label>
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<q-item-label caption>{{ t('invoiceOut.list.created') }}</q-item-label> <q-item-label caption>
<q-item-label>{{ toDate(row.created) }}</q-item-label> {{ t('invoiceOut.list.created') }}
</q-item-label>
<q-item-label>
{{ toDate(row.created) }}
</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item class="q-pa-none"> <q-item class="q-pa-none">
<q-item-section> <q-item-section>
<q-item-label caption>{{ t('invoiceOut.list.company') }}</q-item-label> <q-item-label caption>
{{ t('invoiceOut.list.company') }}
</q-item-label>
<q-item-label>{{ row.companyCode }}</q-item-label> <q-item-label>{{ row.companyCode }}</q-item-label>
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<q-item-label caption>{{ t('invoiceOut.list.dued') }}</q-item-label> <q-item-label caption>
<q-item-label>{{ toDate(row.dued) }}</q-item-label> {{ t('invoiceOut.list.dued') }}
</q-item-label>
<q-item-label>
{{ toDate(row.dued) }}
</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
</q-list> </q-list>
</q-item-section> </q-item-section>
<q-separator vertical /> <q-separator vertical />
<q-card-actions vertical class="justify-between"> <q-card-actions vertical class="justify-between">
<q-btn flat round color="orange" icon="arrow_circle_right" @click="navigate(row.id)"> <q-btn
<q-tooltip>{{ t('components.smartCard.openCard') }}</q-tooltip> flat
round
color="orange"
icon="arrow_circle_right"
@click="navigate(row.id)"
>
<q-tooltip>
{{ t('components.smartCard.openCard') }}
</q-tooltip>
</q-btn> </q-btn>
<q-btn flat round color="grey-7" icon="preview" @click="viewSummary(row.id)"> <q-btn
<q-tooltip>{{ t('components.smartCard.openSummary') }}</q-tooltip> flat
round
color="grey-7"
icon="preview"
@click="viewSummary(row.id)"
>
<q-tooltip>
{{ t('components.smartCard.openSummary') }}
</q-tooltip>
</q-btn> </q-btn>
</q-card-actions> </q-card-actions>
</q-item> </q-item>
@ -81,3 +137,8 @@ function viewSummary(id) {
</paginate> </paginate>
</q-page> </q-page>
</template> </template>
<i18n>
es:
Search by invoice id or reference: Buscar por id o referencia de la factura
</i18n>

2
src/pages/InvoiceOut/InvoiceOutMain.vue
View File

@ -6,7 +6,7 @@ const state = useState();
</script> </script>
<template> <template>
<q-drawer v-model="state.drawer.value" show-if-above :width="256" :breakpoint="500"> <q-drawer v-model="state.drawer.value" show-if-above :width="256" :breakpoint="800">
<q-scroll-area class="fit text-grey-8"> <q-scroll-area class="fit text-grey-8">
<LeftMenu /> <LeftMenu />
</q-scroll-area> </q-scroll-area>

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

@ -42,6 +42,8 @@ function formatValue(value) {
<template> <template>
<fetch-data url="Provinces" @on-fetch="(data) => (provinces = data)" auto-load /> <fetch-data url="Provinces" @on-fetch="(data) => (provinces = data)" auto-load />
<fetch-data url="States" @on-fetch="(data) => (states = data)" auto-load /> <fetch-data url="States" @on-fetch="(data) => (states = data)" auto-load />
<fetch-data url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
<fetch-data url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
<fetch-data <fetch-data
url="Workers/activeWithInheritedRole" url="Workers/activeWithInheritedRole"
:filter="{ where: { role: 'salesPerson' } }" :filter="{ where: { role: 'salesPerson' } }"
@ -154,6 +156,7 @@ function formatValue(value) {
<q-select <q-select
:label="t('State')" :label="t('State')"
v-model="params.stateFk" v-model="params.stateFk"
@update:model-value="searchFn()"
:options="states" :options="states"
option-value="id" option-value="id"
option-label="name" option-label="name"
@ -224,6 +227,7 @@ function formatValue(value) {
<q-select <q-select
:label="t('Province')" :label="t('Province')"
v-model="params.provinceFk" v-model="params.provinceFk"
@update:model-value="searchFn()"
:options="provinces" :options="provinces"
option-value="id" option-value="id"
option-label="name" option-label="name"
@ -237,6 +241,7 @@ function formatValue(value) {
<q-select <q-select
:label="t('Agency')" :label="t('Agency')"
v-model="params.agencyModeFk" v-model="params.agencyModeFk"
@update:model-value="searchFn()"
:options="agencies" :options="agencies"
option-value="id" option-value="id"
option-label="name" option-label="name"
@ -250,6 +255,7 @@ function formatValue(value) {
<q-select <q-select
:label="t('Warehouse')" :label="t('Warehouse')"
v-model="params.warehouseFk" v-model="params.warehouseFk"
@update:model-value="searchFn()"
:options="warehouses" :options="warehouses"
option-value="id" option-value="id"
option-label="name" option-label="name"
@ -278,6 +284,9 @@ en:
pending: Pending pending: Pending
hasInvoice: Invoiced hasInvoice: Invoiced
hasRoute: Routed hasRoute: Routed
provinceFk: Province
agencyModeFk: Agency
warehouseFk: Warehouse
es: es:
params: params:
search: Contiene search: Contiene

27
src/pages/Ticket/TicketList.vue
View File

@ -108,13 +108,13 @@ function viewSummary(id) {
{{ t('ticket.list.state') }} {{ t('ticket.list.state') }}
</q-item-label> </q-item-label>
<q-item-label> <q-item-label>
<q-chip <q-badge
:color="stateColor(row)" :color="stateColor(row)"
class="q-ma-none" class="q-ma-none"
dense dense
> >
{{ row.state }} {{ row.state }}
</q-chip> </q-badge>
</q-item-label> </q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
@ -129,10 +129,10 @@ function viewSummary(id) {
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<q-item-label caption> <q-item-label caption>
{{ t('ticket.list.landed') }} {{ t('Zone') }}
</q-item-label> </q-item-label>
<q-item-label> <q-item-label>
{{ toDate(row.landed) }} {{ row.zoneName }}
</q-item-label> </q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
@ -149,9 +149,9 @@ function viewSummary(id) {
<q-item-label caption> <q-item-label caption>
{{ t('ticket.list.total') }} {{ t('ticket.list.total') }}
</q-item-label> </q-item-label>
<q-item-label>{{ <q-item-label>
toCurrency(row.totalWithVat) {{ toCurrency(row.totalWithVat) }}
}}</q-item-label> </q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
</q-list> </q-list>
@ -165,9 +165,9 @@ function viewSummary(id) {
icon="arrow_circle_right" icon="arrow_circle_right"
@click="navigate(row.id)" @click="navigate(row.id)"
> >
<q-tooltip>{{ <q-tooltip>
t('components.smartCard.openCard') {{ t('components.smartCard.openCard') }}
}}</q-tooltip> </q-tooltip>
</q-btn> </q-btn>
<q-btn <q-btn
flat flat
@ -176,9 +176,9 @@ function viewSummary(id) {
icon="preview" icon="preview"
@click="viewSummary(row.id)" @click="viewSummary(row.id)"
> >
<q-tooltip>{{ <q-tooltip>
t('components.smartCard.openSummary') {{ t('components.smartCard.openSummary') }}
}}</q-tooltip> </q-tooltip>
</q-btn> </q-btn>
</q-card-actions> </q-card-actions>
</q-item> </q-item>
@ -191,4 +191,5 @@ function viewSummary(id) {
<i18n> <i18n>
es: es:
Search by ticket id or alias: Buscar por id o nombre del ticket Search by ticket id or alias: Buscar por id o nombre del ticket
Zone: Zona
</i18n> </i18n>