diff --git a/CHANGELOG.md b/CHANGELOG.md index c97c4181f..43bd6da77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - (Tickets) => Se añade la opción de clonar ticket. #6951 - (Parking) => Se añade la sección Parking. #5186 +- (Rutas) => Se añade el campo "servida" a la tabla y se añade también a los filtros. #7130 + ### Changed ### Fixed diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue index 5adaeca94..2c4a19be5 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue @@ -257,7 +257,7 @@ const requiredFieldRule = (val) => val || t('globals.requiredField'); const isAdministrative = () => hasAny(['administrative']); const isAgricultural = () => - invoiceIn.value.supplier.sageWithholdingFk == config.value[0].sageWithholdingFk; + invoiceIn.value?.supplier?.sageWithholdingFk === config.value[0]?.sageWithholdingFk; function showPdfInvoice() { if (isAgricultural()) openReport(`InvoiceIns/${entityId.value}/invoice-in-pdf`); diff --git a/src/pages/Route/Card/RouteFilter.vue b/src/pages/Route/Card/RouteFilter.vue index 4be1981ab..bbd71df49 100644 --- a/src/pages/Route/Card/RouteFilter.vue +++ b/src/pages/Route/Card/RouteFilter.vue @@ -197,6 +197,15 @@ const warehouseList = ref([]); /> + + + + + @@ -212,6 +221,7 @@ en: workerFk: Worker from: From to: To + Served: Served es: params: warehouseFk: Almacén @@ -229,4 +239,5 @@ es: Worker: Trabajador From: Desde To: Hasta + Served: Servida diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue index 60693cbf1..7087037b0 100644 --- a/src/pages/Route/Card/RouteForm.vue +++ b/src/pages/Route/Card/RouteForm.vue @@ -11,8 +11,8 @@ import VnInputDate from 'components/common/VnInputDate.vue'; import VnInput from 'components/common/VnInput.vue'; import axios from 'axios'; import VnInputTime from 'components/common/VnInputTime.vue'; -import RouteSearchbar from "pages/Route/Card/RouteSearchbar.vue"; -import {useStateStore} from "stores/useStateStore"; +import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue'; +import { useStateStore } from 'stores/useStateStore'; const { t } = useI18n(); const route = useRoute(); @@ -26,6 +26,7 @@ const defaultInitialData = { description: '', vehicleFk: null, workerFk: null, + isOk: false, }; const workerList = ref([]); @@ -211,6 +212,7 @@ const onSave = (data, response) => { size="sm" v-model="data.isOk" :label="t('Is served')" + clearable /> diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue index 34b0dfebd..9316c0f83 100644 --- a/src/pages/Route/Card/RouteSummary.vue +++ b/src/pages/Route/Card/RouteSummary.vue @@ -187,6 +187,15 @@ const ticketColumns = ref([ :label="t('route.summary.packages')" :value="getTotalPackages(entity.tickets)" /> +
@@ -278,6 +287,10 @@ en: m3: m³ packaging: Packaging ticket: Ticket + closed: Closed + open: Open + yes: Yes + no: No es: route: summary: @@ -301,4 +314,8 @@ es: client: Cliente warehouse: Almacén packaging: Encajado + closed: Cerrada + open: Abierta + yes: Sí + no: No diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue index 94c05ad54..773b4f773 100644 --- a/src/pages/Route/RouteList.vue +++ b/src/pages/Route/RouteList.vue @@ -95,6 +95,13 @@ const columns = computed(() => [ sortable: true, align: 'left', }, + { + name: 'isServed', + label: t('Served'), + field: (row) => Boolean(row.isOk), + sortable: true, + align: 'left', + }, { name: 'actions', label: '', @@ -265,7 +272,7 @@ const openTicketsDialog = (id) => { auto-load >