forked from verdnatura/salix-front
Merge branch 'dev' into 7207-showPbx
This commit is contained in:
commit
00dc2c6edc
|
@ -31,7 +31,7 @@ const dialog = ref(null);
|
|||
<div class="container order-catalog-item overflow-hidden">
|
||||
<QCard class="card shadow-6">
|
||||
<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
|
||||
class="item-color"
|
||||
|
|
|
@ -56,7 +56,7 @@ const props = defineProps({
|
|||
},
|
||||
offset: {
|
||||
type: Number,
|
||||
default: 0,
|
||||
default: undefined,
|
||||
},
|
||||
skeleton: {
|
||||
type: Boolean,
|
||||
|
|
|
@ -171,7 +171,6 @@ const insertTag = (rows) => {
|
|||
<QBtn
|
||||
@click="insertTag(rows)"
|
||||
class="cursor-pointer"
|
||||
:disable="!validRow"
|
||||
color="primary"
|
||||
flat
|
||||
icon="add"
|
||||
|
|
|
@ -491,9 +491,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
|
|||
<QTd>
|
||||
<VnImg
|
||||
size="50x50"
|
||||
zoom-resolution="1600x900"
|
||||
:id="row.id"
|
||||
height="50px"
|
||||
width="50px"
|
||||
class="image"
|
||||
/>
|
||||
</QTd>
|
||||
|
|
|
@ -278,7 +278,11 @@ watch(
|
|||
>
|
||||
<template #column-image="{ row }">
|
||||
<div class="image-wrapper">
|
||||
<VnImg :id="parseInt(row?.item?.image)" class="rounded" />
|
||||
<VnImg
|
||||
:id="parseInt(row?.item?.image)"
|
||||
class="rounded"
|
||||
zoom-resolution="1600x900"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
<template #column-id="{ row }">
|
||||
|
|
|
@ -15,12 +15,12 @@ const route = useRoute();
|
|||
const agenciesOptions = ref(null);
|
||||
const newAgencyTermForm = reactive({
|
||||
agencyFk: null,
|
||||
minimumM3: null,
|
||||
packagePrice: null,
|
||||
kmPrice: null,
|
||||
m3Price: null,
|
||||
minimumM3: 0,
|
||||
packagePrice: 0,
|
||||
kmPrice: 0,
|
||||
m3Price: 0,
|
||||
routePrice: null,
|
||||
minimumKm: null,
|
||||
minimumKm: 0,
|
||||
supplierFk: route.params.id,
|
||||
});
|
||||
|
||||
|
|
|
@ -663,6 +663,13 @@ watch(
|
|||
</QTooltip>
|
||||
</QIcon>
|
||||
</template>
|
||||
<template #body-cell-picture="{ row }">
|
||||
<QTd>
|
||||
<div class="image-wrapper">
|
||||
<VnImg :id="row.itemFk" class="rounded" zoom-resolution="1600x900" />
|
||||
</div>
|
||||
</QTd>
|
||||
</template>
|
||||
<template #column-image="{ row }">
|
||||
<div class="image-wrapper">
|
||||
<VnImg :id="parseInt(row?.item?.id)" class="rounded" />
|
||||
|
|
Loading…
Reference in New Issue