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 +46 -19
3 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d9237c4a38 - Show all commits

63
src/pages/Ticket/Negative/TicketLackTable.vue
View File

@ -88,28 +88,37 @@ const rowColor = (row) => {
// };
const columns = computed(() => [
{
label: '',
name: 'totalProblems',
align: 'left',
label: t('negative.detail.isBasket'),
name: 'isBasket',
cardVisible: true,
create: true,
component: 'checkbox',
attrs: ({ row }) => {
return {
'toggle-indeterminate': true,
};
columnFilter: false,
attrs: {
dense: true,
},
columnClass: 'shrink',
},
{
align: 'left',
label: t('negative.detail.hasSubstitution'),
name: 'hasSubstitution',
cardVisible: true,
create: true,
component: 'checkbox',
columnClass: 'shrink',
},
// {
// align: 'left',
// label: t('negative.detail.isBasket'),
// name: 'isBasket',
// cardVisible: true,
// create: true,
// component: 'checkbox',
// attrs: ({ row }) => {
// return {
// 'toggle-indeterminate': true,
// };
// },
// columnClass: 'shrink',
// },
// {
// align: 'left',
// label: t('negative.detail.hasSubstitution'),
// name: 'hasSubstitution',
// cardVisible: true,
// create: true,
// component: 'checkbox',
// columnClass: 'shrink',
// },
{
name: 'status',
align: 'left',
@ -255,6 +264,22 @@ function onTicketLackFetched(data) {
:right-search="false"
v-model:selected="selectedRows"
>
<template #column-totalProblems>
{{}}
<!-- <pre> {{ props }}</pre> -->
<!-- v-if="!props.row.isBasket" -->
<QIcon name="vn:basket" color="primary" size="sm">
<QTooltip>{{ t('negative.detail.isBasket') }}</QTooltip>
</QIcon>
<!-- v-if="!props.row.hasToIgnore" -->
<QIcon name="star" color="primary" size="sm">
<QTooltip>{{ t('negative.detail.hasToIgnore') }}</QTooltip>
</QIcon>
<!-- v-if="!props.row.hasSubstitution" -->
<QIcon name="change_circle" color="primary" size="sm">
<QTooltip>{{ t('negative.detail.hasSubstitution') }}</QTooltip>
</QIcon>
</template>
<template #column-alertLevelCode="props">
<VnSelect
:options="editableStates"

1
src/pages/Ticket/locale/en.yml
View File

@ -240,6 +240,7 @@ negative:
showFree: Show Free lines
isBasket: 'Basket'
hasSubstitution: 'Has substitution'
hasToIgnore: VIP
modal:
changeItem:
title: Update item reference

1
src/pages/Ticket/locale/es.yml
View File

@ -268,6 +268,7 @@ negative:
showFree: Solo estado libre
isBasket: 'Cesta'
jsegarra marked this conversation as resolved Outdated
jgallego commented 2025-02-05 06:10:31 +00:00
Outdated
Review
Copy Link

o ponemos comillas a todos o a ninguno

o ponemos comillas a todos o a ninguno
jsegarra commented 2025-02-05 06:52:10 +00:00
Outdated
Review
Copy Link

Cierto, esta se va a la basura

Cierto, esta se va a la basura
hasSubstitution: 'Tiene sustitución'
hasToIgnore: VIP
modal:
changeItem:
title: Actualizar referencia artículo