From f1cc4a01adfd2f885236e9feee1ff9397c177b7c Mon Sep 17 00:00:00 2001 From: jorgep Date: Mon, 9 Dec 2024 09:55:06 +0100 Subject: [PATCH 1/2] feat: refs #7409 add dialog with validations --- src/pages/Worker/Card/WorkerBalance.vue | 41 +++++++++++++++++++++---- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue index 25ab92c9b..6deaeed08 100644 --- a/src/pages/Worker/Card/WorkerBalance.vue +++ b/src/pages/Worker/Card/WorkerBalance.vue @@ -4,6 +4,10 @@ import { useI18n } from 'vue-i18n'; import { useRoute } from 'vue-router'; import VnTable from 'components/VnTable/VnTable.vue'; import FetchData from 'src/components/FetchData.vue'; +import VnInputDate from 'src/components/common/VnInputDate.vue'; +import VnSelect from 'src/components/common/VnSelect.vue'; +import VnInputNumber from 'src/components/common/VnInputNumber.vue'; +import VnInput from 'src/components/common/VnInput.vue'; const tableRef = ref(); const payrollComponents = ref([]); const { t } = useI18n(); @@ -14,7 +18,6 @@ const columns = computed(() => [ align: 'left', name: 'paymentDate', label: t('worker.balance.tableVisibleColumns.paymentDate'), - create: true, component: 'date', field: 'paymentDate', cardVisible: true, @@ -23,7 +26,6 @@ const columns = computed(() => [ align: 'left', name: 'incomeTypeFk', label: t('worker.balance.tableVisibleColumns.incomeType'), - create: true, component: 'select', attrs: { options: payrollComponents, @@ -36,7 +38,6 @@ const columns = computed(() => [ align: 'left', name: 'debit', label: t('worker.balance.tableVisibleColumns.debit'), - create: true, component: 'input', field: 'debit', cardVisible: true, @@ -45,7 +46,6 @@ const columns = computed(() => [ align: 'left', name: 'credit', label: t('worker.balance.tableVisibleColumns.credit'), - create: true, component: 'input', field: 'credit', cardVisible: true, @@ -54,7 +54,6 @@ const columns = computed(() => [ align: 'left', name: 'concept', label: t('worker.balance.tableVisibleColumns.concept'), - create: true, component: 'input', field: 'concept', cardVisible: true, @@ -107,7 +106,37 @@ const columns = computed(() => [ :use-model="true" :default-remove="false" search-url="balance" - /> + > + + es: From a4fb2a4819cafd2464c9197a0f807876b4dd30d2 Mon Sep 17 00:00:00 2001 From: jorgep Date: Mon, 9 Dec 2024 10:39:51 +0100 Subject: [PATCH 2/2] feat: refs #7409 add dialog with validations --- src/pages/Worker/Card/WorkerBalance.vue | 53 +++++++++---------------- 1 file changed, 18 insertions(+), 35 deletions(-) diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue index 6deaeed08..95e0b986e 100644 --- a/src/pages/Worker/Card/WorkerBalance.vue +++ b/src/pages/Worker/Card/WorkerBalance.vue @@ -4,10 +4,6 @@ import { useI18n } from 'vue-i18n'; import { useRoute } from 'vue-router'; import VnTable from 'components/VnTable/VnTable.vue'; import FetchData from 'src/components/FetchData.vue'; -import VnInputDate from 'src/components/common/VnInputDate.vue'; -import VnSelect from 'src/components/common/VnSelect.vue'; -import VnInputNumber from 'src/components/common/VnInputNumber.vue'; -import VnInput from 'src/components/common/VnInput.vue'; const tableRef = ref(); const payrollComponents = ref([]); const { t } = useI18n(); @@ -18,6 +14,10 @@ const columns = computed(() => [ align: 'left', name: 'paymentDate', label: t('worker.balance.tableVisibleColumns.paymentDate'), + create: true, + columnCreate: { + required: true, + }, component: 'date', field: 'paymentDate', cardVisible: true, @@ -26,6 +26,10 @@ const columns = computed(() => [ align: 'left', name: 'incomeTypeFk', label: t('worker.balance.tableVisibleColumns.incomeType'), + create: true, + columnCreate: { + required: true, + }, component: 'select', attrs: { options: payrollComponents, @@ -38,6 +42,10 @@ const columns = computed(() => [ align: 'left', name: 'debit', label: t('worker.balance.tableVisibleColumns.debit'), + create: true, + columnCreate: { + required: true, + }, component: 'input', field: 'debit', cardVisible: true, @@ -46,6 +54,10 @@ const columns = computed(() => [ align: 'left', name: 'credit', label: t('worker.balance.tableVisibleColumns.credit'), + create: true, + columnCreate: { + required: true, + }, component: 'input', field: 'credit', cardVisible: true, @@ -54,6 +66,7 @@ const columns = computed(() => [ align: 'left', name: 'concept', label: t('worker.balance.tableVisibleColumns.concept'), + create: true, component: 'input', field: 'concept', cardVisible: true, @@ -106,37 +119,7 @@ const columns = computed(() => [ :use-model="true" :default-remove="false" search-url="balance" - > - - + /> es: