diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 9116425df..f2c07aaac 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -1,7 +1,6 @@
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 68d581703..f24eb3457 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -39,6 +39,16 @@ export default {
},
noSelectedRows: `You don't have any line selected`,
downloadCSVSuccess: 'CSV downloaded successfully',
+ // labels compartidos entre vistas
+ reference: 'Reference',
+ agency: 'Agency',
+ wareHouseOut: 'Warehouse Out',
+ wareHouseIn: 'Warehouse In',
+ landed: 'Landed',
+ shipped: 'Shipped',
+ totalEntries: 'Total entries',
+ amount: 'Amount',
+ packages: 'Packages',
download: 'Download',
selectRows: 'Select all { numberRows } row(s)',
allRows: 'All { numberRows } row(s)',
@@ -233,7 +243,6 @@ export default {
invoice: 'Invoice',
shipped: 'Shipped',
landed: 'Landed',
- packages: 'Packages',
consigneePhone: 'Consignee phone',
consigneeMobile: 'Consignee mobile',
clientPhone: 'Client phone',
@@ -250,7 +259,6 @@ export default {
description: 'Description',
price: 'Price',
discount: 'Discount',
- amount: 'Amount',
packing: 'Packing',
hasComponentLack: 'Component lack',
itemShortage: 'Not visible',
@@ -343,7 +351,6 @@ export default {
assignedTo: 'Assigned',
created: 'Created',
state: 'State',
- packages: 'Packages',
picked: 'Picked',
returnOfMaterial: 'Return of material authorization (RMA)',
},
@@ -367,7 +374,6 @@ export default {
ref: 'Reference',
issued: 'Issued',
shortIssued: 'Issued',
- amount: 'Amount',
client: 'Client',
created: 'Created',
shortCreated: 'Created',
@@ -377,7 +383,6 @@ export default {
},
card: {
issued: 'Issued',
- amount: 'Amount',
client: 'Client',
company: 'Company',
customerCard: 'Customer card',
@@ -580,6 +585,7 @@ export default {
supplier: {
pageTitles: {
suppliers: 'Suppliers',
+ supplier: 'Supplier',
list: 'List',
create: 'Create',
summary: 'Summary',
@@ -621,25 +627,16 @@ export default {
},
},
travel: {
- shared: {
- reference: 'Reference',
- agency: 'Agency',
- wareHouseOut: 'Warehouse Out',
- wareHouseIn: 'Warehouse In',
- landed: 'Landed',
- shipped: 'Shipped',
- totalEntries: 'Total entries',
- },
pageTitles: {
travel: 'Travels',
list: 'List',
create: 'Create',
summary: 'Summary',
+ extraCommunity: 'Extra community',
},
summary: {
confirmed: 'Confirmed',
entryId: 'Entry Id',
- supplier: 'Supplier',
freight: 'Freight',
package: 'Package',
delivered: 'Delivered',
@@ -649,6 +646,16 @@ export default {
CloneTravelAndEntries: 'Clone travel and his entries',
AddEntry: 'Add entry',
},
+ variables: {
+ search: 'Id/Reference',
+ agencyModeFk: 'Agency',
+ warehouseInFk: ' Warehouse In',
+ warehouseOutFk: 'Warehouse Out',
+ landedFrom: 'Landed from',
+ landedTo: 'Landed to',
+ continent: 'Continent out',
+ totalEntries: 'Total entries',
+ },
},
components: {
topbar: {},
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index c7c778da3..5e1b999ac 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -39,6 +39,16 @@ export default {
},
noSelectedRows: `No tienes ninguna línea seleccionada`,
downloadCSVSuccess: 'Descarga de CSV exitosa',
+ // labels compartidos entre vistas
+ reference: 'Referencia',
+ agency: 'Agencia',
+ wareHouseOut: 'Alm. salida',
+ wareHouseIn: 'Alm. entrada',
+ landed: 'F. entrega',
+ shipped: 'F. envío',
+ totalEntries: 'Ent. totales',
+ amount: 'Importe',
+ packages: 'Bultos',
download: 'Descargar',
selectRows: 'Seleccionar las { numberRows } filas(s)',
allRows: 'Todo { numberRows } filas(s)',
@@ -232,7 +242,6 @@ export default {
invoice: 'Factura',
shipped: 'Enviado',
landed: 'Entregado',
- packages: 'Bultos',
consigneePhone: 'Tel. consignatario',
consigneeMobile: 'Móv. consignatario',
clientPhone: 'Tel. cliente',
@@ -249,7 +258,6 @@ export default {
description: 'Descripción',
price: 'Precio',
discount: 'Descuento',
- amount: 'Importe',
packing: 'Encajado',
hasComponentLack: 'Faltan componentes',
itemShortage: 'No visible',
@@ -342,7 +350,6 @@ export default {
assignedTo: 'Asignada a',
created: 'Creada',
state: 'Estado',
- packages: 'Bultos',
picked: 'Recogida',
returnOfMaterial: 'Autorización de retorno de materiales (RMA)',
},
@@ -367,7 +374,6 @@ export default {
ref: 'Referencia',
issued: 'Fecha emisión',
shortIssued: 'F. emisión',
- amount: 'Importe',
client: 'Cliente',
created: 'Fecha creación',
shortCreated: 'F. creación',
@@ -377,7 +383,6 @@ export default {
},
card: {
issued: 'Fecha emisión',
- amount: 'Importe',
client: 'Cliente',
company: 'Empresa',
customerCard: 'Ficha del cliente',
@@ -582,6 +587,7 @@ export default {
supplier: {
pageTitles: {
suppliers: 'Proveedores',
+ supplier: 'Proveedor',
list: 'Listado',
create: 'Crear',
summary: 'Resumen',
@@ -602,7 +608,7 @@ export default {
payMethod: 'Método de pago',
payDeadline: 'Plazo de pago',
payDay: 'Día de pago',
- account: 'Account',
+ account: 'Cuenta',
fiscalData: 'Data fiscal',
sageTaxType: 'Tipo de impuesto Sage',
sageTransactionType: 'Tipo de transacción Sage',
@@ -623,25 +629,16 @@ export default {
},
},
travel: {
- shared: {
- reference: 'Referencia',
- agency: 'Agencia',
- wareHouseOut: 'Alm. salida',
- wareHouseIn: 'Alm. entrada',
- landed: 'F. entrega',
- shipped: 'F. envío',
- totalEntries: 'Ent. totales',
- },
pageTitles: {
travel: 'Envíos',
list: 'Listado',
create: 'Crear',
summary: 'Resumen',
+ extraCommunity: 'Extra comunitarios',
},
summary: {
confirmed: 'Confirmado',
entryId: 'Id entrada',
- supplier: 'Proveedor',
freight: 'Porte',
package: 'Embalaje',
delivered: 'Enviada',
@@ -651,6 +648,16 @@ export default {
CloneTravelAndEntries: 'Clonar travel y sus entradas',
AddEntry: 'Añadir entrada',
},
+ variables: {
+ search: 'Id/Referencia',
+ agencyModeFk: 'Agencia',
+ warehouseInFk: 'Alm. entrada',
+ warehouseOutFk: ' Alm. salida',
+ landedFrom: 'Llegada desde',
+ landedTo: 'Llegada hasta',
+ continent: 'Cont. Salida',
+ totalEntries: 'Ent. totales',
+ },
},
components: {
topbar: {},
diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index cc9cc2394..ab818704b 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -184,7 +184,7 @@ const statesFilter = {
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
index d3e38a1fe..9c1bb3649 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
@@ -61,14 +61,11 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
data-key="invoiceOutData"
>
-
+
-
+
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 3935833eb..6ea20288d 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -321,7 +321,7 @@ onMounted(async () => {
icon-right="search"
no-caps
class="q-mr-sm"
- @click="search"
+ @click="search()"
/>
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
new file mode 100644
index 000000000..910d36489
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Supplier/Card/SupplierDescriptorProxy.vue b/src/pages/Supplier/Card/SupplierDescriptorProxy.vue
new file mode 100644
index 000000000..b730a39dd
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierDescriptorProxy.vue
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 16f82c2e2..ced38c765 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -7,6 +7,7 @@ import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import { getUrl } from 'src/composables/getUrl';
import { useRole } from 'src/composables/useRole';
+import { dashIfEmpty } from 'src/filters';
onUpdated(() => summaryRef.value.fetch());
@@ -71,7 +72,7 @@ const isAdministrative = computed(() => {
- {{ supplier.worker?.user?.nickname || '-' }}
+ {{ dashIfEmpty(supplier.worker?.user?.nickname) }}
{
- {{ supplier.note || '-' }}
-
-
-
-
- {{ supplier.note || '-' }}
+ {{ dashIfEmpty(supplier.note) }}
+
{
{{ t('supplier.summary.billingData') }}
@@ -135,19 +134,23 @@ const isAdministrative = computed(() => {
{{ t('supplier.summary.fiscalData') }}
{
/>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index ce46d1d47..113ae84a6 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -207,7 +207,7 @@ async function changeState(value) {
:label="t('ticket.summary.landed')"
:value="toDate(ticket.landed)"
/>
-
+
{{ t('ticket.summary.description') }}
{{ t('ticket.summary.price') }}
{{ t('ticket.summary.discount') }}
- {{ t('ticket.summary.amount') }}
+ {{ t('globals.amount') }}
{{ t('ticket.summary.packing') }}
@@ -391,7 +391,7 @@ async function changeState(value) {
v-if="ticket.packagings.length > 0 || ticket.services.length > 0"
>
@@ -422,7 +422,7 @@ async function changeState(value) {
{{ t('ticket.summary.description') }}
{{ t('ticket.summary.price') }}
{{ t('ticket.summary.taxClass') }}
- {{ t('ticket.summary.amount') }}
+ {{ t('globals.amount') }}
diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
new file mode 100644
index 000000000..6a45710ad
--- /dev/null
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Travel/Card/TravelDescriptorProxy.vue b/src/pages/Travel/Card/TravelDescriptorProxy.vue
new file mode 100644
index 000000000..ab5c42d7e
--- /dev/null
+++ b/src/pages/Travel/Card/TravelDescriptorProxy.vue
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 08a389423..6920387c4 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -114,13 +114,13 @@ const entriesTableColumns = computed(() => {
align: 'left',
},
{
- label: t('travel.summary.supplier'),
+ label: t('supplier.pageTitles.supplier'),
field: 'supplierName',
name: 'supplierName',
align: 'left',
},
{
- label: t('travel.shared.reference'),
+ label: t('globals.reference'),
field: 'reference',
name: 'reference',
align: 'left',
@@ -208,24 +208,21 @@ const openEntryDescriptor = () => {};
+
+
+
-
-
-
-
+
-
+
diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
new file mode 100644
index 000000000..8ccecb926
--- /dev/null
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -0,0 +1,377 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ col.value }}
+
+
+
+
+
+
+
+ {{ col.value }}
+
+
+
+
+
+
+
+
+
+ {{ entry.id }}
+
+
+
+ {{
+ entry.supplierName
+ }}
+
+
+
+ {{
+ toCurrency(entry.invoiceAmount)
+ }}
+ {{ entry.reference }}
+ {{ entry.stickers }}
+
+ {{ entry.loadedkg }}
+ {{ entry.volumeKg }}
+
+
+
+
+
+ {{ arrayData }}
+
+
+
+
+
+
+
+en:
+ searchExtraCommunity: Search for extra community shipping
+ kg: BI. KG
+ physicKg: Phy. KG
+ shipped: W. shipped
+ landed: W. landed
+
+es:
+ searchExtraCommunity: Buscar por envío extra comunitario
+ kg: KG Bloq.
+ physicKg: KG físico
+ shipped: F. envío
+ landed: F. llegada
+
diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
new file mode 100644
index 000000000..5c2d8c190
--- /dev/null
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -0,0 +1,306 @@
+
+
+
+ updateFilterOptions(data, 'warehouses')"
+ auto-load
+ />
+ updateFilterOptions(data, 'continents')"
+ auto-load
+ />
+ updateFilterOptions(data, 'agencies')"
+ auto-load
+ />
+ updateFilterOptions(data, 'suppliers')"
+ auto-load
+ />
+
+
+
+
+ {{ t(`params.${tag.label}`) }}:
+ {{ formatFn(tag.value) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+en:
+ params:
+ ref: Reference
+ totalEntries: Total entries
+ agencyModeFk: Agency
+ warehouseInFk: Warehouse In
+ warehouseOutFk: Warehouse Out
+ shippedFrom: Shipped from
+ landedTo: Landed to
+ cargoSupplierFk: Supplier
+ continent: Continent out
+es:
+ params:
+ ref: Referencia
+ totalEntries: Ent. totales
+ agencyModeFk: Agencia
+ warehouseInFk: Alm. entrada
+ warehouseOutFk: Alm. salida
+ shippedFrom: Llegada desde
+ landedTo: Llegada hasta
+ cargoSupplierFk: Proveedor
+ continent: Cont. Salida
+
diff --git a/src/pages/Travel/TravelCreate.vue b/src/pages/Travel/TravelCreate.vue
index 0f6148c7e..6b96398ed 100644
--- a/src/pages/Travel/TravelCreate.vue
+++ b/src/pages/Travel/TravelCreate.vue
@@ -70,14 +70,11 @@ const onFetchWarehouses = (warehouses) => {
-
+
{
@@ -120,7 +117,7 @@ const onFetchWarehouses = (warehouses) => {
@@ -149,7 +146,7 @@ const onFetchWarehouses = (warehouses) => {
{
-import { ref } from 'vue';
+import { reactive } from 'vue';
import { useI18n } from 'vue-i18n';
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
@@ -14,22 +14,14 @@ const props = defineProps({
},
});
-const warehousesOptions = ref([]);
+const filtersOptions = reactive({
+ warehouses: [],
+ continents: [],
+ agencies: [],
+});
-const continentsOptions = ref([]);
-
-const agenciesOptions = ref([]);
-
-const onFetchWarehouses = (warehouses) => {
- warehousesOptions.value = [...warehouses];
-};
-
-const onFetchContinents = (continents) => {
- continentsOptions.value = [...continents];
-};
-
-const onFetchAgencies = (agencies) => {
- agenciesOptions.value = [...agencies];
+const updateFilterOptions = (data, optionKey) => {
+ filtersOptions[optionKey] = [...data];
};
const add = (paramsObj, key) => {
@@ -48,9 +40,21 @@ const decrement = (paramsObj, key) => {
- onFetchWarehouses(data)" auto-load />
- onFetchContinents(data)" auto-load />
- onFetchAgencies(data)" auto-load />
+ updateFilterOptions(data, 'warehouses')"
+ auto-load
+ />
+ updateFilterOptions(data, 'continents')"
+ auto-load
+ />
+ updateFilterOptions(data, 'agencies')"
+ auto-load
+ />
@@ -77,7 +81,7 @@ const decrement = (paramsObj, key) => {
{
{
{
{
};
onMounted(async () => {
- await travelStore.init();
stateStore.rightDrawer = true;
});
@@ -71,28 +68,28 @@ onMounted(async () => {
>
diff --git a/src/router/modules/travel.js b/src/router/modules/travel.js
index 9ba10380e..ebce7adb9 100644
--- a/src/router/modules/travel.js
+++ b/src/router/modules/travel.js
@@ -10,7 +10,7 @@ export default {
component: RouterView,
redirect: { name: 'TravelMain' },
menus: {
- main: ['TravelList'],
+ main: ['TravelList', 'ExtraCommunity'],
card: [],
},
children: [
@@ -29,11 +29,21 @@ export default {
},
component: () => import('src/pages/Travel/TravelList.vue'),
},
+ {
+ path: 'extra-community',
+ name: 'ExtraCommunity',
+ meta: {
+ title: 'extraCommunity',
+ icon: 'vn:shipment-01',
+ },
+ component: () => import('src/pages/Travel/ExtraCommunity.vue'),
+ },
{
path: 'create',
name: 'TravelCreate',
meta: {
- title: 'create',
+ title: 'extraCommunity',
+ icon: '',
},
component: () => import('src/pages/Travel/TravelCreate.vue'),
},
diff --git a/src/services/travel.service.js b/src/services/travel.service.js
index 4e6fbc4d8..469b8b237 100644
--- a/src/services/travel.service.js
+++ b/src/services/travel.service.js
@@ -1,15 +1,6 @@
import axios from 'axios';
const travelService = {
- getTravels: async (filter = {}) => {
- try {
- return await axios.get('Travels/filter', filter);
- } catch (err) {
- console.error(`Error fetching travels`, err);
- return err.response;
- }
- },
-
getTravelEntries: async (param) => {
try {
return await axios.get(`Travels/${param}/getEntries`);
@@ -18,6 +9,15 @@ const travelService = {
return err.response;
}
},
+
+ updateTravel: async (id, params) => {
+ try {
+ return await axios.patch(`Travels/${id}`, params);
+ } catch (err) {
+ console.error(`Error updating travel`, err);
+ return err.response;
+ }
+ },
};
export default travelService;
diff --git a/src/stores/travel.js b/src/stores/travel.js
deleted file mode 100644
index 7d1aa8fd5..000000000
--- a/src/stores/travel.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { defineStore } from 'pinia';
-import travelService from 'src/services/travel.service';
-
-export const useTravelStore = defineStore({
- id: 'travel',
-
- state: () => ({
- initialDataLoading: true,
- travels: [],
- }),
- actions: {
- async init() {
- await this.fetchAllData();
- },
-
- async fetchAllData() {
- const { data } = await travelService.getTravels();
- this.travels = data || [];
- },
- },
-
- getters: {},
-});