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/components/common/VnInput.vue b/src/components/common/VnInput.vue index ec836f2cd..96028862a 100644 --- a/src/components/common/VnInput.vue +++ b/src/components/common/VnInput.vue @@ -26,7 +26,7 @@ const value = computed({ emit('update:modelValue', value); }, }); - +const hover = ref(false); const styleAttrs = computed(() => { return $props.isOutlined ? { @@ -41,6 +41,10 @@ const onEnterPress = () => { emit('keyup.enter'); }; +const handleValue = (val = null) => { + value.value = val; +}; + const focus = () => { vnInputRef.value.focus(); }; @@ -51,20 +55,33 @@ defineExpose({ diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue index 66da9b7bf..2053eceb1 100644 --- a/src/components/common/VnInputDate.vue +++ b/src/components/common/VnInputDate.vue @@ -1,7 +1,6 @@ en: @@ -479,6 +504,7 @@ es: Description: Descripción Hour started: Hora inicio Hour finished: Hora fin + Served: Servida newRoute: Nueva Ruta Clone Selected Routes: Clonar rutas seleccionadas Select the starting date: Seleccione la fecha de inicio @@ -490,4 +516,6 @@ es: Add ticket: Añadir tickets Preview: Vista previa Summary: Resumen + Route is closed: La ruta está cerrada + Route is not served: La ruta no está servida diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue index 9d00ba8f7..4cd1f46f5 100644 --- a/src/pages/Supplier/Card/SupplierSummary.vue +++ b/src/pages/Supplier/Card/SupplierSummary.vue @@ -1,10 +1,9 @@