wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

Merge pull request 'fix(ClaimList): attenderFk filter' (!700) from hotFix_claimList_attenderFk into master 

Reviewed-on: verdnatura/salix-front#700
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
This commit is contained in:
Alex Moreno 2024-09-12 08:04:04 +00:00
parent e10ab5863a 368e013f54
commit ccbd6fad19
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/VnTable/VnFilter.vue
View File

@ -34,7 +34,7 @@ const model = defineModel(undefined, { required: true });
const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl }); const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
const columnFilter = computed(() => $props.column?.columnFilter); const columnFilter = computed(() => $props.column?.columnFilter);
const updateEvent = { 'update:modelValue': addFilter, remove: () => addFilter(null) }; const updateEvent = { 'update:modelValue': addFilter };
const enterEvent = { const enterEvent = {
'keyup.enter': () => addFilter(model.value), 'keyup.enter': () => addFilter(model.value),
remove: () => addFilter(null), remove: () => addFilter(null),

1
src/pages/Claim/ClaimList.vue
View File

@ -52,6 +52,7 @@ const columns = computed(() => [
name: 'attendedBy', name: 'attendedBy',
orderBy: 'workerFk', orderBy: 'workerFk',
columnFilter: { columnFilter: {
name: 'attenderFk',
component: 'select', component: 'select',
attrs: { attrs: {
url: 'Workers/activeWithInheritedRole', url: 'Workers/activeWithInheritedRole',