diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index a3b64d264..a6948494c 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -420,7 +420,7 @@ function handleOnDataSaved(_) { @@ -507,8 +507,12 @@ function handleOnDataSaved(_) { :key="index" :title="btn.title" :icon="btn.icon" - class="q-px-sm text-primary-light" + class="q-pa-xs" flat + dense + :class=" + btn.isPrimary ? 'text-primary-light' : 'color-vn-text ' + " :style="`visibility: ${ (btn.show && btn.show(row)) ?? true ? 'visible' : 'hidden' }`" @@ -767,10 +771,16 @@ es: } } -.q-table th { - padding: 0; -} +.q-table { + th { + padding: 0; + } + &__top { + padding: 12px 0px; + top: 0; + } +} .vnTable { thead tr th { position: sticky; @@ -779,11 +789,11 @@ es: thead tr:first-child th { top: 0; } - .q-table__top { + <<<<<<< HEAD .q-table__top { top: 0; padding: 12px 0; } - tbody { + =======>>>>>>>d13cab0a240a3a10db97a793022ba0f5ded48965 tbody { .q-checkbox { display: flex; margin-bottom: 9px; diff --git a/src/components/VnTable/VnVisibleColumn.vue b/src/components/VnTable/VnVisibleColumn.vue index 36f5ed7de..f5c3458cd 100644 --- a/src/components/VnTable/VnVisibleColumn.vue +++ b/src/components/VnTable/VnVisibleColumn.vue @@ -135,7 +135,7 @@ onMounted(async () => { }); diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue index eb455a239..52d442d0a 100644 --- a/src/pages/Monitor/MonitorOrders.vue +++ b/src/pages/Monitor/MonitorOrders.vue @@ -132,7 +132,6 @@ const openTab = (id) => :table="{ 'row-key': 'id', selection: 'multiple', - 'hide-bottom': true, }" default-mode="table" :row-click="({ id }) => openTab(id)" diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue index 258b5022f..16d5abffb 100644 --- a/src/pages/Monitor/Ticket/MonitorTickets.vue +++ b/src/pages/Monitor/Ticket/MonitorTickets.vue @@ -54,7 +54,6 @@ const columns = computed(() => [ label: t('salesTicketsTable.problems'), name: 'totalProblems', align: 'left', - columnFilter: false, attrs: { dense: true, @@ -65,7 +64,6 @@ const columns = computed(() => [ name: 'id', field: 'id', align: 'left', - columnFilter: { component: 'number', name: 'id', @@ -108,9 +106,7 @@ const columns = computed(() => [ { label: t('salesTicketsTable.date'), name: 'shippedDate', - style: { 'max-width': '100px' }, align: 'left', - columnFilter: { component: 'date', name: 'shippedDate', @@ -164,7 +160,6 @@ const columns = computed(() => [ label: t('salesTicketsTable.state'), name: 'state', align: 'left', - style: { 'max-width': '100px' }, columnFilter: { component: 'select', name: 'stateFk', @@ -193,7 +188,6 @@ const columns = computed(() => [ label: t('salesTicketsTable.zone'), name: 'zoneFk', align: 'left', - columnFilter: { component: 'select', name: 'zoneFk', @@ -210,8 +204,6 @@ const columns = computed(() => [ name: 'totalWithVat', field: 'totalWithVat', align: 'left', - style: { 'max-width': '75px' }, - columnFilter: { component: 'number', name: 'totalWithVat', @@ -370,7 +362,7 @@ const openTab = (id) => + diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue index d8404632c..ad668f0c0 100644 --- a/src/pages/Supplier/SupplierList.vue +++ b/src/pages/Supplier/SupplierList.vue @@ -75,6 +75,19 @@ const columns = computed(() => [ }, visible: false, }, + { + align: 'left', + label: t('supplier.list.tableVisibleColumns.country'), + name: 'country', + columnFilter: { + component: 'select', + name: 'countryFk', + attrs: { + url: 'countries', + fields: ['id', 'name'], + }, + }, + }, ]); diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue index 7f40873b1..4f16b0a49 100644 --- a/src/pages/Travel/Card/TravelThermographsForm.vue +++ b/src/pages/Travel/Card/TravelThermographsForm.vue @@ -28,18 +28,8 @@ const route = useRoute(); const router = useRouter(); const state = useState(); const { notify } = useNotify(); - -const thermographFilter = { - fields: ['thermographFk'], - where: { - travelFk: null, - }, - order: 'thermographFk ASC', -}; -const fetchTravelThermographsRef = ref(null); const allowedContentTypes = ref(''); const user = state.getUser(); -const thermographsOptions = ref([]); const dmsTypesOptions = ref([]); const companiesOptions = ref([]); const warehousesOptions = ref([]); @@ -168,24 +158,15 @@ const updateThermograph = async () => { }; const onThermographCreated = async (data) => { - await fetchTravelThermographsRef.value.fetch(); - thermographForm.thermographId = data.thermographId; + thermographForm.thermographId = data.id; }; - - es: Select files: Selecciona ficheros diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue index 512d07636..535f2393d 100644 --- a/src/pages/Zone/Card/ZoneBasicData.vue +++ b/src/pages/Zone/Card/ZoneBasicData.vue @@ -64,6 +64,15 @@ const agencyOptions = ref([]); type="number" min="0" /> + + @@ -128,4 +137,5 @@ es: Bonus: Bonificación Inflation: Inflación Volumetric: Volumétrico + Max length m³: Medida máxima tumbado