diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js index c7808f9a8..4535cde0f 100644 --- a/src/composables/useArrayData.js +++ b/src/composables/useArrayData.js @@ -38,11 +38,11 @@ export function useArrayData(key, userOptions) { 'limit', 'skip', 'userParams', - 'userFilter' + 'userFilter', ]; if (typeof userOptions === 'object') { for (const option in userOptions) { - const isEmpty = userOptions[option] == null || userOptions[option] == '' + const isEmpty = userOptions[option] == null || userOptions[option] == ''; if (isEmpty || !allowedOptions.includes(option)) continue; if (Object.prototype.hasOwnProperty.call(store, option)) { @@ -73,7 +73,7 @@ export function useArrayData(key, userOptions) { Object.assign(params, store.userParams); - store.isLoading = true + store.isLoading = true; const response = await axios.get(store.url, { signal: canceller.signal, params, @@ -94,7 +94,7 @@ export function useArrayData(key, userOptions) { updateStateParams(); } - store.isLoading = false + store.isLoading = false; canceller = null; } @@ -153,8 +153,8 @@ export function useArrayData(key, userOptions) { }); } - const totalRows = computed(() => store.data && store.data.length || 0); - const isLoading = computed(() => store.isLoading || false) + const totalRows = computed(() => (store.data && store.data.length) || 0); + const isLoading = computed(() => store.isLoading || false); return { fetch, @@ -167,6 +167,6 @@ export function useArrayData(key, userOptions) { hasMoreData, totalRows, updateStateParams, - isLoading + isLoading, }; } diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 6328c8f5d..91a05685c 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -63,7 +63,7 @@ export default { webPayments: 'Pagos Web', createCustomer: 'Crear cliente', basicData: 'Datos básicos', - summary: 'Resumen' + summary: 'Resumen', }, list: { phone: 'Teléfono', @@ -243,6 +243,7 @@ export default { lines: 'Líneas', rma: 'RMA', photos: 'Fotos', + development: 'Trazabilidad', log: 'Registros de auditoría', }, list: { @@ -294,7 +295,7 @@ export default { result: 'Consecuencias', responsible: 'Responsable', worker: 'Trabajador', - redelivery: 'Devolución' + redelivery: 'Devolución', }, basicData: { customer: 'Cliente', @@ -411,7 +412,7 @@ export default { wagonEdit: 'Editar tipo', typesList: 'Listado tipos', typeCreate: 'Crear tipo', - typeEdit: 'Editar tipo' + typeEdit: 'Editar tipo', }, type: { name: 'Nombre', @@ -444,7 +445,7 @@ export default { minHeightBetweenTrays: 'La distancia mínima entre bandejas es ', maxWagonHeight: 'La altura máxima del vagón es ', uncompleteTrays: 'Hay bandejas sin completar', - } + }, }, components: { topbar: {}, diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue index 2691bbc51..3d22747c0 100644 --- a/src/pages/Claim/Card/ClaimCard.vue +++ b/src/pages/Claim/Card/ClaimCard.vue @@ -23,7 +23,6 @@ const entityId = computed(() => { }); const claimSections = [ { name: 'Notes', url: '/note/index', icon: 'draft' }, - { name: 'Development', url: '/development', icon: 'vn:traceability' }, { name: 'Action', url: '/action', icon: 'vn:actions' }, ]; diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue new file mode 100644 index 000000000..b9626b444 --- /dev/null +++ b/src/pages/Claim/Card/ClaimDevelopment.vue @@ -0,0 +1,199 @@ + + + + + + +en: + You are about to remove {count} rows: ' + You are about to remove {count} row | + You are about to remove {count} rows' +es: + Claimed lines: Líneas reclamadas + Delivered: Entregado + Quantity: Cantidad + Claimed: Reclamada + Description: Descripción + Price: Precio + Discount: Descuento + Actions: Acciones + Amount: Total + Amount Claimed: Cantidad reclamada + Delete claimed sales: Eliminar ventas reclamadas + Discount updated: Descuento actualizado + Claimed quantity: Cantidad reclamada + You are about to remove {count} rows: ' + Vas a eliminar {count} línea | + Vas a eliminar {count} líneas' + diff --git a/src/router/modules/claim.js b/src/router/modules/claim.js index c43ed5012..a39e60d8a 100644 --- a/src/router/modules/claim.js +++ b/src/router/modules/claim.js @@ -11,7 +11,14 @@ export default { redirect: { name: 'ClaimMain' }, menus: { main: ['ClaimList', 'ClaimRmaList'], - card: ['ClaimBasicData', 'ClaimLines', 'ClaimRma', 'ClaimPhotos', 'ClaimLog'], + card: [ + 'ClaimBasicData', + 'ClaimLines', + 'ClaimPhotos', + 'ClaimDevelopment', + 'ClaimRma', + 'ClaimLog', + ], }, children: [ { @@ -94,6 +101,15 @@ export default { }, component: () => import('src/pages/Claim/Card/ClaimPhoto.vue'), }, + { + name: 'ClaimDevelopment', + path: 'development', + meta: { + title: 'development', + icon: 'vn:traceability', + }, + component: () => import('src/pages/Claim/Card/ClaimDevelopment.vue'), + }, { name: 'ClaimLog', path: 'log',