diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue index c6d4d8ef2..fd3c29fa3 100644 --- a/src/components/VnTable/VnFilter.vue +++ b/src/components/VnTable/VnFilter.vue @@ -34,7 +34,7 @@ const model = defineModel(undefined, { required: true }); const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl }); const columnFilter = computed(() => $props.column?.columnFilter); -const updateEvent = { 'update:modelValue': addFilter, remove: () => addFilter(null) }; +const updateEvent = { 'update:modelValue': addFilter }; const enterEvent = { 'keyup.enter': () => addFilter(model.value), remove: () => addFilter(null), diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 362c1ec9f..3f882ae61 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -844,6 +844,7 @@ worker: newWorker: New worker card: workerId: Worker ID + user: User name: Name email: Email phone: Phone diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 34383686c..68b1f038b 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -850,6 +850,7 @@ worker: newWorker: Nuevo trabajador card: workerId: ID Trabajador + user: Usuario name: Nombre email: Correo personal phone: Teléfono diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue index f7e8131c6..61d9f5858 100644 --- a/src/pages/Claim/Card/ClaimDevelopment.vue +++ b/src/pages/Claim/Card/ClaimDevelopment.vue @@ -16,7 +16,6 @@ const claimReasons = ref([]); const claimResults = ref([]); const claimResponsibles = ref([]); const claimRedeliveries = ref([]); -const workers = ref([]); const selected = ref([]); const saveButtonRef = ref(); @@ -82,7 +81,9 @@ const columns = computed(() => [ label: t('Worker'), field: (row) => row.workerFk, sortable: true, - options: workers.value, + url: 'Workers/search', + where: { active: 1 }, + sortBy: 'name ASC', model: 'workerFk', optionValue: 'id', optionLabel: 'nickname', @@ -129,13 +130,6 @@ const columns = computed(() => [ @on-fetch="(data) => (claimRedeliveries = data)" auto-load /> - [ > [ name: 'attendedBy', orderBy: 'workerFk', columnFilter: { + name: 'attenderFk', component: 'select', attrs: { url: 'Workers/activeWithInheritedRole', diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue index 8d7f4f683..be30537df 100644 --- a/src/pages/Worker/Card/WorkerDescriptor.vue +++ b/src/pages/Worker/Card/WorkerDescriptor.vue @@ -151,7 +151,7 @@ const refetch = async () => await cardDescriptorRef.value.getData();