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') }}
+
+
+
+
(quantity = +val)"
+ @update:model-value="(val) => (quantity = val)"
type="number"
min="0"
:label="t('proposal.quantityToReplace')"
diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml
index e4b08c5d2..32a4e5240 100644
--- a/src/pages/Item/locale/es.yml
+++ b/src/pages/Item/locale/es.yml
@@ -89,7 +89,7 @@ itemType:
category: Reino
temperature: Temperatura
proposal:
- title: Items de sustitución para el ticket {ticketFk}:{saleFk}
+ title: Items de sustitución para los tickets seleccionados
itemFk: Item
longName: Nombre
subName: Productor
@@ -106,3 +106,5 @@ proposal:
itemOldPrice: Precio itemOld
status: Estado
quantityToReplace: Cantidad a reemplazar
+ replace: Sustituir para este ticket
+ replaceAndConfirm: Sustituir y confirmar precio
diff --git a/src/pages/Ticket/Negative/TicketLackDetail.vue b/src/pages/Ticket/Negative/TicketLackDetail.vue
index 52f3b1c74..1dc7ff357 100644
--- a/src/pages/Ticket/Negative/TicketLackDetail.vue
+++ b/src/pages/Ticket/Negative/TicketLackDetail.vue
@@ -3,10 +3,10 @@ import { computed, nextTick, onMounted, onUnmounted, ref, toRefs } from 'vue';
import { useI18n } from 'vue-i18n';
import { QBtn, QCheckbox, useQuasar } from 'quasar';
import axios from 'axios';
-import HandleSplited from 'pages/Ticket/Negative/HandleSplited.vue';
-import ChangeQuantityDialog from 'pages/Ticket/Negative/ChangeQuantityDialog.vue';
-import ChangeStateDialog from 'pages/Ticket/Negative/ChangeStateDialog.vue';
-import ItemProposal from 'src/pages/Item/components/ItemProposal.vue';
+import HandleSplited from 'pages/Ticket/Negative/components/HandleSplited.vue';
+import ChangeQuantityDialog from 'pages/Ticket/Negative/components/ChangeQuantityDialog.vue';
+import ChangeStateDialog from 'pages/Ticket/Negative/components/ChangeStateDialog.vue';
+import ItemProposal from 'pages/Item/components/ItemProposal.vue';
import { useVnConfirm } from 'composables/useVnConfirm';
import VnPaginate from 'src/components/ui/VnPaginate.vue';
@@ -19,6 +19,7 @@ import useNotify from 'src/composables/useNotify.js';
import { useStateStore } from 'stores/useStateStore';
import { useDialogPluginComponent } from 'quasar';
import { useSession } from 'src/composables/useSession';
+import ZoneDescriptorProxy from 'pages/Zone/Card/ZoneDescriptorProxy.vue';
const { openConfirmationModal } = useVnConfirm();
const { t } = useI18n();
@@ -153,8 +154,8 @@ const tableColumnComponents = computed(() => ({
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 }}
- {{ col.value }}
-
+
+ {{ 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"
>
diff --git a/src/pages/Ticket/Negative/ChangeQuantityDialog.vue b/src/pages/Ticket/Negative/components/ChangeQuantityDialog.vue
similarity index 100%
rename from src/pages/Ticket/Negative/ChangeQuantityDialog.vue
rename to src/pages/Ticket/Negative/components/ChangeQuantityDialog.vue
diff --git a/src/pages/Ticket/Negative/ChangeStateDialog.vue b/src/pages/Ticket/Negative/components/ChangeStateDialog.vue
similarity index 100%
rename from src/pages/Ticket/Negative/ChangeStateDialog.vue
rename to src/pages/Ticket/Negative/components/ChangeStateDialog.vue
diff --git a/src/pages/Ticket/Negative/HandleSplited.vue b/src/pages/Ticket/Negative/components/HandleSplited.vue
similarity index 100%
rename from src/pages/Ticket/Negative/HandleSplited.vue
rename to src/pages/Ticket/Negative/components/HandleSplited.vue
diff --git a/src/pages/Ticket/Negative/NegativeOriginDialog.vue b/src/pages/Ticket/Negative/components/NegativeOriginDialog.vue
similarity index 100%
rename from src/pages/Ticket/Negative/NegativeOriginDialog.vue
rename to src/pages/Ticket/Negative/components/NegativeOriginDialog.vue
diff --git a/src/pages/Ticket/Negative/TotalNegativeOriginDialog.vue b/src/pages/Ticket/Negative/components/TotalNegativeOriginDialog.vue
similarity index 100%
rename from src/pages/Ticket/Negative/TotalNegativeOriginDialog.vue
rename to src/pages/Ticket/Negative/components/TotalNegativeOriginDialog.vue
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index df9d06139..c66c4c398 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -17,7 +17,8 @@ negative:
warehouse: 'Almacen'
lack: 'Negativo'
inkFk: 'Color'
- timed: 'Timed'
+ timed: 'Hora'
+ date: 'Fecha'
minTimed: 'Hora'
type: 'Tipo'
negativeAction: 'Negativo'