diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 61a7217af..6d0a6b82d 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -962,8 +962,6 @@ const checkbox = ref(null);
component-prop="columnCreate"
/>
-
-
@@ -1035,7 +1033,7 @@ es:
.grid-three {
display: grid;
- grid-template-columns: repeat(auto-fit, minmax(350px, max-content));
+ grid-template-columns: repeat(auto-fit, minmax(150px, max-content));
max-width: 100%;
grid-gap: 20px;
margin: 0 auto;
diff --git a/src/components/common/VnCheckbox.vue b/src/components/common/VnCheckbox.vue
index b8aa4dbfe..061379567 100644
--- a/src/components/common/VnCheckbox.vue
+++ b/src/components/common/VnCheckbox.vue
@@ -1,11 +1,25 @@
+
-
+
diff --git a/src/composables/checkEntryLock.js b/src/composables/checkEntryLock.js
index db59be350..df32087c2 100644
--- a/src/composables/checkEntryLock.js
+++ b/src/composables/checkEntryLock.js
@@ -42,7 +42,22 @@ export async function checkEntryLock(entryFk, userFk) {
lockerUserFk: userFk,
}),
)
- .onCancel(() => push({ path: `summary` }));
+ .onCancel(() => {
+ push({ path: `summary` });
+ });
}
+ } else {
+ await axios
+ .patch(`Entries/${entryFk}`, {
+ locked: Date.vnNow(),
+ lockerUserFk: userFk,
+ })
+ .then(
+ quasar.notify({
+ message: t('entry.lock.success'),
+ color: 'positive',
+ position: 'top',
+ }),
+ );
}
}
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 0b586b4bc..f7f7ca32c 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -214,10 +214,12 @@ const columns = [
{
align: 'center',
labelAbbreviation: 'GM',
+ label: t('Grouping selector'),
toolTip: t('Grouping selector'),
name: 'groupingMode',
component: 'toggle',
attrs: {
+ label: '',
'toggle-indeterminate': true,
trueValue: 'grouping',
falseValue: 'packing',
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 0005e944b..c25a7c186 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -11,6 +11,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
import EntryBuys from './EntryBuys.vue';
import VnTitle from 'src/components/common/VnTitle.vue';
+import VnCheckbox from 'src/components/common/VnCheckbox.vue';
import VnToSummary from 'src/components/ui/VnToSummary.vue';
const route = useRoute();
@@ -65,7 +66,7 @@ onMounted(async () => {
@@ -89,33 +90,37 @@ onMounted(async () => {
/>
-
-
-
-
@@ -149,22 +154,24 @@ onMounted(async () => {
/>
-
-
{
display: flex;
flex-direction: column;
text-overflow: ellipsis;
+ > div {
+ max-height: 24px;
+ }
}
@media (min-width: 1010px) {
@@ -202,6 +212,6 @@ onMounted(async () => {
es:
- Travel data: Datos envío
+ Travel: Envío
InvoiceIn data: Datos factura