diff --git a/source/app/models/main.py b/source/app/models/main.py index 8ef4128..dce1ad2 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -5445,6 +5445,9 @@ class Empleados(BaseModel): Empleados.rfc, Empleados.curp, Empleados.nombre_completo, + Empleados.imss, + Empleados.salario_base, + Empleados.salario_diario, Empleados.fecha_ingreso) .dicts() ) diff --git a/source/static/js/controller/nomina.js b/source/static/js/controller/nomina.js index 033bd8e..5ef52d0 100644 --- a/source/static/js/controller/nomina.js +++ b/source/static/js/controller/nomina.js @@ -130,6 +130,7 @@ function up_employees_upload_complete(response){ var values = data.json(); if (values.ok){ msg_ok(values.msg) + get_employees() }else{ msg_error(values.msg) } diff --git a/source/static/js/ui/nomina.js b/source/static/js/ui/nomina.js index c5b3d39..1f82cdb 100644 --- a/source/static/js/ui/nomina.js +++ b/source/static/js/ui/nomina.js @@ -110,11 +110,16 @@ var grid_cols_empleados = [ {id: 'index', header: '#', adjust: 'data', css: 'right', footer: {content: 'countRows', colspan: 3, css: 'right'}}, {id: "id", header:"ID", hidden:true}, - {id: "num_empleado", header: ["No Empleado"], adjust: "header"}, + {id: "num_empleado", header: ["No Empleado"], adjust: "data"}, {id: "rfc", header: ["RFC", {content: 'textFilter'}], adjust: "data", sort: "string"}, {id: "curp", header: ["CURP"], adjust: "data", hidden:true, sort: "string"}, {id: "nombre_completo", header: ["Empleado", {content: 'textFilter'}], adjust: "data", fillspace: true, sort: "string"}, + {id: 'imss', header: ['IMSS'], adjust: 'data'}, + {id: 'salario_base', header: ['Salario Base'], adjust: 'header', + format: webix.i18n.priceFormat, css: 'right'}, + {id: 'salario_diario', header: ['Salario Diario'], adjust: 'header', + format: webix.i18n.priceFormat, css: 'right'}, {id: "fecha_ingreso", header: ["Fecha de Ingreso"], adjust: "header", sort: "string"}, ]