HOTFIX: #6943 CustomerList form salesPersons options #790

Closed
jsegarra wants to merge 84 commits from hotfix_newCustomer_SalesPerson into master
2 changed files with 29 additions and 5 deletions
Showing only changes of commit 043ab6bcea - Show all commits

View File

@ -314,6 +314,15 @@ function handleOnDataSaved(_, res) {
if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value }); if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
else $props.create.onDataSaved(_); else $props.create.onDataSaved(_);
} }
function handleClick(event, btn, row) {
if (event.ctrlKey) {
event.preventDefault();
event.stopPropagation();
btn.action(row, event);
} else {
btn.action(row);
}
}
</script> </script>
<template> <template>
<QDrawer <QDrawer
@ -534,7 +543,7 @@ function handleOnDataSaved(_, res) {
:style="`visibility: ${ :style="`visibility: ${
(btn.show && btn.show(row)) ?? true ? 'visible' : 'hidden' (btn.show && btn.show(row)) ?? true ? 'visible' : 'hidden'
}`" }`"
@click="btn.action(row)" @click="handleClick($event, btn, row)"
/> />
</QTd> </QTd>
</template> </template>
@ -648,7 +657,13 @@ function handleOnDataSaved(_, res) {
? 'text-primary-light' ? 'text-primary-light'
: 'color-vn-text ' : 'color-vn-text '
" "
@click="btn.action(row)" @click="(evt) => btn.action(row, evt)"
@click.ctrl="
(evt) => {
console.error('ctrl click', btn, evt);
btn.action(row, '_blank');
}
"
/> />
</QCardSection> </QCardSection>
</QCard> </QCard>

View File

@ -1,7 +1,7 @@
<script setup> <script setup>
import axios from 'axios'; import axios from 'axios';
import { computed, ref, onMounted } from 'vue'; import { computed, ref, onMounted } from 'vue';
import { useRoute } from 'vue-router'; import { useRoute, useRouter } from 'vue-router';
import { useStateStore } from 'stores/useStateStore'; import { useStateStore } from 'stores/useStateStore';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { toDate, toCurrency } from 'src/filters/index'; import { toDate, toCurrency } from 'src/filters/index';
@ -16,6 +16,8 @@ import RightMenu from 'src/components/common/RightMenu.vue';
import TicketFilter from './TicketFilter.vue'; import TicketFilter from './TicketFilter.vue';
const route = useRoute(); const route = useRoute();
const router = useRouter();
const { t } = useI18n(); const { t } = useI18n();
const { viewSummary } = useSummaryDialog(); const { viewSummary } = useSummaryDialog();
const tableRef = ref(); const tableRef = ref();
@ -136,7 +138,15 @@ const columns = computed(() => [
{ {
title: t('ticketList.summary'), title: t('ticketList.summary'),
icon: 'preview', icon: 'preview',
action: (row) => viewSummary(row.id, TicketSummary), action: (row, evt) => {
if (evt && evt.ctrlKey) {
const url = router.resolve({
params: { id: row.id },
name: 'TicketCard',
}).href;
window.open(url, '_blank');
} else viewSummary(row.id, TicketSummary);
},
}, },
], ],
}, },
@ -252,7 +262,6 @@ onMounted(() => {
auto-load auto-load
> >
<template #more-create-dialog="{ data }"> <template #more-create-dialog="{ data }">
{{ data }}
<VnRow> <VnRow>
<VnSelect <VnSelect
url="Clients" url="Clients"