diff --git a/src/boot/qformMixin.js b/src/boot/qformMixin.js index fc7852369..8d009dbea 100644 --- a/src/boot/qformMixin.js +++ b/src/boot/qformMixin.js @@ -8,7 +8,7 @@ export default { // TODO: AUTOFOCUS IS NOT FOCUSING const that = this; this.$el.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(); diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue index 2cb6ad8e6..c569f2553 100644 --- a/src/components/FormModel.vue +++ b/src/components/FormModel.vue @@ -293,6 +293,7 @@ defineExpose({ class="q-pa-md" :style="maxWidth ? 'max-width: ' + maxWidth : ''" id="formModel" + :prevent-submit="$attrs['prevent-submit']" > diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue index 95e0b986e..25ab92c9b 100644 --- a/src/pages/Worker/Card/WorkerBalance.vue +++ b/src/pages/Worker/Card/WorkerBalance.vue @@ -15,9 +15,6 @@ const columns = computed(() => [ name: 'paymentDate', label: t('worker.balance.tableVisibleColumns.paymentDate'), create: true, - columnCreate: { - required: true, - }, component: 'date', field: 'paymentDate', cardVisible: true, @@ -27,9 +24,6 @@ const columns = computed(() => [ name: 'incomeTypeFk', label: t('worker.balance.tableVisibleColumns.incomeType'), create: true, - columnCreate: { - required: true, - }, component: 'select', attrs: { options: payrollComponents, @@ -43,9 +37,6 @@ const columns = computed(() => [ name: 'debit', label: t('worker.balance.tableVisibleColumns.debit'), create: true, - columnCreate: { - required: true, - }, component: 'input', field: 'debit', cardVisible: true, @@ -55,9 +46,6 @@ const columns = computed(() => [ name: 'credit', label: t('worker.balance.tableVisibleColumns.credit'), create: true, - columnCreate: { - required: true, - }, component: 'input', field: 'credit', cardVisible: true,