{{ row.refFk }}
@@ -477,32 +463,33 @@ const openTab = (id) =>
>
{{ row.state }}
-
+
-
-
- {{ $t('salesTicketsTable.isFragile') }}
-
-
+
+ {{ $t('salesTicketsTable.isFragile') }}
+
-
+
{{ row.zoneName }}
-
+
-
-
- {{ toCurrency(row.totalWithVat) }}
-
-
+
+ {{ toCurrency(row.totalWithVat) }}
+
+
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;
};
-
(allowedContentTypes = data.join(', '))"
auto-load
/>
- (thermographsOptions = data)"
- :filter="thermographFilter"
- auto-load
- />
{
(thermographForm.thermographId = data.id)
+ "
/>
@@ -323,7 +309,6 @@ const onThermographCreated = async (data) => {
-
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