wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

Merge branch 'dev' into 7366-travelMigration2

This commit is contained in:
Alex Moreno 2024-07-03 08:32:00 +00:00
parent 27876b0bab 6f21e165a2
commit 1463cc8904
35 changed files with 271 additions and 498 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/CrudModel.vue
View File

@ -10,6 +10,7 @@ import VnPaginate from 'components/ui/VnPaginate.vue';
import VnConfirm from 'components/ui/VnConfirm.vue';
import SkeletonTable from 'components/ui/SkeletonTable.vue';
import { tMobile } from 'src/composables/tMobile';
import VnSubToolbar from './ui/VnSubToolbar.vue';
const { push } = useRouter();
const quasar = useQuasar();
@ -67,7 +68,7 @@ const $props = defineProps({
default: '',
description: 'It is used for redirect on click "save and continue"',
},
hasSubtoolbar: {
hasSubToolbar: {
type: Boolean,
default: true,
},
@ -313,8 +314,11 @@ watch(formUrl, async () => {
></slot>
</template>
</VnPaginate>
<SkeletonTable v-if="!formData" :columns="$attrs.columns?.length" />
<Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubtoolbar">
<SkeletonTable
v-if="!formData && $attrs.autoLoad"
:columns="$attrs.columns?.length"
/>
<Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
<QBtnGroup push style="column-gap: 10px">
<slot name="moreBeforeActions" />
<QBtn

2
src/components/LeftMenuItem.vue
View File

@ -21,7 +21,7 @@ const itemComputed = computed(() => {
</script>
<template>
<QItem
active-class="bg-hover"
active-class="bg-vn-hover"
class="min-height"
:to="{ name: itemComputed.name }"
clickable

2
src/components/VnTable/VnColumn.vue
View File

@ -134,7 +134,7 @@ const col = computed(() => {
const components = computed(() => $props.components ?? defaultComponents);
</script>
<template>
<div class="row no-wrap fit">
<div class="row no-wrap">
<VnComponent
v-if="col.before"
:prop="col.before"

16
src/components/VnTable/VnTable.vue
View File

@ -59,10 +59,14 @@ const $props = defineProps({
type: Boolean,
default: false,
},
hasSubtoolbar: {
hasSubToolbar: {
type: Boolean,
default: true,
},
disableOption: {
type: Object,
default: () => ({ card: false, table: false }),
},
});
const { t } = useI18n();
const stateStore = useStateStore();
@ -84,11 +88,13 @@ const tableModes = [
icon: 'view_column',
title: t('table view'),
value: TABLE_MODE,
disable: $props.disableOption?.table,
},
{
icon: 'grid_view',
title: t('grid view'),
value: DEFAULT_MODE,
disable: $props.disableOption?.card,
},
];
@ -232,7 +238,7 @@ defineExpose({
:search-url="searchUrl"
:disable-infinite-scroll="mode == TABLE_MODE"
@save-changes="reload"
:has-subtoolbar="$attrs['hasSubtoolbar'] ?? isEditable"
:has-sub-toolbar="$attrs['hasSubToolbar'] ?? isEditable"
>
<template
v-for="(_, slotName) in $slots"
@ -418,9 +424,9 @@ defineExpose({
>
<VnLv
:label="
!col.component &&
col.label &&
`${col.label}:`
!col.component && col.label
? `${col.label}:`
: ''
"
>
<template #value>

2
src/components/common/VnComponent.vue
View File

@ -12,7 +12,7 @@ const $props = defineProps({
default: () => {},
},
value: {
type: [Object, Number, String],
type: [Object, Number, String, Boolean],
default: () => {},
},
});

7
src/components/ui/VnSubToolbar.vue
View File

@ -1,6 +1,7 @@
<script setup>
import { onMounted, onUnmounted, ref } from 'vue';
import { onMounted, onBeforeUnmount, ref, nextTick } from 'vue';
import { useStateStore } from 'stores/useStateStore';
const stateStore = useStateStore();
const actions = ref(null);
const data = ref(null);
@ -24,9 +25,7 @@ onMounted(() => {
if (data.value) observer.observe(data.value, opts);
});
onUnmounted(() => {
stateStore.toggleSubToolbar();
});
onBeforeUnmount(() => stateStore.toggleSubToolbar());
</script>
<template>

9
src/css/app.scss
View File

@ -5,6 +5,7 @@
body.body--light {
--font-color: black;
--vn-section-color: #e0e0e0;
--vn-section-hover-color: #b9b9b9;
--vn-page-color: #ffffff;
--vn-text-color: var(--font-color);
--vn-label-color: #5f5f5f;
@ -19,6 +20,7 @@ body.body--light {
body.body--dark {
--vn-page-color: #222;
--vn-section-color: #3d3d3d;
--vn-section-hover-color: #747474;
--vn-text-color: white;
--vn-label-color: #a8a8a8;
--vn-accent-color: #424242;
@ -71,8 +73,9 @@ select:-webkit-autofill {
.bg-vn-section-color {
background-color: var(--vn-section-color);
}
.bg-hover {
background-color: #666666;
.bg-vn-hover {
background-color: var(--vn-section-hover-color);
}
.color-vn-label {
@ -183,8 +186,6 @@ select:-webkit-autofill {
justify-content: center;
}
/* q-notification row items-stretch q-notification--standard bg-negative text-white */
.q-card,
.q-table,
.q-table__bottom,

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

@ -90,6 +90,7 @@ globals:
send: Send
code: Code
pageTitles:
logIn: Login
summary: Summary
basicData: Basic data
log: Logs
@ -263,8 +264,6 @@ login:
loginError: Invalid username or password
fieldRequired: This field is required
twoFactorRequired: Two-factor verification required
pageTitles:
logIn: Login
twoFactor:
code: Code
validate: Validate
@ -1012,6 +1011,19 @@ wagon:
maxWagonHeight: 'The maximum height of the wagon is '
uncompleteTrays: There are incomplete trays
route:
pageTitles:
agency: Agency List
routes: Routes
cmrsList: CMRs list
RouteList: List
routeCreate: New route
basicData: Basic Data
summary: Summary
RouteRoadmap: Roadmaps
RouteRoadmapCreate: Create roadmap
tickets: Tickets
log: Log
autonomous: Autonomous
cmr:
list:
results: results

5
src/i18n/locale/es.yml
View File

@ -90,6 +90,7 @@ globals:
send: Enviar
code: Código
pageTitles:
logIn: Inicio de sesión
summary: Resumen
basicData: Datos básicos
log: Historial
@ -264,8 +265,6 @@ login:
loginError: Nombre de usuario o contraseña incorrectos
fieldRequired: Este campo es obligatorio
twoFactorRequired: Verificación de doble factor requerida
pageTitles:
logIn: Inicio de sesión
twoFactor:
code: Código
validate: Validar
@ -1002,7 +1001,7 @@ route:
list:
results: resultados
cmrFk: Id CMR
hasCmrDms: Adjuntado en gestdoc
hasCmrDms: Gestdoc
'true': Sí
'false': 'No'
ticketFk: Id ticket

72
src/pages/Agency/AgencyList.vue
View File

@ -1,72 +0,0 @@
<script setup>
import VnPaginate from 'src/components/ui/VnPaginate.vue';
import CardList from 'src/components/ui/CardList.vue';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
import { useRouter } from 'vue-router';
import { useI18n } from 'vue-i18n';
const { t } = useI18n();
const router = useRouter();
function navigate(id) {
router.push({ path: `/agency/${id}` });
}
function exprBuilder(param, value) {
if (!value) return;
if (param !== 'search') return;
if (!isNaN(value)) return { id: value };
return { name: { like: `%${value}%` } };
}
</script>
<template>
<VnSearchbar
:info="t('You can search by name')"
:label="t('Search agency')"
data-key="AgencyList"
url="Agencies"
/>
<QPage class="column items-center q-pa-md">
<div class="vn-card-list">
<VnPaginate
data-key="AgencyList"
url="Agencies"
order="name"
:expr-builder="exprBuilder"
>
<template #body="{ rows }">
<CardList
:id="row.id"
:key="row.id"
:title="row.name"
@click="navigate(row.id)"
v-for="row of rows"
>
<template #list-items>
<QCheckbox
:label="t('isOwn')"
v-model="row.isOwn"
:disable="true"
/>
<QCheckbox
:label="t('isAnyVolumeAllowed')"
v-model="row.isAnyVolumeAllowed"
:disable="true"
/>
</template>
</CardList>
</template>
</VnPaginate>
</div>
</QPage>
</template>
<i18n>
es:
isOwn: Tiene propietario
isAnyVolumeAllowed: Permite cualquier volumen
Search agency: Buscar agencia
You can search by name: Puedes buscar por nombre
en:
isOwn: Has owner
isAnyVolumeAllowed: Allows any volume
</i18n>

2
src/pages/Customer/Card/CustomerBasicData.vue
View File

@ -69,7 +69,7 @@ const filterOptions = {
<template #form="{ data, validate, filter }">
<VnRow class="row q-gutter-md q-mb-md">
<VnInput
:label="t('Comercial name')"
:label="t('globals.name')"
:rules="validate('client.socialName')"
autofocus
clearable

2
src/pages/Customer/Card/CustomerSummary.vue
View File

@ -73,7 +73,7 @@ const creditWarning = computed(() => {
:text="t('customer.summary.basicData')"
/>
<VnLv :label="t('customer.summary.customerId')" :value="entity.id" />
<VnLv :label="t('customer.summary.name')" :value="entity.name" />
<VnLv :label="t('globals.name')" :value="entity.name" />
<VnLv :label="t('customer.summary.contact')" :value="entity.contact" />
<VnLv :value="entity.phone">
<template #label>

3
src/pages/Customer/CustomerList.vue
View File

@ -38,7 +38,7 @@ const columns = computed(() => [
},
{
align: 'left',
label: t('customer.extendedList.tableVisibleColumns.name'),
label: t('globals.name'),
name: 'name',
isTitle: true,
create: true,
@ -408,6 +408,7 @@ function handleLocation(data, location) {
default-mode="table"
redirect="customer"
auto-load
:disable-option="{ card: true }"
>
<template #more-create-dialog="{ data }">
<VnLocation

92
src/pages/Route/Agency/AgencyList.vue Normal file
View File

@ -0,0 +1,92 @@
<script setup>
import { computed } from 'vue';
import { useRouter } from 'vue-router';
import { useI18n } from 'vue-i18n';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
import VnTable from 'components/VnTable/VnTable.vue';
const { t } = useI18n();
const router = useRouter();
function navigate(id) {
router.push({ path: `/agency/${id}` });
}
const exprBuilder = (param, value) => {
if (!value) return;
if (param !== 'search') return;
if (!isNaN(value)) return { id: value };
return { name: { like: `%${value}%` } };
};
const columns = computed(() => [
{
align: 'left',
name: 'id',
label: 'Id',
chip: {
condition: () => true,
},
isId: true,
},
{
align: 'left',
label: t('globals.name'),
name: 'name',
isTitle: true,
},
{
align: 'left',
label: t('isOwn'),
name: 'isOwn',
component: 'checkbox',
cardVisible: true,
},
{
align: 'left',
label: t('isAnyVolumeAllowed'),
name: 'isAnyVolumeAllowed',
component: 'checkbox',
cardVisible: true,
disable: true,
},
{
align: 'right',
label: '',
name: 'tableActions',
actions: [
{
title: t('Client ticket list'),
icon: 'preview',
action: (row) => navigate(row.id),
},
],
},
]);
</script>
<template>
<VnSearchbar
:info="t('You can search by name')"
:label="t('Search agency')"
data-key="AgencyList"
:expr-builder="exprBuilder"
/>
<VnTable
ref="tableRef"
data-key="AgencyList"
url="Agencies"
order="name"
:columns="columns"
:right-search="false"
:use-model="true"
/>
</template>
<i18n>
es:
isOwn: Tiene propietario
isAnyVolumeAllowed: Permite cualquier volumen
Search agency: Buscar agencia
You can search by name: Puedes buscar por nombre
en:
isOwn: Has owner
isAnyVolumeAllowed: Allows any volume
</i18n>

0
src/pages/Agency/Card/AgencyBasicData.vue → src/pages/Route/Agency/Card/AgencyBasicData.vue
View File

2
src/pages/Agency/Card/AgencyCard.vue → src/pages/Route/Agency/Card/AgencyCard.vue
View File

@ -1,5 +1,5 @@
<script setup>
import AgencyDescriptor from 'pages/Agency/Card/AgencyDescriptor.vue';
import AgencyDescriptor from 'pages/Route/Agency/Card/AgencyDescriptor.vue';
import VnCard from 'components/common/VnCard.vue';
</script>
<template>

0
src/pages/Agency/Card/AgencyDescriptor.vue → src/pages/Route/Agency/Card/AgencyDescriptor.vue
View File

0
src/pages/Agency/Card/AgencyLog.vue → src/pages/Route/Agency/Card/AgencyLog.vue
View File

0
src/pages/Agency/Card/AgencyModes.vue → src/pages/Route/Agency/Card/AgencyModes.vue
View File

2
src/pages/Agency/Card/AgencySummary.vue → src/pages/Route/Agency/Card/AgencySummary.vue
View File

@ -18,12 +18,10 @@ const entityId = computed(() => $props.id || useRoute().params.id);
<template #header="{ entity: agency }">{{ agency.name }}</template>
<template #body="{ entity: agency }">
<QCard class="vn-one">
<QCardSection class="q-pa-none">
<VnTitle
:url="`#/agency/${entityId}/basic-data`"
:text="t('globals.pageTitles.basicData')"
/>
</QCardSection>
<VnLv :label="t('globals.name')" :value="agency.name" />
<QCheckbox
:label="t('agency.isOwn')"

0
src/pages/Agency/Card/AgencyWorkcenter.vue → src/pages/Route/Agency/Card/AgencyWorkcenter.vue
View File

0
src/pages/Agency/locale/en.yml → src/pages/Route/Agency/locale/en.yml
View File

0
src/pages/Agency/locale/es.yml → src/pages/Route/Agency/locale/es.yml
View File

1
src/pages/Route/Card/RouteSearchbar.vue
View File

@ -9,7 +9,6 @@ const { t } = useI18n();
data-key="RouteList"
:label="t('Search route')"
:info="t('You can search by route reference')"
custom-route-redirect-name="RouteList"
/>
</template>

2
src/pages/Route/Cmr/CmrFilter.vue
View File

@ -154,7 +154,7 @@ const warehouses = ref();
es:
params:
cmrFk: Id cmr
hasCmrDms: Adjuntado en gestdoc
hasCmrDms: Gestdoc
ticketFk: Id ticket
country: País
clientFk: Id cliente

89
src/pages/Route/Cmr/CmrList.vue
View File

@ -12,6 +12,8 @@ import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy
import RightMenu from 'src/components/common/RightMenu.vue';
import { useStateStore } from 'src/stores/useStateStore';
import VnTable from 'components/VnTable/VnTable.vue';
const { t } = useI18n();
const { getTokenMultimedia } = useSession();
const token = getTokenMultimedia();
@ -107,88 +109,15 @@ function downloadPdfs() {
}
</script>
<template>
<RightMenu>
<template #right-panel>
<CmrFilter data-key="CmrList" />
</template>
</RightMenu>
<div class="column items-center">
<div class="list">
<VnPaginate data-key="CmrList" :url="`Routes/cmrs`" order="cmrFk DESC">
<template #body="{ rows }">
<QTable
<VnTable
ref="tableRef"
data-key="CmrList"
url="Routes/cmrs"
order="cmrFk DESC"
:columns="columns"
:rows="rows"
:dense="$q.screen.lt.md"
row-key="cmrFk"
selection="multiple"
v-model:selected="selected"
:grid="$q.screen.lt.md"
auto-load
>
<template #top>
<div style="width: 100%; display: table">
<div style="float: right; color: lightgray">
{{ `${rows.length} ${t('route.cmr.list.results')}` }}
</div>
</div>
</template>
<template #body-cell-hasCmrDms="{ value }">
<QTd align="center">
<QBadge
text-color="black"
:id="value ? 'true' : 'false'"
:label="
value
? t('route.cmr.list.true')
: t('route.cmr.list.false')
"
:right-search="true"
:use-model="true"
/>
</QTd>
</template>
<template #body-cell-ticketFk="{ value }">
<QTd align="right" class="text-primary">
<span class="text-primary link">{{ value }}</span>
<TicketDescriptorProxy :id="value" />
</QTd>
</template>
<template #body-cell-clientFk="{ value }">
<QTd align="right" class="text-primary">
<span class="text-primary link">{{ value }}</span>
<CustomerDescriptorProxy :id="value" />
</QTd>
</template>
<template #body-cell-warehouseFk="{ value }">
<QTd align="center">
{{ warehouses.find(({ id }) => id === value)?.name }}
</QTd>
</template>
<template #body-cell-icons="{ value }">
<QTd align="center">
<a :href="getCmrUrl(value)" target="_blank">
<QIcon
name="visibility"
color="primary"
size="md"
class="q-mr-sm q-ml-sm"
/>
<QTooltip>
{{ t('route.cmr.list.viewCmr') }}
</QTooltip>
</a>
</QTd>
</template>
</QTable>
</template>
</VnPaginate>
</div>
<QPageSticky :offset="[20, 20]">
<QBtn @click="downloadPdfs" fab icon="cloud_download" color="primary" />
<QTooltip>
{{ t('route.cmr.list.downloadCmrs') }}
</QTooltip>
</QPageSticky>
</div>
</template>
<style lang="scss" scoped>
.list {

346
src/pages/Route/RouteList.vue
View File

@ -1,29 +1,32 @@
<script setup>
import { useI18n } from 'vue-i18n';
import { computed, onMounted, ref } from 'vue';
import { useArrayData } from 'composables/useArrayData';
import { dashIfEmpty, toHour } from 'src/filters';
import { computed, onMounted, ref } from 'vue';
import { useI18n } from 'vue-i18n';
import { useValidator } from 'composables/useValidator';
import { useSession } from 'composables/useSession';
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import { useArrayData } from 'composables/useArrayData';
import { useQuasar } from 'quasar';
import axios from 'axios';
import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
import FetchData from 'components/FetchData.vue';
import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
import { useRouter } from 'vue-router';
import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
import RightMenu from 'src/components/common/RightMenu.vue';
import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
import VnPaginate from 'components/ui/VnPaginate.vue';
import VnSelect from 'components/common/VnSelect.vue';
import VnInputDate from 'components/common/VnInputDate.vue';
import VnInput from 'components/common/VnInput.vue';
import VnInputTime from 'components/common/VnInputTime.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import VnSelect from 'components/common/VnSelect.vue';
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
import VnInputDate from 'components/common/VnInputDate.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import VnTable from 'components/VnTable/VnTable.vue';
import { useStateStore } from 'src/stores/useStateStore';
const { t } = useI18n();
const { validate } = useValidator();
@ -40,90 +43,100 @@ const allColumnNames = ref([]);
const confirmationDialog = ref(false);
const startingDate = ref(null);
const refreshKey = ref(0);
const router = useRouter();
const stateStore = useStateStore();
const columns = computed(() => [
{
name: 'Id',
label: t('Id'),
field: (row) => row.id,
sortable: true,
align: 'center',
align: 'left',
name: 'id',
label: 'Id',
chip: {
condition: () => true,
},
isId: true,
columnFilter: {
name: 'search',
},
},
{
align: 'left',
name: 'worker',
label: t('Worker'),
field: (row) => row.workerUserName,
sortable: true,
align: 'left',
create: true,
component: 'select',
attrs: {
url: 'payrollComponents',
fields: ['id', 'name'],
},
cardVisible: true,
},
{
name: 'agency',
label: t('Agency'),
field: (row) => row.agencyName,
sortable: true,
align: 'left',
isTitle: true,
cardVisible: true,
create: true,
},
{
name: 'vehicle',
label: t('Vehicle'),
field: (row) => row.vehiclePlateNumber,
sortable: true,
align: 'left',
cardVisible: true,
create: true,
},
{
name: 'date',
label: t('Date'),
field: (row) => row.created,
sortable: true,
align: 'left',
cardVisible: true,
create: true,
},
{
name: 'volume',
label: 'm³',
field: (row) => dashIfEmpty(row.m3),
sortable: true,
align: 'center',
cardVisible: true,
},
{
name: 'description',
label: t('Description'),
field: (row) => row.description,
sortable: true,
align: 'left',
isTitle: true,
create: true,
},
{
name: 'started',
label: t('hourStarted'),
field: (row) => toHour(row.started),
sortable: true,
align: 'left',
},
{
name: 'finished',
label: t('hourFinished'),
field: (row) => toHour(row.finished),
sortable: true,
align: 'left',
},
{
name: 'isServed',
label: t('Served'),
field: (row) => Boolean(row.isOk),
sortable: true,
align: 'left',
},
{
name: 'actions',
label: '',
sortable: false,
align: 'right',
label: 'asdasd',
name: 'tableActions',
actions: [
{
title: t('Client ticket list'),
icon: 'preview',
action: (row) => navigate(row.id),
},
],
},
]);
const arrayData = useArrayData('EntryLatestBuys', {
url: 'Buys/latestBuysFilter',
order: ['itemFk DESC'],
});
function navigate(id) {
router.push({ path: `/route/${id}` });
}
const updateRoute = async (route) => {
try {
@ -181,20 +194,10 @@ const openTicketsDialog = (id) => {
})
.onOk(() => refreshKey.value++);
};
onMounted(async () => {
allColumnNames.value = columns.value.map((col) => col.name);
await arrayData.fetch({ append: false });
});
</script>
<template>
<RouteSearchbar />
<RightMenu>
<template #right-panel>
<RouteFilter data-key="RouteList" />
</template>
</RightMenu>
<QDialog v-model="confirmationDialog">
<QCard style="min-width: 350px">
<QCardSection>
@ -227,18 +230,24 @@ onMounted(async () => {
/>
<FetchData url="AgencyModes" @on-fetch="(data) => (agencyList = data)" auto-load />
<FetchData url="Vehicles" @on-fetch="(data) => (vehicleList = data)" auto-load />
<QPage class="column items-center">
<VnSubToolbar>
<template #st-data>
<TableVisibleColumns
class="LeftIcon"
:all-columns="allColumnNames"
table-code="routesList"
labels-traductions-path="route.columnLabels"
@on-config-saved="visibleColumns = [...$event]"
/>
</template>
<template #st-actions>
<VnSubToolbar />
<VnTable
ref="tableRef"
data-key="RouteList"
url="Routes/filter"
:columns="columns"
:right-search="true"
default-mode="table"
:is-editable="true"
:create="{
urlCreate: 'Routes',
title: t('Create route'),
onDataSaved: () => tableRef.reload(),
}"
save-url="routes"
:disable-option="{ card: true }"
>
<template #moreBeforeActions>
<QBtn
icon="vn:clone"
color="primary"
@ -267,216 +276,7 @@ onMounted(async () => {
<QTooltip>{{ t('Mark as served') }}</QTooltip>
</QBtn>
</template>
</VnSubToolbar>
<div class="route-list">
<VnPaginate
:key="refreshKey"
data-key="RouteList"
url="Routes/filter"
:order="['created ASC', 'started ASC', 'id ASC']"
:limit="20"
>
<template #body="{ rows }">
<div class="q-pa-md route-table">
<QTable
v-model:selected="selectedRows"
:columns="columns"
:rows="rows"
flat
row-key="id"
selection="multiple"
:rows-per-page-options="[0]"
:visible-columns="visibleColumns"
hide-pagination
:no-data-label="t('globals.noResults')"
style="max-height: 82vh"
>
<template #body-cell-worker="{ row }">
<QTd class="table-input-cell">
<VnSelect
:label="t('Worker')"
v-model="row.workerFk"
:options="workers"
option-value="id"
option-label="nickname"
hide-selected
dense
:emit-value="false"
:rules="validate('Route.workerFk')"
:is-clearable="false"
@update:model-value="updateRoute(row)"
>
<template #option="{ opt, itemProps }">
<QItem
v-bind="itemProps"
class="q-pa-xs row items-center"
>
<QItemSection
class="col-9 justify-center"
>
<span>{{ opt.name }}</span>
<span class="text-grey">{{
opt.nickname
}}</span>
</QItemSection>
</QItem>
</template>
</VnSelect>
</QTd>
</template>
<template #body-cell-agency="{ row }">
<QTd class="table-input-cell">
<VnSelect
:label="t('Agency')"
v-model="row.agencyModeFk"
:options="agencyList"
option-value="id"
option-label="name"
hide-selected
dense
:emit-value="false"
:rules="validate('route.agencyFk')"
:is-clearable="false"
@update:model-value="updateRoute(row)"
/>
</QTd>
</template>
<template #body-cell-vehicle="{ row }">
<QTd class="table-input-cell small-column">
<VnSelect
:label="t('Vehicle')"
v-model="row.vehicleFk"
:options="vehicleList"
option-value="id"
option-label="numberPlate"
hide-selected
dense
:emit-value="false"
:rules="validate('route.vehicleFk')"
:is-clearable="false"
@update:model-value="updateRoute(row)"
/>
</QTd>
</template>
<template #body-cell-date="{ row }">
<QTd class="table-input-cell small-column">
<VnInputDate
v-model="row.created"
hide-bottom-space
dense
:label="t('Date')"
:rules="validate('route.created')"
:is-clearable="false"
@update:model-value="updateRoute(row)"
/>
</QTd>
</template>
<template #body-cell-description="{ row }">
<QTd class="table-input-cell">
<VnInput
v-model="row.description"
:label="t('Description')"
:rules="validate('route.description')"
:is-clearable="false"
dense
@update:model-value="updateRoute(row)"
/>
</QTd>
</template>
<template #body-cell-started="{ row }">
<QTd class="table-input-cell small-column">
<VnInputTime
v-model="row.started"
:label="t('hourStarted')"
:rules="validate('route.started')"
:is-clearable="false"
hide-bottom-space
dense
@update:model-value="updateRoute(row)"
/>
</QTd>
</template>
<template #body-cell-finished="{ row }">
<QTd class="table-input-cell small-column">
<VnInputTime
v-model="row.finished"
autofocus
:label="t('hourFinished')"
:rules="validate('route.finished')"
:is-clearable="false"
hide-bottom-space
dense
@update:model-value="updateRoute(row)"
/>
</QTd>
</template>
<template #body-cell-isServed="props">
<QTd class="table-input-cell small-column">
<QCheckbox v-model="props.value" disable>
<QTooltip>
{{
props.value
? t('Route is closed')
: t('Route is not served')
}}
</QTooltip>
</QCheckbox>
</QTd>
</template>
<template #body-cell-actions="props">
<QTd :props="props">
<div class="flex items-center no-wrap table-actions">
<QIcon
name="vn:ticketAdd"
size="sm"
color="primary"
class="cursor-pointer"
@click="openTicketsDialog(props?.row?.id)"
>
<QTooltip>{{ t('Add ticket') }}</QTooltip>
</QIcon>
<QIcon
name="preview"
size="sm"
color="primary"
@click="
viewSummary(props?.row?.id, RouteSummary)
"
class="cursor-pointer"
>
<QTooltip>{{ t('Preview') }}</QTooltip>
</QIcon>
<RouterLink
:to="{
name: 'RouteSummary',
params: { id: props?.row?.id },
}"
>
<QIcon
name="vn:eye"
size="xs"
color="primary"
>
<QTooltip>{{ t('Summary') }}</QTooltip>
</QIcon>
</RouterLink>
</div>
</QTd>
</template>
</QTable>
</div>
</template>
</VnPaginate>
</div>
<QPageSticky :offset="[20, 20]">
<RouterLink :to="{ name: 'RouteCreate' }">
<QBtn fab icon="add" color="primary" />
<QTooltip>
{{ t('newRoute') }}
</QTooltip>
</RouterLink>
</QPageSticky>
</QPage>
</VnTable>
</template>
<style lang="scss" scoped>

2
src/pages/Route/RouteMain.vue
View File

@ -2,7 +2,7 @@
import { useStateStore } from 'stores/useStateStore';
import LeftMenu from 'src/components/LeftMenu.vue';
import { onMounted } from 'vue';
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
const stateStore = useStateStore();
onMounted(() => (stateStore.leftDrawer = false));
</script>

16
src/router/modules/agency.js
View File

@ -18,7 +18,7 @@ export default {
{
path: '/agency/:id',
name: 'AgencyCard',
component: () => import('src/pages/Agency/Card/AgencyCard.vue'),
component: () => import('src/pages/Route/Agency/Card/AgencyCard.vue'),
redirect: { name: 'AgencySummary' },
children: [
{
@ -28,7 +28,8 @@ export default {
title: 'summary',
icon: 'view_list',
},
component: () => import('src/pages/Agency/Card/AgencySummary.vue'),
component: () =>
import('src/pages/Route/Agency/Card/AgencySummary.vue'),
},
{
name: 'AgencyBasicData',
@ -37,7 +38,8 @@ export default {
title: 'basicData',
icon: 'vn:settings',
},
component: () => import('pages/Agency/Card/AgencyBasicData.vue'),
component: () =>
import('pages/Route/Agency/Card/AgencyBasicData.vue'),
},
{
path: 'workCenter',
@ -52,7 +54,9 @@ export default {
title: 'workCenters',
},
component: () =>
import('src/pages/Agency/Card/AgencyWorkcenter.vue'),
import(
'src/pages/Route/Agency/Card/AgencyWorkcenter.vue'
),
},
],
},
@ -69,7 +73,7 @@ export default {
title: 'modes',
},
component: () =>
import('src/pages/Agency/Card/AgencyModes.vue'),
import('src/pages/Route/Agency/Card/AgencyModes.vue'),
},
],
},
@ -80,7 +84,7 @@ export default {
title: 'log',
icon: 'history',
},
component: () => import('src/pages/Agency/Card/AgencyLog.vue'),
component: () => import('src/pages/Route/Agency/Card/AgencyLog.vue'),
},
],
},

3
src/router/modules/route.js
View File

@ -86,7 +86,8 @@ export default {
title: 'agencyList',
icon: 'view_list',
},
component: () => import('src/pages/Agency/AgencyList.vue'),
component: () =>
import('src/pages/Route/Agency/AgencyList.vue'),
},
],
},

0
test/cypress/integration/agency/agencyWorkCenter.spec.js → test/cypress/integration/route/agency/agencyWorkCenter.spec.js
View File

0
test/cypress/integration/vnBreadcrumbs.spec.js → test/cypress/integration/vnComponent/vnBreadcrumbs.spec.js
View File

0
test/cypress/integration/VnLocation.spec.js → test/cypress/integration/vnComponent/vnLocation.spec.js
View File

0
test/cypress/integration/vnLog.spec.js → test/cypress/integration/vnComponent/vnLog.spec.js
View File

0
test/cypress/integration/vnSearchBar.spec.js → test/cypress/integration/vnComponent/vnSearchBar.spec.js
View File