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

#6321 - Negative ticket #158

Open
jsegarra wants to merge 220 commits from 6321_negative_tickets into dev
pull from: 6321_negative_tickets
merge into: verdnatura:dev
Conversation 0 Commits 220 Files Changed 41 +101 -19
3 changed files with 101 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1929545e5b - Show all commits

96
src/pages/Item/components/ItemProposal.vue
View File

@ -65,34 +65,85 @@ const defaultColumnFilter = {
},
};
const conditionalValue = (tag) => (tag === 1 ? 'redd' : 'blackd');
const columns = computed(() => [
{
label: t('item.fixedPrice.itemId'),
name: 'itemId',
field: 'itemFk',
...defaultColumnAttrs,
columnFilter: {
...defaultColumnFilter,
},
label: t('proposal.itemFk'),
name: 'id',
field: 'id',
},
{
...defaultColumnAttrs,
label: t('proposal.longName'),
name: 'longName',
field: 'longName',
},
{
...defaultColumnAttrs,
label: t('proposal.subName'),
name: 'subName',
field: 'subName',
},
{
...defaultColumnAttrs,
label: t('proposal.value5'),
name: 'value5',
field: 'value5',
classes: ({ match5 }) => conditionalValue(match5),
},
{
...defaultColumnAttrs,
label: t('proposal.value6'),
name: 'value6',
field: 'value6',
classes: ({ match6 }) => conditionalValue(match6),
},
{
...defaultColumnAttrs,
label: t('proposal.value7'),
name: 'value7',
field: 'value7',
classes: ({ match7 }) => conditionalValue(match7),
},
{
...defaultColumnAttrs,
label: t('proposal.value8'),
name: 'value8',
field: 'value8',
classes: ({ match8 }) => conditionalValue(match8),
},
{
...defaultColumnAttrs,
label: t('proposal.available'),
name: 'available',
field: 'available',
},
{
...defaultColumnAttrs,
label: t('proposal.minQuantity'),
name: 'minQuantity',
field: 'minQuantity',
},
{
...defaultColumnAttrs,
label: t('proposal.price2'),
name: 'price2',
field: 'price2',
},
{
...defaultColumnAttrs,
label: t('proposal.located'),
name: 'located',
field: 'located',
},
]);
// const editTableFieldsOptions = [
// {
// field: 'rate2',
// label: t('item.fixedPrice.groupingPrice'),
// component: 'input',
// attrs: {
// type: 'number',
// },
// },
// ];
</script>
<template>
<QDialog ref="dialogRef" @hide="onDialogHide" v-model="showProposalDialog">
<QCard class="q-pa-sm">
<QCardSection class="row items-center q-pb-none">
{{ $props.item }}
<!-- {{ $props.item }} -->
<span class="text-h6 text-grey">{{
t('negative.modalOrigin.title')
}}</span>
@ -149,7 +200,14 @@ const columns = computed(() => [
</QCard>
</QDialog>
</template>
<style lang="scss" scoped></style>
<style lang="scss">
jgallego marked this conversation as resolved Outdated
jgallego commented 2025-02-05 05:50:12 +00:00
Outdated
Review
Copy Link

numeros en el codigo no en tablas, que es este 30?

numeros en el codigo no en tablas, que es este 30?
jsegarra commented 2025-02-05 14:23:26 +00:00
Outdated
Review
Copy Link

Gestionado en una columna de TicketConfig

Gestionado en una columna de TicketConfig
.redd {
background-color: red;
}
.blackd {
color: black;
}
</style>
<i18n>
es:

12
src/pages/Item/locale/en.yml Normal file
View File

@ -0,0 +1,12 @@
proposal:
itemFk: itemFk
longName: longName
subName: subName
value5: value5
value6: value6
value7: value7
value8: value8
available: available
minQuantity: minQuantity
price2: price2
located: located

12
src/pages/Item/locale/es.yml Normal file
View File

@ -0,0 +1,12 @@
proposal:
itemFk: itemFk
longName: longName
subName: subName
value5: value5
value6: value6
value7: value7
value8: value8
available: available
minQuantity: minQuantity
price2: price2
located: located