fix: hotfix mix #1095

Merged
carlossa merged 3 commits from hotfix-mixTravelSupplierFixedPrice into master 2024-12-17 12:10:54 +00:00
5 changed files with 203 additions and 204 deletions

View File

@ -361,7 +361,7 @@ function handleOnDataSave({ CrudModelRef }) {
@on-fetch="(data) => (warehousesOptions = data)" @on-fetch="(data) => (warehousesOptions = data)"
auto-load auto-load
url="Warehouses" url="Warehouses"
:filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }" :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
/> />
<RightMenu> <RightMenu>
<template #right-panel> <template #right-panel>
@ -394,7 +394,6 @@ function handleOnDataSave({ CrudModelRef }) {
/> />
</template> </template>
</VnSubToolbar> </VnSubToolbar>
<QPage>
<VnTable <VnTable
@on-fetch=" @on-fetch="
(data) => (data) =>
@ -425,15 +424,12 @@ function handleOnDataSave({ CrudModelRef }) {
'row-key': 'id', 'row-key': 'id',
selection: 'multiple', selection: 'multiple',
}" }"
:crud-model="{ :use-model="true"
disableInfiniteScroll: true,
}"
v-model:selected="rowsSelected" v-model:selected="rowsSelected"
:create-as-dialog="false" :create-as-dialog="false"
:create="{ :create="{
onDataSaved: handleOnDataSave, onDataSaved: handleOnDataSave,
}" }"
:use-model="true"
:disable-option="{ card: true }" :disable-option="{ card: true }"
> >
<template #header-selection="scope"> <template #header-selection="scope">
@ -578,7 +574,6 @@ function handleOnDataSave({ CrudModelRef }) {
@on-data-saved="onEditCellDataSaved()" @on-data-saved="onEditCellDataSaved()"
/> />
</QDialog> </QDialog>
</QPage>
</template> </template>
<style lang="scss"> <style lang="scss">
.q-table th, .q-table th,

View File

@ -23,13 +23,13 @@ const countriesOptions = ref([]);
<template> <template>
<FetchData <FetchData
url="Provinces" url="Provinces"
:filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }" :filter="{ fields: ['id', 'name'], order: 'name ASC'}"
@on-fetch="(data) => (provincesOptions = data)" @on-fetch="(data) => (provincesOptions = data)"
auto-load auto-load
/> />
<FetchData <FetchData
url="countries" url="countries"
:filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }" :filter="{ fields: ['id', 'name'], order: 'name ASC'}"
@on-fetch="(data) => (countriesOptions = data)" @on-fetch="(data) => (countriesOptions = data)"
auto-load auto-load
/> />

View File

@ -8,7 +8,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
import VnTitle from 'src/components/common/VnTitle.vue'; import VnTitle from 'src/components/common/VnTitle.vue';
import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue'; import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
import FetchData from 'src/components/FetchData.vue'; import FetchData from 'src/components/FetchData.vue';
import VnRow from 'components/ui/VnRow.vue';
import { toDate, toCurrency } from 'src/filters'; import { toDate, toCurrency } from 'src/filters';
import axios from 'axios'; import axios from 'axios';
@ -256,16 +256,20 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
:label="t('globals.warehouseOut')" :label="t('globals.warehouseOut')"
:value="travel.warehouseOut?.name" :value="travel.warehouseOut?.name"
/> />
<VnRow>
<QCheckbox <QCheckbox
:label="t('travel.basicData.isRaid')" :label="t('travel.basicData.isRaid')"
v-model="travel.isRaid" v-model="travel.isRaid"
:disable="true" :disable="true"
/> />
</VnRow>
<VnRow>
<QCheckbox <QCheckbox
:label="t('travel.summary.delivered')" :label="t('travel.summary.delivered')"
v-model="travel.isDelivered" v-model="travel.isDelivered"
:disable="true" :disable="true"
/> />
</VnRow>
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
<QCardSection class="q-pa-none"> <QCardSection class="q-pa-none">
@ -320,7 +324,6 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
<QTd> <QTd>
<QCheckbox <QCheckbox
v-if="col.name === 'isConfirmed'" v-if="col.name === 'isConfirmed'"
:label="t('travel.summary.received')"
:true-value="1" :true-value="1"
:false-value="0" :false-value="0"
v-model="row[col.name]" v-model="row[col.name]"

View File

@ -77,7 +77,6 @@ defineExpose({ states });
:label="t('travel.shipped')" :label="t('travel.shipped')"
v-model="params.shipped" v-model="params.shipped"
@update:model-value="searchFn()" @update:model-value="searchFn()"
dense
outlined outlined
rounded rounded
/> />
@ -153,7 +152,7 @@ es:
Id: Id Id: Id
ref: Referencia ref: Referencia
agency: Agencia agency: Agencia
warehouseInFk: Alm.Salida warehouseInFk: Alm.Entrada
shipped: F.Envío shipped: F.Envío
shipmentHour: Hora de envío shipmentHour: Hora de envío
warehouseOut: Alm.Entrada warehouseOut: Alm.Entrada

View File

@ -54,7 +54,9 @@ const columns = computed(() => [
name: 'id', name: 'id',
label: t('globals.id'), label: t('globals.id'),
isId: true, isId: true,
cardVisible: true, chip: {
condition: () => true,
},
}, },
{ {
align: 'left', align: 'left',
@ -64,7 +66,7 @@ const columns = computed(() => [
columnField: { columnField: {
component: null, component: null,
}, },
cardVisible: true, isTitle: true,
create: true, create: true,
}, },
{ {
@ -103,14 +105,14 @@ const columns = computed(() => [
}, },
{ {
align: 'left', align: 'left',
name: 'shipped',
label: t('globals.shipped'), label: t('globals.shipped'),
name: 'shipped',
create: true,
cardVisible: true,
component: 'date', component: 'date',
columnField: { columnField: {
component: null, component: null,
}, },
cardVisible: true,
create: true,
format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.shipped)), format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.shipped)),
}, },
{ {
@ -201,7 +203,7 @@ const columns = computed(() => [
/> />
<RightMenu> <RightMenu>
<template #right-panel> <template #right-panel>
<TravelFilter data-key="TravelList" ref="travelFilterRef" /> <TravelFilter data-key="TravelList" />
</template> </template>
</RightMenu> </RightMenu>
<VnTable <VnTable