#8448 - devToTest #1254

Merged
alexm merged 365 commits from 8448-devToTest into test 2025-01-21 10:44:46 +00:00
3 changed files with 4 additions and 4 deletions
Showing only changes of commit 34442c8577 - Show all commits

View File

@ -31,7 +31,7 @@ export default {
console.error(error); console.error(error);
} }
form.addEventListener('keyup', function (evt) { form.addEventListener('keyup', function (evt) {
if (evt.key === 'Enter') { if (evt.key === 'Enter' && !that.$attrs['prevent-submit']) {
const input = evt.target; const input = evt.target;
if (input.type == 'textarea' && evt.shiftKey) { if (input.type == 'textarea' && evt.shiftKey) {
evt.preventDefault(); evt.preventDefault();

View File

@ -82,7 +82,7 @@ async function fetch() {
<span v-else></span> <span v-else></span>
</slot> </slot>
<slot name="header" :entity="entity" dense> <slot name="header" :entity="entity" dense>
<VnLv :label="`${entity.id} -`" :value="entity.name" /> {{ entity.id + ' - ' + entity.name }}
</slot> </slot>
<span class="row no-wrap"> <span class="row no-wrap">
<slot name="header-right" :entity="entity" /> <slot name="header-right" :entity="entity" />

View File

@ -213,9 +213,9 @@ async function handleConfirm() {
type: 'positive', type: 'positive',
}); });
router.push({ router.push({
name: 'TicketList', name: 'TicketSale',
query: { query: {
table: JSON.stringify({ clientFk: descriptorData.store.data.clientFk }), table: JSON.stringify({ id: route.params.id }),
}, },
}); });
} }