diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 9e46c54e3..5b667555e 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -694,8 +694,10 @@ worker: machine: Machine business: tableVisibleColumns: + id: ID started: Start Date ended: End Date + hourlyLabor: Time sheet company: Company reasonEnd: Reason for Termination department: Department @@ -703,6 +705,7 @@ worker: calendarType: Work Calendar workCenter: Work Center payrollCategories: Contract Category + workerBusinessAgreementName: Agreement occupationCode: Contribution Code rate: Rate businessType: Contract Type diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index fd42d37c7..3f004485d 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -770,8 +770,10 @@ worker: concept: Concepto business: tableVisibleColumns: + id: Id started: Fecha inicio ended: Fecha fin + hourlyLabor: Ficha company: Empresa reasonEnd: Motivo finalizaciĆ³n department: Departamento @@ -782,6 +784,7 @@ worker: occupationCode: CotizaciĆ³n rate: Tarifa businessType: Contrato + workerBusinessAgreementName: Convenio amount: Salario basicSalary: Salario transportistas notes: Notas diff --git a/src/pages/Worker/Card/WorkerBusiness.vue b/src/pages/Worker/Card/WorkerBusiness.vue index e3582a2d5..8f66f8336 100644 --- a/src/pages/Worker/Card/WorkerBusiness.vue +++ b/src/pages/Worker/Card/WorkerBusiness.vue @@ -35,6 +35,22 @@ async function reactivateWorker() { } } const columns = computed(() => [ + { + name: 'id', + label: t('Id'), + align: 'left', + isId: true, + cardVisible: true, + width: '40px', + }, + { + name: 'isHourlyLabor', + label: t('worker.business.tableVisibleColumns.hourlyLabor'), + align: 'left', + component: 'checkbox', + cardVisible: true, + width: '60px', + }, { name: 'started', label: t('worker.business.tableVisibleColumns.started'), @@ -194,6 +210,20 @@ const columns = computed(() => [ format: ({ workerBusinessTypeName }, dashIfEmpty) => dashIfEmpty(workerBusinessTypeName), }, + { + align: 'left', + name: 'workerBusinessAgreementFk', + label: t('worker.business.tableVisibleColumns.workerBusinessAgreementName'), + component: 'select', + attrs: { + url: 'WorkerBusinessAgreements', + fields: ['id', 'name'], + }, + cardVisible: true, + create: true, + format: ({ workerBusinessAgreementName }, dashIfEmpty) => + dashIfEmpty(workerBusinessAgreementName), + }, { align: 'left', label: t('worker.business.tableVisibleColumns.amount'), @@ -230,7 +260,7 @@ const columns = computed(() => [ save-url="/Businesses/crud" :create="{ urlCreate: `Workers/${entityId}/Business`, - title: 'Create business', + title: t('Create business'), onDataSaved: () => tableRef.reload(), formInitialData: {}, }" @@ -248,4 +278,5 @@ const columns = computed(() => [ es: Do you want to reactivate the user?: desea reactivar el usuario? + Create business: Crear contrato