verdnatura/salix-front
verdnatura
/
salix-front
1
2
Fork 1
Code Issues Pull Requests 59 Releases Wiki Activity

Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details

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

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

@ -190,17 +190,11 @@ const getExpeditionState = async (expedition) => {
const { data: expeditionStates } = await axios.get(`ExpeditionStates/filter`, { const { data: expeditionStates } = await axios.get(`ExpeditionStates/filter`, {
params: { filter: JSON.stringify(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, ...state,
isScanned: scannedState ? scannedState.isScanned : false, isScanned: !!state.isScanned,
}; }));
});
} catch (error) { } catch (error) {
console.error(error); console.error(error);
} }
@ -231,16 +225,17 @@ onUnmounted(() => (stateStore.rightDrawer = false));
:select-props="{ :select-props="{
options: expeditionStateTypes, options: expeditionStateTypes,
optionLabel: 'description', optionLabel: 'description',
optionValue: 'code',
}" }"
:promise=" :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.tableRef.clearSelection();
vnTableRef.reload();
} }
" "
/> />
@ -309,7 +304,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
'row-key': 'id', 'row-key': 'id',
selection: 'multiple', selection: 'multiple',
}" }"
save-url="Expeditions/crud"
auto-load auto-load
:expr-builder=" :expr-builder="
(param, value) => { (param, value) => {
@ -355,11 +349,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
</template> </template>
<template #body-cell-isScanned="{ row }"> <template #body-cell-isScanned="{ row }">
<QTd style="text-align: center"> <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> </QTd>
</template> </template>
</QTable> </QTable>