#7283 #7831 itemMigration #553

Merged
carlossa merged 77 commits from 7283-itemMigration into dev 2024-10-25 07:09:13 +00:00
5 changed files with 24 additions and 33 deletions
Showing only changes of commit 039a8d1d02 - Show all commits

View File

@ -1022,6 +1022,8 @@ travel:
travelFileDescription: 'Travel id { travelId }' travelFileDescription: 'Travel id { travelId }'
file: File file: File
item: item:
searchbar:
label: Search item
descriptor: descriptor:
item: Item item: Item
buyer: Buyer buyer: Buyer

View File

@ -1007,6 +1007,8 @@ travel:
travelFileDescription: 'Id envío { travelId }' travelFileDescription: 'Id envío { travelId }'
file: Fichero file: Fichero
item: item:
searchbar:
label: Buscar artículo
descriptor: descriptor:
item: Artículo item: Artículo
buyer: Comprador buyer: Comprador

View File

@ -12,7 +12,7 @@ import ItemListFilter from '../ItemListFilter.vue';
search-data-key="ItemList" search-data-key="ItemList"
:searchbar-props="{ :searchbar-props="{
url: 'Items/filter', url: 'Items/filter',
label: 'searchbar.labelr', label: 'item.searchbar.label',
info: 'searchbar.info', info: 'searchbar.info',
}" }"
/> />

View File

@ -44,25 +44,24 @@ const itemFilter = {
], ],
}; };
const columns = computed(() => [ const columns = computed(() => [
// { {
jsegarra marked this conversation as resolved Outdated

comentarios

comentarios
// label: '', label: '',
// name: 'image', name: 'image',
// align: 'left', align: 'left',
// columnField: { columnField: {
// component: VnImg, component: VnImg,
// attrs: (id) => { attrs: (id) => {
jsegarra marked this conversation as resolved Outdated

rounded? O se quiere cuadrada?

rounded? O se quiere cuadrada?
// return { return {
// id, id,
// width: '50px', width: '50px',
// }; };
// }, },
// }, },
// columnFilter: false, columnFilter: false,
// }, },
{ {
label: t('item.list.id'), label: t('item.list.id'),
name: 'id', name: 'id',
field: 'id',
align: 'left', align: 'left',
jsegarra marked this conversation as resolved Outdated

En esta columna hecho en falta el descriptor

En esta columna hecho en falta el descriptor
isId: true, isId: true,
chip: { chip: {
@ -71,38 +70,35 @@ const columns = computed(() => [
}, },
{ {
label: t('item.list.grouping'), label: t('item.list.grouping'),
field: 'grouping',
name: 'grouping', name: 'grouping',
align: 'left', align: 'left',
}, },
{ {
label: t('item.list.packing'), label: t('item.list.packing'),
field: 'packing',
name: 'packing', name: 'packing',
align: 'left', align: 'left',
}, },
{ {
label: t('globals.description'), label: t('globals.description'),
field: 'name',
name: 'description', name: 'description',
align: 'left', align: 'left',
create: true, create: true,
columnFilter: {
name: 'description',
},
}, },
{ {
label: t('item.list.stems'), label: t('item.list.stems'),
field: 'stems',
name: 'stems', name: 'stems',
align: 'left', align: 'left',
}, },
{ {
label: t('item.list.size'), label: t('item.list.size'),
field: 'size',
name: 'size', name: 'size',
align: 'left', align: 'left',
}, },
{ {
label: t('item.list.typeName'), label: t('item.list.typeName'),
field: 'typeName',
name: 'typeName', name: 'typeName',
align: 'left', align: 'left',
component: 'select', component: 'select',
@ -117,7 +113,6 @@ const columns = computed(() => [
}, },
{ {
label: t('item.list.category'), label: t('item.list.category'),
field: 'category',
name: 'category', name: 'category',
align: 'left', align: 'left',
component: 'select', component: 'select',
@ -131,7 +126,6 @@ const columns = computed(() => [
}, },
{ {
label: t('item.list.intrastat'), label: t('item.list.intrastat'),
field: 'intrastat',
name: 'intrastat', name: 'intrastat',
align: 'left', align: 'left',
component: 'select', component: 'select',
@ -146,7 +140,6 @@ const columns = computed(() => [
}, },
{ {
label: t('item.list.origin'), label: t('item.list.origin'),
field: 'origin',
name: 'origin', name: 'origin',
align: 'left', align: 'left',
component: 'select', component: 'select',
@ -161,13 +154,11 @@ const columns = computed(() => [
}, },
{ {
label: t('item.list.userName'), label: t('item.list.userName'),
field: 'userName',
name: 'userName', name: 'userName',
align: 'left', align: 'left',
}, },
{ {
label: t('item.list.weightByPiece'), label: t('item.list.weightByPiece'),
field: 'weightByPiece',
name: 'weightByPiece', name: 'weightByPiece',
align: 'left', align: 'left',
component: 'input', component: 'input',
@ -177,7 +168,6 @@ const columns = computed(() => [
}, },
{ {
label: t('item.list.stemMultiplier'), label: t('item.list.stemMultiplier'),
field: 'stemMultiplier',
name: 'stemMultiplier', name: 'stemMultiplier',
align: 'left', align: 'left',
component: 'input', component: 'input',
@ -187,14 +177,12 @@ const columns = computed(() => [
}, },
{ {
label: t('item.list.isActive'), label: t('item.list.isActive'),
field: 'isActive',
name: 'isActive', name: 'isActive',
align: 'left', align: 'left',
component: 'checkbox', component: 'checkbox',
}, },
{ {
label: t('item.list.producer'), label: t('item.list.producer'),
field: 'producer',
name: 'producer', name: 'producer',
align: 'left', align: 'left',
component: 'select', component: 'select',
@ -208,7 +196,6 @@ const columns = computed(() => [
}, },
{ {
label: t('item.list.landed'), label: t('item.list.landed'),
field: 'landed',
name: 'landed', name: 'landed',
align: 'left', align: 'left',
component: 'date', component: 'date',

View File

@ -188,7 +188,7 @@ onMounted(async () => {
ref="tableRef" ref="tableRef"
data-key="itemRequest" data-key="itemRequest"
url="ticketRequests/filter" url="ticketRequests/filter"
jsegarra marked this conversation as resolved Outdated

Duda: Si hacemos :order="['shippedDate ASC', 'isOk ASC']"...obtenemos el mismo resultado?

Duda: Si hacemos `:order="['shippedDate ASC', 'isOk ASC']"`...obtenemos el mismo resultado?
order="shippedDate ASC, isOk ASC" order="shipped ASC, isOk ASC"
:columns="columns" :columns="columns"
:user-params="userParams" :user-params="userParams"
:is-editable="true" :is-editable="true"