verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 88 Releases Wiki Activity

fix: minor changes

This commit is contained in:
Javier Segarra 2024-09-10 00:18:09 +02:00
parent b4b65ad0fd
commit d734674eb6
1 changed files with 67 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
src/pages/Item/ItemFixedPrice.vue
View File

@ -212,15 +212,6 @@ const editTableFieldsOptions = [
type: 'number', type: 'number',
}, },
}, },
{
field: 'hasMinPrice',
label: t('item.fixedPrice.hasMinPrice'),
component: 'checkbox',
attrs: {
'false-value': 0,
'true-value': 1,
},
},
{ {
field: 'started', field: 'started',
label: t('item.fixedPrice.started'), label: t('item.fixedPrice.started'),
@ -286,8 +277,7 @@ async function upsertFixedPrice(row) {
async function saveOnRowChange(row) { async function saveOnRowChange(row) {
if (rowsSelected.value.length > 1) return; if (rowsSelected.value.length > 1) return;
if (rowsSelected.value[0]?.id === row.id) return; if (rowsSelected.value[0]?.id === row.id) return;
else if (rowsSelected.value.length === 1) else if (rowsSelected.value.length === 1) await upsertPrice(rowsSelected.value[0]);
await upsertFixedPrice(rowsSelected.value[0]);
rowsSelected.value = [row]; rowsSelected.value = [row];
} }
@ -457,6 +447,12 @@ function handleOnDataSave({ CrudModelRef }) {
</VnSubToolbar> </VnSubToolbar>
<QPage> <QPage>
<VnTable <VnTable
@on-fetch="
(data) =>
data.forEach((item) => {
item.hasMinPrice = `${item.hasMinPrice !== 0}`;
})
"
:default-remove="false" :default-remove="false"
:default-reset="false" :default-reset="false"
:default-save="false" :default-save="false"
@ -497,26 +493,24 @@ function handleOnDataSave({ CrudModelRef }) {
</template> </template>
<template #column-itemId="props"> <template #column-itemId="props">
<QTd> <VnSelect
<VnSelect style="max-width: 100px"
style="max-width: 100px" url="Items/withName"
url="Items/withName" hide-selected
hide-selected option-label="id"
option-label="id" option-value="id"
option-value="id" v-model="props.row.itemFk"
v-model="props.row.itemFk" v-on="getRowUpdateInputEvents(props, true, 'select')"
v-on="getRowUpdateInputEvents(props, true, 'select')" >
> <template #option="scope">
<template #option="scope"> <QItem v-bind="scope.itemProps">
<QItem v-bind="scope.itemProps"> <QItemSection>
<QItemSection> <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
<QItemLabel> #{{ scope.opt?.id }} </QItemLabel> <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
<QItemLabel caption>{{ scope.opt?.name }}</QItemLabel> </QItemSection>
</QItemSection> </QItem>
</QItem> </template>
</template> </VnSelect>
</VnSelect>
</QTd>
</template> </template>
<template #column-description="{ row }"> <template #column-description="{ row }">
<span class="link"> <span class="link">
@ -527,26 +521,22 @@ function handleOnDataSave({ CrudModelRef }) {
<FetchedTags style="width: max-content; max-width: 220px" :item="row" /> <FetchedTags style="width: max-content; max-width: 220px" :item="row" />
</template> </template>
<template #column-rate2="props"> <template #column-rate2="props">
<QTd class="col"> <VnInput
<VnInput mask="###.##"
mask="###.##" v-model.number="props.row.rate2"
v-model.number="props.row.rate2" v-on="getRowUpdateInputEvents(props)"
v-on="getRowUpdateInputEvents(props)" >
> <template #append>€</template>
<template #append>€</template> </VnInput>
</VnInput>
</QTd>
</template> </template>
<template #column-rate3="props"> <template #column-rate3="props">
<QTd class="col"> <VnInput
<VnInput mask="###.##"
mask="###.##" v-model.number="props.row.rate3"
v-model.number="props.row.rate3" v-on="getRowUpdateInputEvents(props)"
v-on="getRowUpdateInputEvents(props)" >
> <template #append>€</template>
<template #append>€</template> </VnInput>
</VnInput>
</QTd>
</template> </template>
<template #column-minPrice="props"> <template #column-minPrice="props">
<QTd class="col"> <QTd class="col">
@ -554,12 +544,11 @@ function handleOnDataSave({ CrudModelRef }) {
<QCheckbox <QCheckbox
:model-value="props.row.hasMinPrice" :model-value="props.row.hasMinPrice"
@update:model-value="updateMinPrice($event, props)" @update:model-value="updateMinPrice($event, props)"
:false-value="0" :false-value="'false'"
:true-value="1" :true-value="'true'"
/> />
<VnInput <VnInput
class="col" class="col"
mask="###.##"
:disable="props.row.hasMinPrice === 1" :disable="props.row.hasMinPrice === 1"
v-model.number="props.row.minPrice" v-model.number="props.row.minPrice"
v-on="getRowUpdateInputEvents(props)" v-on="getRowUpdateInputEvents(props)"
@ -588,38 +577,34 @@ function handleOnDataSave({ CrudModelRef }) {
/> />
</template> </template>
<template #column-warehouseFk="props"> <template #column-warehouseFk="props">
<QTd class="col"> <VnSelect
<VnSelect style="max-width: 150px"
style="max-width: 150px" :options="warehousesOptions"
:options="warehousesOptions" hide-selected
hide-selected option-label="name"
option-label="name" option-value="id"
option-value="id" v-model="props.row.warehouseFk"
v-model="props.row.warehouseFk" v-on="getRowUpdateInputEvents(props, false, 'select')"
v-on="getRowUpdateInputEvents(props, false, 'select')" />
/>
</QTd>
</template> </template>
<template #column-deleteAction="{ row, rowIndex }"> <template #column-deleteAction="{ row, rowIndex }">
<QTd class="col"> <QIcon
<QIcon name="delete"
name="delete" size="sm"
size="sm" class="cursor-pointer fill-icon-on-hover"
class="cursor-pointer fill-icon-on-hover" color="primary"
color="primary" @click.stop="
@click.stop=" openConfirmationModal(
openConfirmationModal( t('globals.rowWillBeRemoved'),
t('globals.rowWillBeRemoved'), t('Do you want to clone this item?'),
t('Do you want to clone this item?'), () => removePrice(row.id, rowIndex)
() => removePrice(row.id, rowIndex) )
) "
" >
> <QTooltip class="text-no-wrap">
<QTooltip class="text-no-wrap"> {{ t('globals.delete') }}
{{ t('globals.delete') }} </QTooltip>
</QTooltip> </QIcon>
</QIcon>
</QTd>
</template> </template>
</VnTable> </VnTable>