diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 1d1205d9eb..d2851d2e79 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -72,8 +72,7 @@ const columns = computed(() => [
},
]);
-const getTotal = (data, key) =>
- data.reduce((acc, cur) => acc + +String(cur[key]).replace(',', '.'), 0);
+const getTotal = (data, key) => data.reduce((acc, cur) => acc + cur[key], 0);
@@ -187,22 +186,7 @@ const getTotal = (data, key) =>
-
-
-
+
-import { computed, onMounted, ref } from 'vue';
+import { computed, onMounted, ref, toRefs } from 'vue';
import { useI18n } from 'vue-i18n';
import axios from 'axios';
import { useDialogPluginComponent } from 'quasar';
@@ -20,9 +20,22 @@ const $props = defineProps({
default: () => [],
},
});
-const rowBtnDisable = (row) => !(row?.name && row?.date);
+const tickets = ref($props.tickets ?? []);
+const rowBtnDisable = () =>
+ !(
+ formData.value?.agencyModeFk &&
+ formData.value?.date &&
+ rowsSelected.value.length > 0
+ );
+const rowsSelected = ref([]);
const columns = computed(() => [
+ {
+ name: 'status',
+ label: t('negative.split.status'),
+ field: ({ status }) => status,
+ sortable: true,
+ },
{
name: 'ticket',
label: t('negative.split.ticket'),
@@ -35,26 +48,40 @@ const columns = computed(() => [
field: ({ newTicket }) => newTicket,
sortable: true,
},
- {
- name: 'status',
- label: t('negative.split.status'),
- field: ({ status }) => status,
- sortable: true,
- },
{
name: 'message',
label: t('negative.split.message'),
field: ({ message }) => message,
sortable: true,
},
- {
- name: 'actions',
- label: t('negative.split.actions'),
- style: 'padding-left: 100px',
- headerStyle: 'padding-left: 100px',
- },
+ // {
+ // name: 'actions',
+ // align: 'center',
+ // label: t('negative.split.actions'),
+ // // style: 'padding-left: 100px',
+ // // headerStyle: 'padding-left: 100px',
+ // },
]);
+const formData = ref({ agencies: [] });
+const handleDateChanged = async () => {
+ const { data: agencyData } = await axios.get('Agencies/getLanded', {
+ params: {
+ addressFk: 123,
+ agencyModeFk: 8,
+ warehouseFk: 1,
+ shipped: '2001-02-08T23:00:00.000Z',
+ },
+ });
+ if (!agencyData) formData.value.agencies = [];
+ const { zoneFk } = agencyData;
+ const { data: zoneData } = await axios.get('Zones/Includingexpired', {
+ params: { filter: { fields: ['id', 'name'], where: { id: zoneFk } } },
+ });
+ formData.value.agencies = zoneData;
+ if (zoneData.length === 1) formData.value.agencyModeFk = zoneData[0];
+ // formData.value.dateChanged = false;
+};
const ticketsSelected = ref([]);
onMounted(() => {
ticketsSelected.value = [...new Set($props.tickets.map(({ ticketFk }) => ticketFk))];
@@ -94,6 +121,12 @@ function getIcon(value) {
};
return icons[value];
}
+
+const updateNewTickets = async () => {
+ tickets.value = $props.tickets.filter((ticket) => ticket.newTicket !== 1000005);
+ console.log('updateNewTickets');
+ rowsSelected.value = [];
+};
@@ -108,17 +141,56 @@ function getIcon(value) {
v-if="icon"
/>
{{
- t('negative.detail.modal.split.title')
+ t('negative.detail.modal.handleSplited.title')
}}
+
+
+
+
+
+
+
+
-
+
+
-
+
+
+
message
-
+
+
-
{
// resultSplit.value = data;
resultSplit.value = [
{ ticket: 32, newTicket: 1000005, status: 'split' },
- { ticket: 32, newTicket: 1000005, status: 'noSplit' },
- { ticket: 32, newTicket: 1000005, status: 'error' },
+ { ticket: 32, newTicket: 1000006, status: 'noSplit' },
+ { ticket: 32, newTicket: 1000007, status: 'error' },
];
};
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index dbdfccb8b0..79a01a6e7e 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -55,9 +55,11 @@ negative:
split:
title: Are you sure you want to split selected tickets?
subTitle: Confirm split action
+ handleSplited:
+ title: Handle splited tickets
+ subTitle: Confirm date and agency
split:
ticket: Old ticket
newTicket: New ticket
status: Result
message: Message
- actions: Actions
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 3e08f9bc9c..df9d061390 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -27,6 +27,9 @@ negative:
title: 'Actualizar negativos'
question: 'Seleccione un estado para guardar'
+ modalSplit:
+ title: Confirmar acción de split
+ question: 'Select a state to update'
detail:
itemFk: 'Articulo'
ticketFk: 'Id_Ticket'
@@ -51,6 +54,14 @@ negative:
changeQuantity:
title: Actualizar cantidad de los tickets
placeholder: Nueva cantidad
- split:
- splitQuestion: ¿Estás seguro de separar los tickets seleccionados?
- confirmSplitSelected: Confirmar separar tickets seleccionados
+ split:
+ title: ¿Seguro de separar los tickets seleccionados?
+ subTitle: Confirma separar tickets seleccionados
+ handleSplited:
+ title: Gestionar tickets spliteados
+ subTitle: Confir fecha y agencia
+ split:
+ ticket: Ticket viejo
+ newTicket: Ticket nuevo
+ status: Estado
+ message: Mensaje