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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData

This commit is contained in:
Jorge Penadés 2025-01-13 15:47:16 +01:00
parent bf85a0f1c7 863d6deb10
commit 9ba7fec42f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/boot/qformMixin.js
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();

4
src/pages/Order/Card/OrderLines.vue
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 }),
}, },
}); });
} }