7658-devToTest_2428 #508

Merged
alexm merged 392 commits from 7658-devToTest_2428 into test 2024-07-02 10:38:20 +00:00
1 changed files with 5 additions and 12 deletions
Showing only changes of commit d7237463ea - Show all commits

View File

@ -3,7 +3,6 @@ import { ref, computed } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
import VnTable from 'components/VnTable/VnTable.vue';
import VnInputDate from 'components/common/VnInputDate.vue';
const tableRef = ref();
const { t } = useI18n();
const route = useRoute();
@ -36,16 +35,12 @@ const columns = computed(() => [
url: 'TrainingCourseTypes',
fields: ['id', 'name'],
},
disable: false,
columnFilter: {
inWhere: true,
},
},
{
align: 'left',
name: 'started',
label: t('worker.formation.tableVisibleColumns.startDate'),
component: VnInputDate,
component: 'date',
field: 'started',
create: true,
cardVisible: true,
@ -54,7 +49,7 @@ const columns = computed(() => [
align: 'left',
name: 'ended',
label: t('worker.formation.tableVisibleColumns.endDate'),
component: VnInputDate,
component: 'date',
field: 'ended',
create: true,
},
@ -68,10 +63,6 @@ const columns = computed(() => [
url: 'TrainingCenters',
fields: ['id', 'name'],
},
disable: false,
columnFilter: {
inWhere: true,
},
},
{
align: 'left',
@ -92,8 +83,8 @@ const columns = computed(() => [
align: 'left',
name: 'remark',
label: t('worker.formation.tableVisibleColumns.remark'),
create: true,
component: 'checkbox',
create: true,
},
{
align: 'left',
@ -124,5 +115,7 @@ const columns = computed(() => [
default-mode="table"
auto-load
:right-search="false"
:is-editable="true"
:use-model="true"
/>
</template>