Merge pull request 'Hotfix[CustomerFile]: Downlaod file same behavior as VnDmsList' (!1761) from Fix-CustomerFileDownload into master
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #1761 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
This commit is contained in:
commit
fd5a4c370e
|
@ -5,6 +5,7 @@ import { useRoute, useRouter } from 'vue-router';
|
|||
|
||||
import { QBadge, QBtn, QCheckbox } from 'quasar';
|
||||
|
||||
import { downloadFile } from 'src/composables/downloadFile';
|
||||
import { toDateTimeFormat } from 'src/filters/date';
|
||||
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
|
@ -86,7 +87,7 @@ const tableColumnComponents = {
|
|||
file: {
|
||||
component: QBtn,
|
||||
props: () => ({ flat: true }),
|
||||
event: ({ row }) => openReport(`dms/${row.dmsFk}/downloadFile`, {}, '_blank'),
|
||||
event: ({ row }) => downloadFile(row.dmsFk),
|
||||
},
|
||||
employee: {
|
||||
component: QBtn,
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
<script setup>
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useRoute, useRouter } from 'vue-router';
|
||||
|
||||
import { useQuasar } from 'quasar';
|
||||
|
||||
import { usePrintService } from 'composables/usePrintService';
|
||||
import { downloadFile } from 'src/composables/downloadFile';
|
||||
|
||||
import CustomerFileManagementDelete from 'src/pages/Customer/components/CustomerFileManagementDelete.vue';
|
||||
|
@ -12,7 +12,7 @@ const { t } = useI18n();
|
|||
const quasar = useQuasar();
|
||||
const route = useRoute();
|
||||
const router = useRouter();
|
||||
|
||||
const { openReport } = usePrintService();
|
||||
const $props = defineProps({
|
||||
id: {
|
||||
type: Number,
|
||||
|
@ -24,7 +24,7 @@ const $props = defineProps({
|
|||
},
|
||||
});
|
||||
|
||||
const setDownloadFile = () => downloadFile($props.id);
|
||||
const setDownloadFile = () => openReport(`dms/${$props.id}/downloadFile`, {}, '_blank');
|
||||
|
||||
const toCustomerFileManagementEdit = () => {
|
||||
router.push({
|
||||
|
|
Loading…
Reference in New Issue