diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index eb80746a5..5a30f4d53 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -497,6 +497,7 @@ function handleOnDataSaved(_) { auto-width class="no-margin q-px-xs" :class="[getColAlign(col), col.columnClass]" + :style="col.style" v-if="col.visible ?? true" @click.ctrl=" ($event) => @@ -525,6 +526,7 @@ function handleOnDataSaved(_) { :class="getColAlign(col)" class="sticky no-padding" @click="stopEventPropagation($event)" + :style="col.style" > - + {{ createForm?.title }} diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js index b1c150410..30bcac66b 100644 --- a/src/composables/useArrayData.js +++ b/src/composables/useArrayData.js @@ -114,7 +114,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) { for (const row of response.data) store.data.push(row); } else { store.data = response.data; - if (!document.querySelectorAll('[role="dialog"]').length) + if (!document.querySelectorAll('[role="dialog"][aria-modal="true"]').length) updateRouter && updateStateParams(); } diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index b76c147cd..6235447fe 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -293,6 +293,7 @@ globals: maxTemperature: Max minTemperature: Min params: + id: ID clientFk: Client id salesPersonFk: Sales person warehouseFk: Warehouse @@ -300,7 +301,12 @@ globals: from: From To: To stateFk: State + departmentFk: Department + email: Email + SSN: SSN + fi: FI changePass: Change password + deleteConfirmTitle: Delete selected elements errors: statusUnauthorized: Access denied statusInternalServerError: An internal server error has ocurred @@ -807,14 +813,14 @@ worker: bankEntity: Swift / BIC formation: tableVisibleColumns: - course: Curso - startDate: Fecha Inicio - endDate: Fecha Fin - center: Centro Formación - invoice: Factura - amount: Importe - remark: Bonficado - hasDiploma: Diploma + course: Course + startDate: Start date + endDate: End date + center: Training center + invoice: Invoice + amount: Amount + remark: Remark + hasDiploma: Has diploma medical: tableVisibleColumns: date: Date diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index d0d5bdc0d..6076af5d9 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -297,6 +297,7 @@ globals: maxTemperature: Máx minTemperature: Mín params: + id: Id clientFk: Id cliente salesPersonFk: Comercial warehouseFk: Almacén @@ -304,7 +305,12 @@ globals: from: Desde To: Hasta stateFk: Estado + departmentFk: Departamento + email: Correo + SSN: NSS + fi: NIF changePass: Cambiar contraseña + deleteConfirmTitle: Eliminar los elementos seleccionados errors: statusUnauthorized: Acceso denegado statusInternalServerError: Ha ocurrido un error interno del servidor diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue index 52d442d0a..fac601735 100644 --- a/src/pages/Monitor/MonitorOrders.vue +++ b/src/pages/Monitor/MonitorOrders.vue @@ -139,33 +139,35 @@ const openTab = (id) => :disable-option="{ card: true }" >