Merge branch 'dev' into 7283-itemMigration

src/components/VnTable/VnTable.vue

@@ -417,6 +417,7 @@ function handleScroll() {
                 ref="tableRef"
                 v-bind="table"
                 class="vnTable"
+                :class="{ 'last-row-sticky': $props.footer }"
                 :columns="splittedColumns.columns"
                 :rows="rows"
                 v-model:selected="selected"
@@ -855,6 +856,9 @@ es:
     table tbody th {
         position: relative;
     }
+}
+
+.last-row-sticky {
     tbody:nth-last-child(1) {
         @extend .bg-header;
         position: sticky;

src/pages/Ticket/Card/TicketExpedition.vue

@@ -190,17 +190,11 @@ const getExpeditionState = async (expedition) => {
         const { data: expeditionStates } = await axios.get(`ExpeditionStates/filter`, {
             params: { filter: JSON.stringify(filter) },
         });
-        const { data: scannedStates } = await axios.get(`ExpeditionStates`, {
-            params: { filter: JSON.stringify(filter), fields: ['id', 'isScanned'] },
-        });
 
-        expeditionsLogsData.value = expeditionStates.map((state) => {
+        expeditionsLogsData.value = expeditionStates.map((state) => ({
-            const scannedState = scannedStates.find((s) => s.id === state.id);
-            return {
             ...state,
-                isScanned: scannedState ? scannedState.isScanned : false,
+            isScanned: !!state.isScanned,
-            };
+        }));
-        });
     } catch (error) {
         console.error(error);
     }
@@ -231,16 +225,17 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     :select-props="{
                         options: expeditionStateTypes,
                         optionLabel: 'description',
+                        optionValue: 'code',
                     }"
                     :promise="
-                        async (stateTypeFk) => {
+                        async (stateCode) => {
-                            await vnTableRef.CrudModelRef.saveChanges({
+                            await axios.post('ExpeditionStates/addExpeditionState', {
-                                updates: selectedRows.map(({ id }) => ({
+                                expeditions: selectedRows.map(({ id }) => {
-                                    data: { stateTypeFk },
+                                    return { expeditionFk: id, stateCode };
-                                    where: { id },
+                                }),
-                                })),
                             });
                             vnTableRef.tableRef.clearSelection();
+                            vnTableRef.reload();
                         }
                     "
                 />
@@ -309,7 +304,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             'row-key': 'id',
             selection: 'multiple',
         }"
-        save-url="Expeditions/crud"
         auto-load
         :expr-builder="
             (param, value) => {
@@ -355,11 +349,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </template>
             <template #body-cell-isScanned="{ row }">
                 <QTd style="text-align: center">
-                    <QCheckbox disable v-model="row.isScanned">
+                    <QCheckbox disable v-model="row.isScanned" />
-                        {{
-                            row.isScanned === 1 ? t('expedition.yes') : t('expedition.no')
-                        }}
-                    </QCheckbox>
                 </QTd>
             </template>
         </QTable>