refactor: refs #8626 update button styles and improve route redirection logic
This commit is contained in:
parent
5ec4a9bc5b
commit
8bbd3a63ab
|
@ -332,6 +332,7 @@ const openTicketsDialog = (id) => {
|
||||||
<QBtn
|
<QBtn
|
||||||
icon="vn:clone"
|
icon="vn:clone"
|
||||||
color="primary"
|
color="primary"
|
||||||
|
flat
|
||||||
class="q-mr-sm"
|
class="q-mr-sm"
|
||||||
:disable="!selectedRows?.length"
|
:disable="!selectedRows?.length"
|
||||||
@click="confirmationDialog = true"
|
@click="confirmationDialog = true"
|
||||||
|
@ -341,6 +342,7 @@ const openTicketsDialog = (id) => {
|
||||||
<QBtn
|
<QBtn
|
||||||
icon="cloud_download"
|
icon="cloud_download"
|
||||||
color="primary"
|
color="primary"
|
||||||
|
flat
|
||||||
class="q-mr-sm"
|
class="q-mr-sm"
|
||||||
:disable="!selectedRows?.length"
|
:disable="!selectedRows?.length"
|
||||||
@click="showRouteReport"
|
@click="showRouteReport"
|
||||||
|
@ -352,6 +354,7 @@ const openTicketsDialog = (id) => {
|
||||||
<QBtn
|
<QBtn
|
||||||
icon="check"
|
icon="check"
|
||||||
color="primary"
|
color="primary"
|
||||||
|
flat
|
||||||
class="q-mr-sm"
|
class="q-mr-sm"
|
||||||
:disable="!selectedRows?.length"
|
:disable="!selectedRows?.length"
|
||||||
@click="markAsServed()"
|
@click="markAsServed()"
|
||||||
|
|
|
@ -3,6 +3,7 @@ import { computed, ref, markRaw } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
|
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
|
||||||
import { toHour } from 'src/filters';
|
import { toHour } from 'src/filters';
|
||||||
|
import { useRouter } from 'vue-router';
|
||||||
import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
|
import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
|
||||||
import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
|
import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
|
||||||
import VnTable from 'components/VnTable/VnTable.vue';
|
import VnTable from 'components/VnTable/VnTable.vue';
|
||||||
|
@ -13,6 +14,7 @@ import VnSection from 'src/components/common/VnSection.vue';
|
||||||
import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
|
import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
const router = useRouter();
|
||||||
const { viewSummary } = useSummaryDialog();
|
const { viewSummary } = useSummaryDialog();
|
||||||
const tableRef = ref([]);
|
const tableRef = ref([]);
|
||||||
const dataKey = 'RouteList';
|
const dataKey = 'RouteList';
|
||||||
|
@ -28,8 +30,10 @@ const routeFilter = {
|
||||||
};
|
};
|
||||||
|
|
||||||
function redirectToTickets(id) {
|
function redirectToTickets(id) {
|
||||||
const url = `#/route/${id}/tickets`;
|
router.push({
|
||||||
window.open(url, '_blank');
|
name: 'RouteTickets',
|
||||||
|
params: { id },
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const columns = computed(() => [
|
const columns = computed(() => [
|
||||||
|
|
|
@ -220,6 +220,7 @@ export default {
|
||||||
path: '',
|
path: '',
|
||||||
name: 'RouteIndexMain',
|
name: 'RouteIndexMain',
|
||||||
redirect: { name: 'RouteList' },
|
redirect: { name: 'RouteList' },
|
||||||
|
component: () => import('src/pages/Route/RouteList.vue'),
|
||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
name: 'RouteList',
|
name: 'RouteList',
|
||||||
|
@ -228,7 +229,6 @@ export default {
|
||||||
title: 'list',
|
title: 'list',
|
||||||
icon: 'view_list',
|
icon: 'view_list',
|
||||||
},
|
},
|
||||||
component: () => import('src/pages/Route/RouteList.vue'),
|
|
||||||
},
|
},
|
||||||
routeCard,
|
routeCard,
|
||||||
],
|
],
|
||||||
|
@ -264,6 +264,7 @@ export default {
|
||||||
path: 'roadmap',
|
path: 'roadmap',
|
||||||
name: 'RouteRoadmap',
|
name: 'RouteRoadmap',
|
||||||
redirect: { name: 'RoadmapList' },
|
redirect: { name: 'RoadmapList' },
|
||||||
|
component: () => import('src/pages/Route/RouteRoadmap.vue'),
|
||||||
meta: {
|
meta: {
|
||||||
title: 'RouteRoadmap',
|
title: 'RouteRoadmap',
|
||||||
icon: 'vn:troncales',
|
icon: 'vn:troncales',
|
||||||
|
@ -276,7 +277,6 @@ export default {
|
||||||
title: 'list',
|
title: 'list',
|
||||||
icon: 'view_list',
|
icon: 'view_list',
|
||||||
},
|
},
|
||||||
component: () => import('src/pages/Route/RouteRoadmap.vue'),
|
|
||||||
},
|
},
|
||||||
roadmapCard,
|
roadmapCard,
|
||||||
],
|
],
|
||||||
|
@ -294,6 +294,7 @@ export default {
|
||||||
path: 'agency',
|
path: 'agency',
|
||||||
name: 'RouteAgency',
|
name: 'RouteAgency',
|
||||||
redirect: { name: 'AgencyList' },
|
redirect: { name: 'AgencyList' },
|
||||||
|
component: () => import('src/pages/Route/Agency/AgencyList.vue'),
|
||||||
meta: {
|
meta: {
|
||||||
title: 'agency',
|
title: 'agency',
|
||||||
icon: 'garage_home',
|
icon: 'garage_home',
|
||||||
|
@ -306,8 +307,6 @@ export default {
|
||||||
title: 'list',
|
title: 'list',
|
||||||
icon: 'view_list',
|
icon: 'view_list',
|
||||||
},
|
},
|
||||||
component: () =>
|
|
||||||
import('src/pages/Route/Agency/AgencyList.vue'),
|
|
||||||
},
|
},
|
||||||
agencyCard,
|
agencyCard,
|
||||||
],
|
],
|
||||||
|
@ -316,6 +315,7 @@ export default {
|
||||||
path: 'vehicle',
|
path: 'vehicle',
|
||||||
name: 'RouteVehicle',
|
name: 'RouteVehicle',
|
||||||
redirect: { name: 'VehicleList' },
|
redirect: { name: 'VehicleList' },
|
||||||
|
component: () => import('src/pages/Route/Vehicle/VehicleList.vue'),
|
||||||
meta: {
|
meta: {
|
||||||
title: 'vehicle',
|
title: 'vehicle',
|
||||||
icon: 'directions_car',
|
icon: 'directions_car',
|
||||||
|
@ -328,8 +328,6 @@ export default {
|
||||||
title: 'vehicleList',
|
title: 'vehicleList',
|
||||||
icon: 'directions_car',
|
icon: 'directions_car',
|
||||||
},
|
},
|
||||||
component: () =>
|
|
||||||
import('src/pages/Route/Vehicle/VehicleList.vue'),
|
|
||||||
},
|
},
|
||||||
vehicleCard,
|
vehicleCard,
|
||||||
],
|
],
|
||||||
|
|
Loading…
Reference in New Issue