diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index d74b5a8ab..c8c009cac 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -63,6 +63,7 @@ globals: shipped: Shipped totalEntries: Total entries amount: Amount + removeSelection: Clear selection packages: Packages download: Download selectRows: 'Select all { numberRows } row(s)' diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index dbaece448..c12f87050 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -71,7 +71,8 @@ globals: requiredField: Campo obligatorio class: clase type: Tipo - reason: motivo + reason: Motivo + removeSelection: Eliminar selección noResults: Sin resultados results: resultados system: Sistema diff --git a/src/pages/Item/components/ItemProposal.vue b/src/pages/Item/components/ItemProposal.vue index efff28830..15d8360c2 100644 --- a/src/pages/Item/components/ItemProposal.vue +++ b/src/pages/Item/components/ItemProposal.vue @@ -134,7 +134,8 @@ const columns = computed(() => [ }, ]); async function confirm() { - quantity.value = 0; + console.log(''); + // quantity.value = 0; // const response = { address: address.value }; // if (props.promise) { // isLoading.value = true; @@ -170,13 +171,13 @@ async function confirm() { - {{ currentTicket }} + {{ t('proposal.title', { ticketFk: currentTicket.ticketFk, saleFk: currentTicket.saleFk, }) - }}** + }} @@ -189,7 +190,11 @@ async function confirm() { @click="changeTicket(false)" :disable="index === 0" /> - + + Ticket #{{ currentTicket.ticketFk }} - + + {{ currentTicket.nickname }} - + + + > + + + + {{ t('proposal.replaceAndConfirm') }} + + + + ({ event: getInputEvents, }, zoneName: { - component: 'span', - props: {}, + component: QBtn, + props: { color: 'blue', sortable: true, flat: true }, event: () => ({}), }, nickname: { @@ -496,10 +497,10 @@ const split = async () => { >{{ col.value }} - + diff --git a/src/pages/Ticket/Negative/TicketLackFilter.vue b/src/pages/Ticket/Negative/TicketLackFilter.vue index 93e2e1f6d..ae7595fdd 100644 --- a/src/pages/Ticket/Negative/TicketLackFilter.vue +++ b/src/pages/Ticket/Negative/TicketLackFilter.vue @@ -2,6 +2,8 @@ import { ref, onMounted } from 'vue'; import { useI18n } from 'vue-i18n'; import { useArrayData } from 'composables/useArrayData'; +import VnInputDate from 'components/common/VnInputDate.vue'; +import VnInputTime from 'components/common/VnInputTime.vue'; import FetchData from 'components/FetchData.vue'; import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue'; @@ -112,6 +114,25 @@ const onCategoryChange = async (categoryFk, search) => { /> + + + + + + + + + + + diff --git a/src/pages/Ticket/Negative/TicketLackList.vue b/src/pages/Ticket/Negative/TicketLackList.vue index 087963958..992e317f1 100644 --- a/src/pages/Ticket/Negative/TicketLackList.vue +++ b/src/pages/Ticket/Negative/TicketLackList.vue @@ -7,8 +7,8 @@ import TicketLackFilter from 'pages/Ticket/Negative/TicketLackFilter.vue'; import TicketLackDetail from 'pages/Ticket/Negative/TicketLackDetail.vue'; import FetchData from 'components/FetchData.vue'; -import NegativeOriginDialog from 'pages/Ticket/Negative/NegativeOriginDialog.vue'; -import TotalNegativeOriginDialog from 'pages/Ticket/Negative/TotalNegativeOriginDialog.vue'; +import NegativeOriginDialog from 'pages/Ticket/Negative/components/NegativeOriginDialog.vue'; +import TotalNegativeOriginDialog from 'pages/Ticket/Negative/components/TotalNegativeOriginDialog.vue'; import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue'; import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue'; import { onBeforeMount } from 'vue'; @@ -33,11 +33,10 @@ const originDialogRef = ref(); const totalNegativeDialogRef = ref(); const columns = computed(() => [ { - name: 'Date', - label: t('negative.minTimed'), + name: 'date', + label: t('negative.date'), field: 'timed', format: (val) => toDate(val), - sortable: true, }, { @@ -161,7 +160,7 @@ const handleWarehouses = async (data) => { ref="vnPaginateRef" data-key="NegativeList" :url="`Tickets/itemLack`" - :order="['itemFk DESC']" + :order="['itemFk DESC, date DESC, timed DESC']" :user-params="negativeParams" >