forked from verdnatura/salix-front
Merge branch 'master' into hotFix_VnPaginate_offset
This commit is contained in:
commit
bde739e7ef
|
@ -31,7 +31,7 @@ const dialog = ref(null);
|
||||||
<div class="container order-catalog-item overflow-hidden">
|
<div class="container order-catalog-item overflow-hidden">
|
||||||
<QCard class="card shadow-6">
|
<QCard class="card shadow-6">
|
||||||
<div class="img-wrapper">
|
<div class="img-wrapper">
|
||||||
<VnImg :id="item.id" class="image" />
|
<VnImg :id="item.id" class="image" zoom-resolution="1600x900" />
|
||||||
<div v-if="item.hex && isCatalog" class="item-color-container">
|
<div v-if="item.hex && isCatalog" class="item-color-container">
|
||||||
<div
|
<div
|
||||||
class="item-color"
|
class="item-color"
|
||||||
|
|
|
@ -491,9 +491,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
|
||||||
<QTd>
|
<QTd>
|
||||||
<VnImg
|
<VnImg
|
||||||
size="50x50"
|
size="50x50"
|
||||||
|
zoom-resolution="1600x900"
|
||||||
:id="row.id"
|
:id="row.id"
|
||||||
height="50px"
|
|
||||||
width="50px"
|
|
||||||
class="image"
|
class="image"
|
||||||
/>
|
/>
|
||||||
</QTd>
|
</QTd>
|
||||||
|
|
|
@ -278,7 +278,11 @@ watch(
|
||||||
>
|
>
|
||||||
<template #column-image="{ row }">
|
<template #column-image="{ row }">
|
||||||
<div class="image-wrapper">
|
<div class="image-wrapper">
|
||||||
<VnImg :id="parseInt(row?.item?.image)" class="rounded" />
|
<VnImg
|
||||||
|
:id="parseInt(row?.item?.image)"
|
||||||
|
class="rounded"
|
||||||
|
zoom-resolution="1600x900"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #column-id="{ row }">
|
<template #column-id="{ row }">
|
||||||
|
|
|
@ -15,12 +15,12 @@ const route = useRoute();
|
||||||
const agenciesOptions = ref(null);
|
const agenciesOptions = ref(null);
|
||||||
const newAgencyTermForm = reactive({
|
const newAgencyTermForm = reactive({
|
||||||
agencyFk: null,
|
agencyFk: null,
|
||||||
minimumM3: null,
|
minimumM3: 0,
|
||||||
packagePrice: null,
|
packagePrice: 0,
|
||||||
kmPrice: null,
|
kmPrice: 0,
|
||||||
m3Price: null,
|
m3Price: 0,
|
||||||
routePrice: null,
|
routePrice: null,
|
||||||
minimumKm: null,
|
minimumKm: 0,
|
||||||
supplierFk: route.params.id,
|
supplierFk: route.params.id,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -591,7 +591,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
|
||||||
<template #body-cell-picture="{ row }">
|
<template #body-cell-picture="{ row }">
|
||||||
<QTd>
|
<QTd>
|
||||||
<div class="image-wrapper">
|
<div class="image-wrapper">
|
||||||
<VnImg :id="row.itemFk" class="rounded" />
|
<VnImg :id="row.itemFk" class="rounded" zoom-resolution="1600x900" />
|
||||||
</div>
|
</div>
|
||||||
</QTd>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
|
|
Loading…
Reference in New Issue