#6321 - Negative ticket #158

Open
jsegarra wants to merge 156 commits from 6321_negative_tickets into dev
8 changed files with 41 additions and 42 deletions
Showing only changes of commit 2436db1c28 - Show all commits

View File

@ -1,5 +1,5 @@
<script setup>
import { h, onMounted } from 'vue';
import { onMounted } from 'vue';
import axios from 'axios';
const $props = defineProps({
@ -24,8 +24,8 @@ const $props = defineProps({
default: '',
},
limit: {
type: String,
default: '',
type: Number,
default: 30,
},
params: {
type: Object,

View File

@ -50,6 +50,10 @@ const $props = defineProps({
type: String,
default: null,
},
orderBy: {
type: String,
default: null,
},
limit: {
type: Number,
default: 30,

View File

@ -460,7 +460,7 @@ export default {
lack: 'Negativo',
inkFk: 'Color',
timed: 'timed',
minTimed: 'minTimed',
minTimed: 'Hora',
detail:{
itemFk:'Articulo',
jsegarra marked this conversation as resolved Outdated

articulo

articulo
ticketFk:'Id_Ticket',
jsegarra marked this conversation as resolved Outdated

almacen

almacen

View File

@ -1,32 +1,22 @@
<script setup>
import { computed, ref } from 'vue';
import { toDate, toPercentage } from 'filters/index';
import { useRoute, useRouter } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { QBtn, QCheckbox, QSelect } from 'quasar';
import { QBtn, QCheckbox } from 'quasar';
import VnPaginate from 'src/components/ui/VnPaginate.vue';
import FetchData from 'src/components/FetchData.vue';
import VnSelectFilter from 'components/common/VnSelectFilter.vue';
import VnInput from 'src/components/common/VnInput.vue';
import FetchedTags from 'components/ui/FetchedTags.vue';
import VnConfirm from 'components/ui/VnConfirm.vue';
import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
import { useQuasar } from 'quasar';
import { useStateStore } from 'stores/useStateStore';
import { toCurrency } from 'src/filters';
import axios from 'axios';
import useNotify from 'src/composables/useNotify.js';
import { useDialogPluginComponent } from 'quasar';
const { t } = useI18n();
const URL_KEY = 'Tickets/ItemLack';
const editableStates = ref([]);
const rowsSelected = ref([]);
const entryBuysPaginateRef = ref(null);
const packagingsOptions = ref(null);
// const entryBuysPaginateRef = ref(null);
// const packagingsOptions = ref(null);
const originalRowDataCopy = ref(null);
const $props = defineProps({
id: {
@ -158,7 +148,10 @@ const tableColumnComponents = computed(() => ({
},
state: {
component: VnSelectFilter,
props: {
type: 'select',
filterValue: null,
attrs: {
'option-value': 'id',
'option-label': 'name',
'emit-value': false,
@ -265,8 +258,8 @@ defineEmits([...useDialogPluginComponent.emits]);
const { dialogRef, onDialogHide } = useDialogPluginComponent();
async function changeState(value) {
/* if (!ticket.value.id) return;
// async function changeState(value) {
/* if (!ticket.value.id) return;
const formData = {
ticketFk: ticket.value.id,
@ -274,7 +267,7 @@ async function changeState(value) {
};
await axios.post(`TicketTrackings/changeState`, formData);*/
}
// }
</script>
<template>
@ -331,11 +324,11 @@ async function changeState(value) {
}}</template>
<template v-if="col.name === 'ticketFk'"
>{{ col.value }}
<ItemDescriptorProxy :id="props.row.id"
<ItemDescriptorProxy :id="$props.id"
/></template>
<template v-if="col.name === 'itemFk'"
>{{ col.value }}
<ItemDescriptorProxy :id="props.row.id"
<ItemDescriptorProxy :id="$props.id"
/></template>
</component>
</template>

View File

@ -5,8 +5,10 @@ import { useStateStore } from 'stores/useStateStore';
import VnPaginate from 'components/ui/VnPaginate.vue';
import { useSession } from 'src/composables/useSession';
import TicketLackFilter from 'pages/Ticket/Negative/TicketLackFilter.vue';
import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
import TicketDescriptorDialog from 'pages/Ticket/Negative/TicketLackDescriptorDialog.vue';
import { useQuasar } from 'quasar';
import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
const session = useSession();
const token = session.getToken();
@ -28,6 +30,12 @@ const viewSummary = (value) => {
// });
};
const columns = computed(() => [
{
name: 'minTimed',
label: t('ticket.negative.minTimed'),
field: ({ minTimed }) => minTimed,
sortable: true,
},
{
name: 'itemFk',
label: t('ticket.negative.id'),
@ -145,16 +153,17 @@ const columns = computed(() => [
</QTd>
</template>
<template #body-cell-ticketFk="{ value }">
<template #body-cell-longName="{ row, value }">
<QTd align="right" class="text-primary">
<span class="text-primary link">{{ value }}</span>
<QBtn flat color="blue" dense>{{ value }}</QBtn>
<ItemDescriptorProxy :id="row.itemFk" />
</QTd>
</template>
<template #body-cell-clientFk="{ value }">
<QTd align="right" class="text-primary">
<span class="text-primary link">{{ value }}</span>
<CustomerDescriptorProxy :id="value" />
<QBtn flat color="blue" dense>{{ value }}</QBtn>
<CustomerDescriptorProxy :id="row.itemFk" />
</QTd>
</template>
@ -193,14 +202,7 @@ const columns = computed(() => [
<span class="text-h6 text-grey">{{ currentRow.longName }}</span>
<QSpace />
<QBtn
icon="close"
:disable="isLoading"
flat
round
dense
v-close-popup
/>
<QBtn icon="close" flat round dense v-close-popup />
</QCardSection>
<QCardSection class="row items-center">
<TicketDescriptorDialog

View File

@ -5,7 +5,7 @@ export default {
path: '/ticket',
meta: {
title: 'tickets',
icon: 'vn:ticket',
icon: 'outgoing_mail',
moduleName: 'Ticket',
},
component: RouterView,

View File

@ -40,9 +40,9 @@ describe('VnLocation', () => {
cy.waitForElement('.q-card');
});
it('Show all options', function() {
it('Show locations options', function() {
cy.get(inputLocation).click();
cy.get(locationOptions).should('have.length', 1);
cy.get(locationOptions).should('have.length', 5);
});
});
})

View File

@ -15,8 +15,8 @@ describe('WorkerList', () => {
it('should open the worker summary', () => {
cy.openListSummary(0);
cy.get('.summaryHeader div').should('have.text', '1110 - Jessica Jones');
cy.get('.summary .header').eq(0).invoke('text').should('include', 'Basic data');
cy.get('.summary .header').eq(1).should('have.text', 'User data');
cy.get('.summaryHeader > div').should('have.text', '1110 - Jessica Jones');
cy.get('.summaryBody > :nth-child(1) > .header').invoke('text').should('include', 'Basic data');
cy.get('.summaryBody > :nth-child(2) > .header').should('have.text', 'User data');
});
});