parseFloat(row['weight']).toFixed(1),
},
{
- align: 'center',
- labelAbbreviation: 'Pack',
+ labelAbbreviation: 'P',
label: 'Packing',
toolTip: 'Packing',
name: 'packing',
@@ -209,14 +209,13 @@ const columns = [
row['amount'] = row['quantity'] * row['buyingValue'];
},
},
- width: '35px',
+ width: '20px',
style: (row) => {
if (row.groupingMode === 'grouping')
return { color: 'var(--vn-label-color)' };
},
},
{
- align: 'center',
labelAbbreviation: 'GM',
label: t('Grouping selector'),
toolTip: t('Grouping selector'),
@@ -229,7 +228,7 @@ const columns = [
indeterminateValue: null,
},
size: 'xs',
- width: '30px',
+ width: '25px',
create: true,
rightFilter: false,
getIcon: (value) => {
@@ -245,12 +244,12 @@ const columns = [
},
{
align: 'center',
- labelAbbreviation: 'Group',
+ labelAbbreviation: 'G',
label: 'Grouping',
toolTip: 'Grouping',
name: 'grouping',
component: 'number',
- width: '35px',
+ width: '20px',
create: true,
style: (row) => {
if (row.groupingMode === 'packing') return { color: 'var(--vn-label-color)' };
@@ -290,6 +289,7 @@ const columns = [
},
},
width: '45px',
+ format: (row) => parseFloat(row['buyingValue']).toFixed(3),
},
{
align: 'center',
@@ -301,6 +301,7 @@ const columns = [
positive: false,
},
isEditable: false,
+ format: (row) => parseFloat(row['amount']).toFixed(2),
style: getAmountStyle,
},
{
@@ -312,6 +313,7 @@ const columns = [
component: 'number',
width: '35px',
create: true,
+ format: (row) => parseFloat(row['price2']).toFixed(2),
},
{
align: 'center',
@@ -325,6 +327,7 @@ const columns = [
},
width: '35px',
create: true,
+ format: (row) => parseFloat(row['price3']).toFixed(2),
},
{
align: 'center',
@@ -344,6 +347,7 @@ const columns = [
style: (row) => {
if (!row?.hasMinPrice) return { color: 'var(--vn-label-color)' };
},
+ format: (row) => parseFloat(row['minPrice']).toFixed(2),
},
{
align: 'center',
@@ -518,7 +522,7 @@ onMounted(() => {
{
@click="invertQuantitySign(selectedRows, -1)"
data-cy="set-negative-quantity"
>
- -1
+ -
@@ -544,7 +548,7 @@ onMounted(() => {
@click="invertQuantitySign(selectedRows, 1)"
data-cy="set-positive-quantity"
>
- 1
+ +
@@ -558,11 +562,11 @@ onMounted(() => {
:disable="!selectedRows.length"
data-cy="check-buy-amount"
>
- {{}}
{
{
-
+
{{ row.printedStickers }}
@@ -693,20 +698,36 @@ onMounted(() => {
{
- setBuyUltimate(value, data);
+ await setBuyUltimate(value, data);
}
"
:required="true"
data-cy="itemFk-create-popup"
- />
+ sort-by="nickname DESC"
+ >
+
+
+
+
+ {{ scope.opt.name }}
+
+
+ #{{ scope.opt.id }}, {{ scope.opt?.size }},
+ {{ scope.opt?.producerName }}
+
+
+
+
+
{
/>
-
+
-
+
+ {{ t('globals.noData') }}
+
@@ -744,6 +770,7 @@ es:
Com.: Ref.
Comment: Referencia
Minimum price: Precio mínimo
+ Stickers: Etiquetas
Printed Stickers/Stickers: Etiquetas impresas/Etiquetas
Cost: Cost.
Buying value: Coste
@@ -761,7 +788,12 @@ es:
Check buy amount: Marcar como correcta la cantidad de compra
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index c2b9e8bba..845d65604 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -182,14 +182,6 @@ const columns = computed(() => [
name: 'entryTypeCode',
cardVisible: true,
},
- {
- name: 'dated',
- label: t('entry.list.tableVisibleColumns.dated'),
- component: 'date',
- cardVisible: false,
- visible: false,
- create: true,
- },
{
name: 'companyFk',
label: t('entry.list.tableVisibleColumns.companyFk'),
@@ -220,7 +212,8 @@ function getBadgeAttrs(row) {
let timeDiff = today - timeTicket;
- if (timeDiff > 0) return { color: 'warning', 'text-color': 'black' };
+ if (timeDiff > 0) return { color: 'info', 'text-color': 'black' };
+ if (timeDiff < 0) return { color: 'warning', 'text-color': 'black' };
switch (row.entryTypeCode) {
case 'regularization':
case 'life':
@@ -245,7 +238,6 @@ function getBadgeAttrs(row) {
default:
break;
}
- if (timeDiff < 0) return { color: 'info', 'text-color': 'black' };
return { color: 'transparent' };
}