0
0
Fork 0

Merge branch 'master' into Fix-InvoiceOutSummary

This commit is contained in:
Jon Elias 2024-10-14 11:10:31 +00:00
commit 1183d86867
10 changed files with 25 additions and 23 deletions

View File

@ -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"

View File

@ -56,7 +56,7 @@ const props = defineProps({
},
offset: {
type: Number,
default: 0,
default: undefined,
},
skeleton: {
type: Boolean,

View File

@ -171,7 +171,6 @@ const insertTag = (rows) => {
<QBtn
@click="insertTag(rows)"
class="cursor-pointer"
:disable="!validRow"
color="primary"
flat
icon="add"

View File

@ -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>

View File

@ -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 }">

View File

@ -99,7 +99,11 @@ const setWireTransfer = async () => {
:key="index"
class="row q-gutter-md q-mb-md"
>
<VnInput :label="t('supplier.accounts.iban')" v-model="row.iban">
<VnInput
:label="t('supplier.accounts.iban')"
v-model="row.iban"
:required="true"
>
<template #append>
<QIcon name="info" class="cursor-info">
<QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
@ -113,6 +117,7 @@ const setWireTransfer = async () => {
option-label="bic"
option-value="id"
hide-selected
:required="true"
:roles-allowed-to-create="['financial']"
>
<template #form>

View File

@ -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,
});

View File

@ -591,7 +591,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
<template #body-cell-picture="{ row }">
<QTd>
<div class="image-wrapper">
<VnImg :id="row.itemFk" class="rounded" />
<VnImg :id="row.itemFk" class="rounded" zoom-resolution="1600x900" />
</div>
</QTd>
</template>

View File

@ -27,7 +27,6 @@ const initialFormState = reactive({
warehouseId: user.value.warehouseFk,
landed: null,
});
const clientOptions = ref([]);
const agenciesOptions = ref([]);
const addressesOptions = ref([]);
const warehousesOptions = ref([]);
@ -111,12 +110,6 @@ const redirectToTicketList = (_, { id }) => {
</script>
<template>
<FetchData
url="Clients"
@on-fetch="(data) => (clientOptions = data)"
:filter="{ fields: ['id', 'name', 'defaultAddressFk'], order: 'id' }"
auto-load
/>
<FetchData
url="Warehouses"
@on-fetch="(data) => (warehousesOptions = data)"
@ -137,7 +130,9 @@ const redirectToTicketList = (_, { id }) => {
<VnSelect
:label="t('ticket.create.client')"
v-model="data.clientId"
:options="clientOptions"
url="Clients"
:fields="['id', 'name', 'defaultAddressFk']"
sort-by="id"
option-value="id"
option-label="name"
hide-selected

View File

@ -94,9 +94,9 @@ watch(
url="Postcodes/location"
:fields="['geoFk', 'code', 'townFk', 'countryFk']"
sort-by="code, townFk"
option-value="code"
option-value="geoFk"
option-label="code"
option-filter="code"
:filter-options="['code', 'geoFk']"
hide-selected
dense
outlined