Merge branch 'dev' into 7055-testFilterItemForm
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
commit
34442c8577
|
@ -31,7 +31,7 @@ export default {
|
|||
console.error(error);
|
||||
}
|
||||
form.addEventListener('keyup', function (evt) {
|
||||
if (evt.key === 'Enter') {
|
||||
if (evt.key === 'Enter' && !that.$attrs['prevent-submit']) {
|
||||
const input = evt.target;
|
||||
if (input.type == 'textarea' && evt.shiftKey) {
|
||||
evt.preventDefault();
|
||||
|
|
|
@ -82,7 +82,7 @@ async function fetch() {
|
|||
<span v-else></span>
|
||||
</slot>
|
||||
<slot name="header" :entity="entity" dense>
|
||||
<VnLv :label="`${entity.id} -`" :value="entity.name" />
|
||||
{{ entity.id + ' - ' + entity.name }}
|
||||
</slot>
|
||||
<span class="row no-wrap">
|
||||
<slot name="header-right" :entity="entity" />
|
||||
|
|
|
@ -213,9 +213,9 @@ async function handleConfirm() {
|
|||
type: 'positive',
|
||||
});
|
||||
router.push({
|
||||
name: 'TicketList',
|
||||
name: 'TicketSale',
|
||||
query: {
|
||||
table: JSON.stringify({ clientFk: descriptorData.store.data.clientFk }),
|
||||
table: JSON.stringify({ id: route.params.id }),
|
||||
},
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue