diff --git a/src/pages/Worker/WorkerFilter.vue b/src/pages/Worker/WorkerFilter.vue
index 0853791ef..765241341 100644
--- a/src/pages/Worker/WorkerFilter.vue
+++ b/src/pages/Worker/WorkerFilter.vue
@@ -5,6 +5,7 @@ import { useI18n } from 'vue-i18n';
import FetchData from 'components/FetchData.vue';
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
const { t } = useI18n();
const props = defineProps({
@@ -26,7 +27,7 @@ const departments = ref();
{{ formatFn(tag.value) }}
-
+
-
@@ -107,6 +105,7 @@ en:
userName: User
extension: Extension
departmentFk: Department
+ id: ID
es:
params:
search: Contiene
@@ -116,6 +115,7 @@ es:
userName: Usuario
extension: Extensión
departmentFk: Departamento
+ id: ID
FI: NIF
First Name: Nombre
Last Name: Apellidos
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 0c2656597..7b3237f70 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -14,6 +14,8 @@ import VnLocation from 'src/components/common/VnLocation.vue';
import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
import FetchData from 'src/components/FetchData.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import WorkerFilter from './WorkerFilter.vue';
const { t } = useI18n();
const tableRef = ref();
@@ -28,14 +30,8 @@ const columns = computed(() => [
{
align: 'left',
name: 'id',
- label: t('tableColumns.id'),
- columnFilter: {
- alias: 'w',
- inWhere: true,
- },
- chip: {
- condition: () => true,
- },
+ label: t('id'),
+ field: 'id',
isId: true,
},
{
@@ -44,7 +40,7 @@ const columns = computed(() => [
label: t('tableColumns.name'),
isTitle: true,
columnFilter: {
- name: 'search',
+ name: 'firstName',
},
},
{
@@ -54,8 +50,7 @@ const columns = computed(() => [
cardVisible: true,
columnFilter: {
component: 'select',
- inWhere: true,
- alias: 'wd',
+ name: 'departmentFk',
attrs: {
url: 'Departments',
},
@@ -130,6 +125,11 @@ function uppercaseStreetModel(data) {
@on-fetch="(data) => (bankEntitiesOptions = data)"
auto-load
/>
+
+
+
+
+