wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test

This commit is contained in:
Alex Moreno 2024-10-24 07:49:01 +02:00
parent 5d4b5ad598 a0a37a68a0
commit f26976b744
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/pages/Ticket/Card/TicketExpedition.vue
View File

@ -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) => {
const scannedState = scannedStates.find((s) => s.id === state.id);
return {
...state,
isScanned: scannedState ? scannedState.isScanned : false,
};
});
expeditionsLogsData.value = expeditionStates.map((state) => ({
...state,
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) => {
await vnTableRef.CrudModelRef.saveChanges({
updates: selectedRows.map(({ id }) => ({
data: { stateTypeFk },
where: { id },
})),
async (stateCode) => {
await axios.post('ExpeditionStates/addExpeditionState', {
expeditions: selectedRows.map(({ id }) => {
return { expeditionFk: id, stateCode };
}),
});
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">
{{
row.isScanned === 1 ? t('expedition.yes') : t('expedition.no')
}}
</QCheckbox>
<QCheckbox disable v-model="row.isScanned" />
</QTd>
</template>
</QTable>