wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

fix: refs #7553 merge changes

This commit is contained in:
Jon Elias 2024-09-03 07:45:46 +02:00
parent 3d683c1da3
commit d18ca14b4e
2 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/pages/Ticket/Card/TicketExpedition.vue
View File

@ -3,7 +3,6 @@ import { onMounted, ref, computed, onUnmounted, watch } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
import VnInput from 'src/components/common/VnInput.vue';
import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue'; import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue'; import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue'; import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
@ -98,17 +97,7 @@ const columns = computed(() => [
align: 'left', align: 'left',
isTitle: true, isTitle: true,
columnFilter: { columnFilter: {
component: VnSelect,
type: 'select',
filterValue: null,
event: getInputEvents,
inWhere: true, inWhere: true,
attrs: {
options: itemsOptions.value,
'option-value': 'id',
'option-label': 'name',
dense: true,
},
}, },
}, },
{ {

37
src/pages/Ticket/Card/TicketSale.vue
View File

@ -656,25 +656,24 @@ async function save(item) {
<QPopupProxy v-if="row.id && isTicketEditable"> <QPopupProxy v-if="row.id && isTicketEditable">
<VnInput v-model="row.concept" @change="updateConcept(row)" /> <VnInput v-model="row.concept" @change="updateConcept(row)" />
</QPopupProxy> </QPopupProxy>
<VnSelect <VnSelect
v-else v-else
:options="itemsWithNameOptions" :options="itemsWithNameOptions"
hide-selected hide-selected
option-label="name" option-label="name"
option-value="id" option-value="id"
@update:model-value="changeQuantity(row)" @update:model-value="changeQuantity(row)"
v-model="row.itemFk" v-model="row.itemFk"
> >
<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-quantity="{ row }"> <template #column-quantity="{ row }">
<QTd @click.stop> <QTd @click.stop>