verdnatura/salix-front
verdnatura
/
salix-front
2
2
Fork 1
Code Issues Pull Requests 99 Releases Wiki Activity

#7897 - masterTest_24_36 #669

Merged
jsegarra merged 115 commits from 7897_masterTest_24_36 into master 2024-09-03 06:37:49 +00:00
Conversation 0 Commits 115 Files Changed 89 +4 -3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4b2f4ffac1 - Show all commits

4
src/components/VnTable/VnTable.vue
View File

@ -315,7 +315,7 @@ defineExpose({
col?.columnFilter !== false && col?.columnFilter !== false &&
col?.name !== 'tableActions' col?.name !== 'tableActions'
" "
v-model="orders[col.name]" v-model="orders[col.orderBy ?? col.name]"
:name="col.orderBy ?? col.name" :name="col.orderBy ?? col.name"
:data-key="$attrs['data-key']" :data-key="$attrs['data-key']"
:search-url="searchUrl" :search-url="searchUrl"
@ -409,7 +409,7 @@ defineExpose({
style="height: 30px" style="height: 30px"
> >
<VnTableOrder <VnTableOrder
v-model="orders[col.name]" v-model="orders[col.orderBy ?? col.name]"
:name="col.orderBy ?? col.name" :name="col.orderBy ?? col.name"
:label="col?.label" :label="col?.label"
:data-key="$attrs['data-key']" :data-key="$attrs['data-key']"

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

@ -50,7 +50,7 @@ const columns = computed(() => [
align: 'left', align: 'left',
label: t('claim.attendedBy'), label: t('claim.attendedBy'),
name: 'attendedBy', name: 'attendedBy',
cardVisible: true, orderBy: 'workerFk',
columnFilter: { columnFilter: {
component: 'select', component: 'select',
attrs: { attrs: {
@ -63,6 +63,7 @@ const columns = computed(() => [
optionFilter: 'firstName', optionFilter: 'firstName',
}, },
}, },
cardVisible: true,
}, },
{ {
align: 'left', align: 'left',