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

CambiosSolicitadosEntries #201

Merged
alexm merged 17 commits from :CambiosSolicitadosEntries into dev 2024-03-14 06:39:45 +00:00
Conversation 1 Commits 17 Files Changed 8 +29 -9
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 84a0be0a5c - Show all commits

38
src/pages/Entry/Card/EntrySummary.vue
View File

@ -148,9 +148,13 @@ const fetchEntryBuys = async () => {
@on-fetch="(data) => setEntryData(data)"
>
<template #header-left>
<a class="header link" :href="entryUrl">
<router-link
jsegarra marked this conversation as resolved Outdated
jsegarra commented 2024-02-27 06:52:14 +00:00
Outdated
Review
Copy Link

Revisamos porque no apunta a la misma URL, ver imagen de grupo.

Revisamos porque no apunta a la misma URL, ver imagen de grupo.
wbuezas commented 2024-02-27 11:19:09 +00:00
Outdated
Review
Copy Link

Corregido.

Commit: 59dc1a4e38

Corregido. Commit: https://gitea.verdnatura.es/verdnatura/salix-front/commit/59dc1a4e3867a6b722f236113141c7e874aed5f7
:to="{ name: 'EntrySummary', params: { id: entityId } }"
jsegarra commented 2024-02-29 06:55:43 +00:00
Outdated
Review
Copy Link

Creo que faltaría actualizar el código porque si fusionamos primero entries, supplier dará conflictos, y viceversa

Creo que faltaría actualizar el código porque si fusionamos primero entries, supplier dará conflictos, y viceversa
wbuezas commented 2024-02-29 12:08:28 +00:00
Outdated
Review
Copy Link

Si @jsegarra, coincido totalmente, primero se deberia mergear suppliers y luego actualizar esta rama con esos cambios

Si @jsegarra, coincido totalmente, primero se deberia mergear `suppliers` y luego actualizar esta rama con esos cambios
class="header link"
:href="entryUrl"
>
<QIcon name="open_in_new" color="white" size="sm" />
</a>
</router-link>
</template>
<template #header>
<span>{{ entry.id }} - {{ entry.supplier.nickname }}</span>
@ -158,10 +162,13 @@ const fetchEntryBuys = async () => {
<template #body>
<QCard class="vn-one">
<a class="header link" :href="entryUrl">
<router-link
:to="{ name: 'EntryBasicData', params: { id: entityId } }"
class="header link"
>
{{ t('globals.summary.basicData') }}
<QIcon name="open_in_new" color="primary" />
</a>
</router-link>
<VnRow>
<div class="col">
<VnLv
@ -193,6 +200,17 @@ const fetchEntryBuys = async () => {
:value="entry.invoiceNumber"
/>
</div>
</VnRow>
</QCard>
<QCard class="vn-one">
<router-link
:to="{ name: 'EntryBasicData', params: { id: entityId } }"
class="header link"
>
{{ t('globals.summary.basicData') }}
<QIcon name="open_in_new" color="primary" />
</router-link>
<VnRow>
<div class="col">
<VnLv
:label="t('entry.summary.ordered')"
@ -218,15 +236,17 @@ const fetchEntryBuys = async () => {
<VnLv
:label="t('entry.summary.excludedFromAvailable')"
:value="entry.isExcludedFromAvailable"
/>
</div>
</VnRow>
/></div
></VnRow>
</QCard>
<QCard class="vn-one">
<a class="header link" :href="entryUrl">
<router-link
:to="{ name: 'TravelSummary', params: { id: entry.travel.id } }"
class="header link"
>
{{ t('Travel data') }}
<QIcon name="open_in_new" color="primary" />
</a>
</router-link>
<VnRow>
<div class="col">
<VnLv :label="t('entry.summary.travelReference')">