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

#7283 #7831 itemMigration #553

Merged
carlossa merged 77 commits from 7283-itemMigration into dev 2024-10-25 07:09:13 +00:00
Conversation 4 Commits 77 Files Changed 24 +45 -16
2 changed files with 45 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1916c6e4bf - Show all commits

36
src/pages/Item/ItemList.vue
View File

@ -84,7 +84,7 @@ const columns = computed(() => [
align: 'left',
create: true,
columnFilter: {
name: 'description',
name: 'search',
},
},
{
@ -103,9 +103,10 @@ const columns = computed(() => [
align: 'left',
component: 'select',
columnFilter: {
name: 'typeFk',
attrs: {
url: 'ItemTypes',
fields: ['name'],
fields: ['id', 'name'],
},
},
columnField: {
@ -118,10 +119,13 @@ const columns = computed(() => [
name: 'category',
align: 'left',
component: 'select',
columnFilter: {
name: 'categoryFk',
attrs: {
url: 'ItemCategories',
fields: ['id', 'name'],
},
},
columnField: {
component: null,
},
@ -131,9 +135,15 @@ const columns = computed(() => [
name: 'intrastat',
align: 'left',
component: 'select',
columnFilter: {
name: 'description',
attrs: {
url: 'Intrastats',
fields: ['id', 'description'],
optionValue: 'description',
optionLabel: 'description',
},
inWhere: true,
alias: 'intr',
},
columnField: {
component: null,
@ -145,9 +155,15 @@ const columns = computed(() => [
name: 'origin',
align: 'left',
component: 'select',
columnFilter: {
name: 'id',
attrs: {
url: 'Origins',
fields: ['id', 'name'],
optionValue: 'id',
optionLabel: 'code',
},
inWhere: true,
alias: 'ori',
},
columnField: {
component: null,
@ -158,6 +174,14 @@ const columns = computed(() => [
label: t('item.list.userName'),
name: 'userName',
align: 'left',
columnFilter: {
name: 'workerFk',
attrs: {
url: 'Users',
optionValue: 'id',
optionLabel: 'userName',
},
},
},
{
label: t('item.list.weightByPiece'),
@ -249,8 +273,6 @@ const cloneItem = async (itemFk) => {
data-key="ItemList"
url="Items/filter"
url-create="Items"
save-url="Items/crud"
:filter="itemFilter"
:create="{
urlCreate: 'Items',
title: 'Create Item',
@ -264,7 +286,7 @@ const cloneItem = async (itemFk) => {
auto-load
redirect="Item"
:is-editable="false"
:use-model="true"
:filer="itemFilter"
>
jsegarra marked this conversation as resolved Outdated
jsegarra commented 2024-10-21 10:04:19 +00:00
Outdated
Review
Copy Link

No tenemos VnConfirm? En Salix si que habia

No tenemos VnConfirm? En Salix si que habia
jsegarra commented 2024-10-22 10:01:01 +00:00
Outdated
Review
Copy Link

Se ha copiado y pegado la misma funcionalidad que hay en ItemDescriptor. Para que esté del todo fino hay que hacer un composable para unificar la lógica

Se ha copiado y pegado la misma funcionalidad que hay en ItemDescriptor. Para que esté del todo fino hay que hacer un composable para unificar la lógica
<template #column-userName="{ row }">
<span class="link" @click.stop>

11
src/pages/Item/ItemRequest.vue
View File

@ -57,45 +57,51 @@ const columns = computed(() => [
component: null,
},
format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.shipped)),
columnClass: 'shrink',
},
{
label: t('globals.description'),
field: 'description',
name: 'description',
align: 'left',
columnClass: 'expand',
},
{
label: t('item.buyRequest.requester'),
name: 'requesterName',
align: 'left',
columnClass: 'shrink',
},
{
label: t('item.buyRequest.requested'),
name: 'quantity',
align: 'left',
columnClass: 'shrink',
},
{
label: t('item.buyRequest.price'),
name: 'price',
align: 'left',
format: (row) => toCurrency(row.price),
columnClass: 'shrink',
},
{
label: t('item.buyRequest.attender'),
name: 'attenderName',
align: 'left',
columnClass: 'shrink',
},
{
label: t('item.buyRequest.item'),
name: 'item',
align: 'left',
component: 'input',
columnClass: 'expand',
},
{
label: t('item.buyRequest.achieved'),
name: 'achieved',
align: 'left',
component: 'input',
columnClass: 'shrink',
},
{
label: t('item.buyRequest.concept'),
@ -103,6 +109,7 @@ const columns = computed(() => [
align: 'left',
sortable: true,
component: 'input',
columnClass: 'expand',
},
{
label: t('item.buyRequest.state'),