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

feature/FaltantesModuloTravel #185

Merged
jsegarra merged 17 commits from :feature/FaltantesModuloTravel into dev 2024-02-09 13:11:23 +00:00
Conversation 1 Commits 17 Files Changed 23 +19 -7
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2459e32f00 - Show all commits

26
src/pages/Travel/TravelList.vue
View File

@ -1,5 +1,5 @@
<script setup>
jsegarra marked this conversation as resolved
jsegarra commented 2024-02-08 06:43:01 +00:00
Review
Copy Link

Cuando pulsas en un detalle de un travel, se muestra el dialogo.
Si pulsas sobre el primer icono:

  1. No tiene tooltip
  2. Redirige a salix y no a lilium. @alexm es correcto?
  3. Redirige mal, pues le falta el summary después.
Cuando pulsas en un detalle de un travel, se muestra el dialogo. Si pulsas sobre el primer icono: 1. No tiene tooltip 2. Redirige a salix y no a lilium. @alexm es correcto? 3. Redirige mal, pues le falta el summary después.
wbuezas commented 2024-02-08 10:59:27 +00:00
Review
Copy Link

Corregido.

Commit: 4dc31bfdce

Corregido. Commit: https://gitea.verdnatura.es/verdnatura/salix-front/commit/4dc31bfdcec15f752a40ef88df4fd70282230a29
jsegarra commented 2024-02-08 11:33:43 +00:00
Review
Copy Link

1 y 3 OK

1 y 3 OK
import { onMounted } from 'vue';
import { onMounted, ref } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router';
import { useQuasar } from 'quasar';
@ -9,6 +9,7 @@ import CardList from 'src/components/ui/CardList.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import TravelSummaryDialog from './Card/TravelSummaryDialog.vue';
import TravelFilter from './TravelFilter.vue';
import FetchData from 'components/FetchData.vue';
import { useStateStore } from 'stores/useStateStore';
import { toDate } from 'src/filters/index';
@ -18,6 +19,8 @@ const quasar = useQuasar();
const { t } = useI18n();
const stateStore = useStateStore();
const warehouses = ref([]);
const navigateToTravelId = (id) => {
router.push({ path: `/travel/${id}` });
};
@ -35,6 +38,10 @@ const redirectCreateEntryView = (travelData) => {
router.push({ name: 'EntryCreate', query: { travelFk: travelData.id } });
};
const getWarehouseName = (id) => {
return warehouses.value.find((warehouse) => warehouse.id === id).name;
};
const viewSummary = (id) => {
quasar.dialog({
component: TravelSummaryDialog,
@ -50,6 +57,13 @@ onMounted(async () => {
</script>
<template>
<FetchData
url="Warehouses"
:filter="{ fields: ['id', 'name'] }"
order="name"
@on-fetch="(data) => (warehouses = data)"
auto-load
/>
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
<QScrollArea class="fit text-grey-8">
<TravelFilter data-key="TravelList" />
@ -77,8 +91,9 @@ onMounted(async () => {
:value="row.agencyModeName"
/>
<VnLv
v-if="warehouses.length > 0"
:label="t('globals.wareHouseOut')"
:value="row.warehouseOutFk"
:value="getWarehouseName(row.warehouseOutFk)"
/>
<VnLv
:label="t('globals.shipped')"
@ -89,10 +104,10 @@ onMounted(async () => {
:value="toDate(row.landed)"
/>
<VnLv
v-if="warehouses.length > 0"
:label="t('globals.wareHouseIn')"
:value="row.warehouseInFk"
:value="getWarehouseName(row.warehouseInFk)"
/>
<VnLv
:label="t('globals.totalEntries')"
:value="row.totalEntries"
@ -136,9 +151,6 @@ onMounted(async () => {
en:
addEntry: Add entry
es:
addEntry: Añadir entrada
</i18n>