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

PR-CUSTOMER #186

Merged
jsegarra merged 105 commits from :PR-CUSTOMER into dev 2024-04-19 15:55:53 +00:00
Conversation 0 Commits 105 Files Changed 77 +83 -70
2 changed files with 83 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d9a1d62c74 - Show all commits

70
src/pages/Customer/Card/CustomerCredits.vue
View File

@ -85,39 +85,45 @@ const toCustomerCreditCreate = () => {
url="ClientCredits"
/>
<QPage class="column items-center q-pa-md">
<QTable
:columns="columns"
:pagination="{ rowsPerPage: 12 }"
:rows="rows"
class="full-width q-mt-md"
row-key="id"
v-if="rows?.length"
>
<template #body-cell="props">
<QTd :props="props">
<QTr :props="props" class="cursor-pointer">
<component
:is="tableColumnComponents[props.col.name].component"
@click="tableColumnComponents[props.col.name].event(props)"
class="rounded-borders q-pa-sm"
v-bind="tableColumnComponents[props.col.name].props(props)"
>
{{ props.value }}
<WorkerDescriptorProxy
:id="props.row.workerFk"
v-if="props.col.name === 'employee'"
/>
</component>
</QTr>
</QTd>
</template>
</QTable>
<div class="full-width flex justify-center">
<QCard class="card-width q-pa-lg">
<QTable
:columns="columns"
:pagination="{ rowsPerPage: 12 }"
:rows="rows"
class="full-width q-mt-md"
row-key="id"
v-if="rows?.length"
>
<template #body-cell="props">
<QTd :props="props">
<QTr :props="props" class="cursor-pointer">
<component
:is="tableColumnComponents[props.col.name].component"
@click="
tableColumnComponents[props.col.name].event(props)
"
class="rounded-borders q-pa-sm"
v-bind="
tableColumnComponents[props.col.name].props(props)
"
>
{{ props.value }}
<WorkerDescriptorProxy
:id="props.row.workerFk"
v-if="props.col.name === 'employee'"
/>
</component>
</QTr>
</QTd>
</template>
</QTable>
<h5 class="flex justify-center color-vn-label" v-else>
{{ t('globals.noResults') }}
</h5>
</QPage>
<h5 class="flex justify-center color-vn-label" v-else>
{{ t('globals.noResults') }}
</h5>
</QCard>
</div>
<QPageSticky :offset="[18, 18]">
<QBtn @click.stop="toCustomerCreditCreate()" color="primary" fab icon="add" />

83
src/pages/Customer/Card/CustomerNotes.vue
View File

@ -23,45 +23,52 @@ const toCustomerNoteCreate = () => {
</script>
<template>
<QCard class="q-pa-lg">
<VnPaginate
data-key="CustomerNotes"
:url="'clientObservations'"
auto-load
:filter="noteFilter"
>
<template #body="{ rows }">
<div v-if="rows.length">
<QCard
v-for="(item, index) in rows"
:key="index"
:class="{
'q-pa-md': true,
'q-rounded': true,
'custom-border': true,
'q-mb-md': index < rows.length - 1,
}"
>
<div class="flex justify-between">
<p class="color-vn-label">{{ item.worker.user.nickname }}</p>
<p class="color-vn-label">
{{
date.formatDate(item?.created, 'DD-MM-YYYY HH:mm:ss')
}}
</p>
</div>
<h6 class="q-mt-xs q-mb-none">{{ item.text }}</h6>
</QCard>
</div>
<div class="full-width flex justify-center">
<QCard class="card-width q-pa-lg">
<VnPaginate
data-key="CustomerNotes"
:url="'clientObservations'"
jsegarra marked this conversation as resolved Outdated
jsegarra commented 2024-03-13 22:31:43 +00:00
Outdated
Review
Copy Link

Si es texto literal , quitar :

Si es texto literal , quitar :
wbuezas commented 2024-03-28 19:16:17 +00:00
Outdated
Review
Copy Link

Aplicado

Commit: fb59ac1f2f

Aplicado Commit: https://gitea.verdnatura.es/verdnatura/salix-front/commit/fb59ac1f2f90be4469ef31258fcd087477df8ee7
auto-load
:filter="noteFilter"
>
<template #body="{ rows }">
<div v-if="rows.length">
<QCard
v-for="(item, index) in rows"
:key="index"
:class="{
'q-pa-md': true,
jsegarra marked this conversation as resolved Outdated
jsegarra commented 2024-03-13 22:31:18 +00:00
Outdated
Review
Copy Link

TODO: si lleva true mover a class

TODO: si lleva true mover a class
wbuezas commented 2024-03-28 19:14:18 +00:00
Outdated
Review
Copy Link

Se mejoró la definición de clases

Commit: f6b8a73ae2

Se mejoró la definición de clases Commit: https://gitea.verdnatura.es/verdnatura/salix-front/commit/f6b8a73ae2af64f343f973db1449f5f9aeee3387
'q-rounded': true,
'custom-border': true,
'q-mb-md': index < rows.length - 1,
}"
>
<div class="flex justify-between">
<p class="color-vn-label">
{{ item.worker.user.nickname }}
</p>
<p class="color-vn-label">
{{
date.formatDate(
jsegarra marked this conversation as resolved
jsegarra commented 2024-03-13 22:32:09 +00:00
Review
Copy Link

Duda, cuando actualicemos con dev no tendremos conflicto?

Duda, cuando actualicemos con dev no tendremos conflicto?
wbuezas commented 2024-03-28 19:12:05 +00:00
Review
Copy Link

Se reemplazo date.formatDate por las nuevas utils ubicadas en date.js

Commit: e1f8b7217a

Se reemplazo `date.formatDate` por las nuevas utils ubicadas en `date.js` Commit: https://gitea.verdnatura.es/verdnatura/salix-front/commit/e1f8b7217a1bbfa0b739f25321cefcafb1e3aed5
item?.created,
'DD-MM-YYYY HH:mm:ss'
)
}}
</p>
</div>
<h6 class="q-mt-xs q-mb-none">{{ item.text }}</h6>
</QCard>
</div>
<div v-else>
<h5 class="flex justify-center color-vn-label">
{{ t('globals.noResults') }}
</h5>
</div>
</template>
</VnPaginate>
</QCard>
<div v-else>
<h5 class="flex justify-center color-vn-label">
{{ t('globals.noResults') }}
</h5>
</div>
</template>
</VnPaginate>
</QCard>
</div>
<QPageSticky :offset="[18, 18]">
<QBtn @click.stop="toCustomerNoteCreate()" color="primary" fab icon="add" />