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

refs #6802 Clientes-gestionados-por-equipos #1320

Merged
jgallego merged 34 commits from 6802-Clientes-gestionados-por-equipos into dev 2025-03-13 17:09:30 +00:00
Conversation 1 Commits 34 Files Changed 61 +2 -6
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7a8dfab682 - Show all commits

8
src/pages/InvoiceOut/InvoiceOutList.vue
View File

@ -8,7 +8,7 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import { usePrintService } from 'src/composables/usePrintService';
import VnTable from 'src/components/VnTable/VnTable.vue';
import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
import { toCurrency, toDate } from 'src/filters/index';
import { toCurrency, toDate, dashIfEmpty } from 'src/filters/index';
import { QBtn } from 'quasar';
import axios from 'axios';
import InvoiceOutFilter from './InvoiceOutFilter.vue';
@ -246,12 +246,8 @@ watchEffect(selectedRows);
</template>
<template #column-departmentFk="{ row }">
<span class="link" @click.stop>
{{ row.departmentName || '-' }}
<<<<<<< HEAD
<DepartmentDescriptorProxy :id="row.departmentFk" />
=======
{{ dashIfEmpty(row.departmentName) }}
<DepartmentDescriptorProxy :id="row?.departmentFk" />
>>>>>>> dev
</span>
</template>
<template #more-create-dialog="{ data }">