diff --git a/src/pages/Ticket/Negative/TicketLackDetail.vue b/src/pages/Ticket/Negative/TicketLackDetail.vue index 9fb0f48ac..64694ef97 100644 --- a/src/pages/Ticket/Negative/TicketLackDetail.vue +++ b/src/pages/Ticket/Negative/TicketLackDetail.vue @@ -33,7 +33,7 @@ onUnmounted(() => { stateStore.rightDrawer = true; }); -const entityId = computed(() => route.params.id); +const entityId = computed(() => route.params.itemFk); const item = ref({}); const itemProposalSelected = ref(null); diff --git a/src/pages/Ticket/Negative/TicketLackList.vue b/src/pages/Ticket/Negative/TicketLackList.vue index 1e11515f9..f63f268a6 100644 --- a/src/pages/Ticket/Negative/TicketLackList.vue +++ b/src/pages/Ticket/Negative/TicketLackList.vue @@ -7,7 +7,6 @@ import { onBeforeMount } from 'vue'; import { dashIfEmpty, toDate, toHour } from 'src/filters'; import { useRouter } from 'vue-router'; import { useState } from 'src/composables/useState'; -import { useRole } from 'src/composables/useRole'; import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue'; import RightMenu from 'src/components/common/RightMenu.vue'; import TicketLackFilter from './TicketLackFilter.vue'; @@ -25,10 +24,11 @@ const negativeParams = reactive({ availabled: Date.getCurrentDateTimeFormatted(), }); const redirectToCreateView = ({ itemFk }) => { - router.push({ + const route = { name: 'NegativeDetail', - params: { id: itemFk }, - }); + params: { itemFk }, + }; + router.push(route); }; const columns = computed(() => [ { diff --git a/src/pages/Ticket/Negative/TicketLackTable.vue b/src/pages/Ticket/Negative/TicketLackTable.vue index 2afe3af72..bf3c07a10 100644 --- a/src/pages/Ticket/Negative/TicketLackTable.vue +++ b/src/pages/Ticket/Negative/TicketLackTable.vue @@ -38,7 +38,7 @@ const filterLack = ref({ const selectedRows = ref([]); const { t } = useI18n(); const { notify } = useNotify(); -const entityId = computed(() => route.params.id); +const entityId = computed(() => route.params.itemFk); const item = ref({}); const route = useRoute(); const columns = computed(() => [ diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js index d80997257..b6b9f71a2 100644 --- a/src/router/modules/ticket.js +++ b/src/router/modules/ticket.js @@ -251,7 +251,7 @@ export default { }, { name: 'NegativeDetail', - path: ':id', + path: ':itemFk', meta: { title: 'summary', icon: 'launch', diff --git a/test/cypress/integration/invoiceOut/invoiceOutList.spec.js b/test/cypress/integration/invoiceOut/invoiceOutList.spec.js index 50ea01764..3059a974b 100644 --- a/test/cypress/integration/invoiceOut/invoiceOutList.spec.js +++ b/test/cypress/integration/invoiceOut/invoiceOutList.spec.js @@ -28,7 +28,7 @@ describe('InvoiceOut list', () => { cy.dataCy('InvoiceOutDownloadPdfBtn').click(); }); - it.skip('should open the invoice descriptor from table icon', () => { + it('should open the invoice descriptor from table icon', () => { cy.get(firstSummaryIcon).click(); cy.get('.cardSummary').should('be.visible'); cy.get('.summaryHeader > div').should('include.text', 'V10100001'); diff --git a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js index 029165bb8..49eed32c7 100644 --- a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js +++ b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js @@ -15,7 +15,7 @@ describe('InvoiceOut summary', () => { cy.login('developer'); cy.visit(`/#/invoice-out/1/summary`); }); - it.skip('open the descriptors', () => { + it('open the descriptors', () => { cy.get(firstRowDescriptors(1)).click(); cy.get('.descriptor').should('be.visible'); cy.get('.q-item > .q-item__label').should('include.text', '1'); @@ -30,7 +30,7 @@ describe('InvoiceOut summary', () => { cy.get('.q-item > .q-item__label').should('include.text', '1101'); }); - it.skip('should open the ticket list', () => { + it('should open the ticket list', () => { cy.get(toTicketList).click(); cy.get('[data-col-field="stateFk"]').each(($el) => { cy.wrap($el).contains('T1111111'); diff --git a/test/cypress/integration/ticket/ticketSale.spec.js b/test/cypress/integration/ticket/ticketSale.spec.js index 6b2104392..b87dfab71 100644 --- a/test/cypress/integration/ticket/ticketSale.spec.js +++ b/test/cypress/integration/ticket/ticketSale.spec.js @@ -2,7 +2,7 @@ const firstRow = 'tbody > :nth-child(1)'; describe('TicketSale', () => { - describe.skip('Ticket #23', () => { + describe('Ticket #23', () => { beforeEach(() => { cy.login('claimManager'); cy.viewport(1920, 1080);