From 1e7c8e03dfb04639831565c9382dec6a04cb03ed Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Wed, 21 Feb 2024 09:19:06 +0100 Subject: [PATCH 01/72] refs #6907 feat: fix_input_clearable_hover --- src/components/common/VnInput.vue | 44 ++++++++++++------- src/pages/Customer/Card/CustomerBasicData.vue | 1 - 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue index 8a01e0bee..0f7ea4e93 100644 --- a/src/components/common/VnInput.vue +++ b/src/components/common/VnInput.vue @@ -1,5 +1,5 @@ diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue index 458d50082..cf0ceaf51 100644 --- a/src/pages/Customer/Card/CustomerBasicData.vue +++ b/src/pages/Customer/Card/CustomerBasicData.vue @@ -69,7 +69,6 @@ const filterOptions = { v-model="data.socialName" :label="t('customer.basicData.socialName')" :rules="validate('client.socialName')" - autofocus />
From f075041da3401f5f79e43832ed083f008cabada5 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Wed, 21 Feb 2024 09:21:22 +0100 Subject: [PATCH 02/72] refs #6907 fix: revert autofocus property --- src/pages/Customer/Card/CustomerBasicData.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue index cf0ceaf51..458d50082 100644 --- a/src/pages/Customer/Card/CustomerBasicData.vue +++ b/src/pages/Customer/Card/CustomerBasicData.vue @@ -69,6 +69,7 @@ const filterOptions = { v-model="data.socialName" :label="t('customer.basicData.socialName')" :rules="validate('client.socialName')" + autofocus />
From 926f3b6950e22a9f315ec9893569028e0858e55a Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Mon, 26 Feb 2024 07:22:34 +0100 Subject: [PATCH 03/72] refs #6907 feat: add mouseEvent VnInputDate --- src/components/common/VnInputDate.vue | 47 +++++++++++++-------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue index 8e0ef2890..ff1dfb2fb 100644 --- a/src/components/common/VnInputDate.vue +++ b/src/components/common/VnInputDate.vue @@ -16,6 +16,8 @@ const props = defineProps({ default: false, }, }); +const focus = ref(false); + const emit = defineEmits(['update:modelValue']); const value = computed({ get() { @@ -50,33 +52,30 @@ const styleAttrs = computed(() => { } : {}; }); +function maxDate(date) { + const today = formatDate(new Date()); + return date <= today; +} @@ -212,6 +221,8 @@ en: workerFk: Worker from: From to: To + Served: Served + no: No es: params: warehouseFk: Almacén @@ -222,6 +233,7 @@ es: workerFk: Trabajador from: Desde to: Hasta + yes: Sí Warehouse: Almacén Description: Descripción Vehicle: Vehículo @@ -229,4 +241,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/RouteList.vue b/src/pages/Route/RouteList.vue index 94c05ad54..78a806294 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) => (row.isOk ? 'Yes' : 'No'), + sortable: true, + align: 'left', + }, { name: 'actions', label: '', @@ -397,6 +404,25 @@ const openTicketsDialog = (id) => { /> +