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

fix: refs #8322 supplier use cardBeta correctly

This commit is contained in:
Alex Moreno 2025-02-07 08:19:51 +01:00
parent 1a420abfb2
commit c72d4e9f04
9 changed files with 110 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/VnTable/VnTableFilter.vue
View File

@ -27,7 +27,7 @@ function columnName(col) {
</script> </script>
<template> <template>
<VnFilterPanel v-bind="$attrs" :search-button="true" :disable-submit-event="true"> <VnFilterPanel v-bind="$attrs" :search-button="true" :disable-submit-event="true">
<template #body="{ params, orders }"> <template #body="{ params, orders, searchFn }">
<div <div
class="row no-wrap flex-center" class="row no-wrap flex-center"
v-for="col of columns.filter((c) => c.columnFilter ?? true)" v-for="col of columns.filter((c) => c.columnFilter ?? true)"
@ -52,6 +52,7 @@ function columnName(col) {
<slot <slot
name="moreFilterPanel" name="moreFilterPanel"
:params="params" :params="params"
:search-fn="searchFn"
:orders="orders" :orders="orders"
:columns="columns" :columns="columns"
/> />

9
src/components/common/VnSection.vue
View File

@ -106,7 +106,14 @@ function checkIsMain() {
:data-key="dataKey" :data-key="dataKey"
:array-data="arrayData" :array-data="arrayData"
:columns="columns" :columns="columns"
/> >
<template #moreFilterPanel="{ params, orders, searchFn }">
<slot
name="moreFilterPanel"
v-bind="{ params, orders, searchFn }"
/>
</template>
</VnTableFilter>
</slot> </slot>
</template> </template>
</RightAdvancedMenu> </RightAdvancedMenu>

4
src/i18n/locale/en.yml
View File

@ -635,8 +635,8 @@ wagon:
name: Name name: Name
supplier: supplier:
search: Search provider search: Search supplier
searchInfo: Search provider by id or name searchInfo: Search supplier by id or name
list: list:
payMethod: Pay method payMethod: Pay method
account: Account account: Account

2
src/pages/Customer/Card/CustomerConsumption.vue
View File

@ -119,7 +119,7 @@ const openSendEmailDialog = async () => {
openConfirmationModal( openConfirmationModal(
t('The consumption report will be sent'), t('The consumption report will be sent'),
t('Please, confirm'), t('Please, confirm'),
() => sendCampaignMetricsEmail({ address: arrayData.store.data.email }) () => sendCampaignMetricsEmail({ address: arrayData.store.data.email }),
); );
}; };
const sendCampaignMetricsEmail = ({ address }) => { const sendCampaignMetricsEmail = ({ address }) => {

8
src/pages/Supplier/Card/SupplierCard.vue
View File

@ -1,7 +1,13 @@
<script setup> <script setup>
import SupplierDescriptor from './SupplierDescriptor.vue'; import SupplierDescriptor from './SupplierDescriptor.vue';
import VnCardBeta from 'src/components/common/VnCardBeta.vue'; import VnCardBeta from 'src/components/common/VnCardBeta.vue';
import filter from './SupplierFilter.js';
</script> </script>
<template> <template>
<VnCardBeta data-key="Supplier" url="Suppliers" :descriptor="SupplierDescriptor" /> <VnCardBeta
data-key="Supplier"
url="Suppliers"
:descriptor="SupplierDescriptor"
:filter="filter"
/>
</template> </template>

103
src/pages/Supplier/Card/SupplierConsumption.vue
View File

@ -16,6 +16,7 @@ import axios from 'axios';
import { useStateStore } from 'stores/useStateStore'; import { useStateStore } from 'stores/useStateStore';
import { useState } from 'src/composables/useState'; import { useState } from 'src/composables/useState';
import { useArrayData } from 'composables/useArrayData'; import { useArrayData } from 'composables/useArrayData';
import RightMenu from 'src/components/common/RightMenu.vue';
const state = useState(); const state = useState();
const stateStore = useStateStore(); const stateStore = useStateStore();
@ -173,59 +174,59 @@ onMounted(async () => {
</div> </div>
</div> </div>
</Teleport> </Teleport>
<QPage class="column items-center q-pa-md"> <RightMenu>
<Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()"> <template #right-panel>
<SupplierConsumptionFilter data-key="SupplierConsumption" /> <SupplierConsumptionFilter data-key="SupplierConsumption" />
</Teleport> </template>
<QTable </RightMenu>
:rows="rows" <QTable
row-key="id" :rows="rows"
hide-header row-key="id"
class="full-width q-mt-md" hide-header
:no-data-label="t('No results')" class="full-width q-mt-md"
> :no-data-label="t('No results')"
<template #body="{ row }"> >
<QTr> <template #body="{ row }">
<QTd no-hover> <QTr>
<span class="label">{{ t('supplier.consumption.entry') }}: </span> <QTd no-hover>
<span>{{ row.id }}</span> <span class="label">{{ t('supplier.consumption.entry') }}: </span>
</QTd> <span>{{ row.id }}</span>
<QTd no-hover> </QTd>
<span class="label">{{ t('globals.date') }}: </span> <QTd no-hover>
<span>{{ toDate(row.shipped) }}</span></QTd <span class="label">{{ t('globals.date') }}: </span>
> <span>{{ toDate(row.shipped) }}</span></QTd
<QTd colspan="6" no-hover> >
<span class="label">{{ t('globals.reference') }}: </span> <QTd colspan="6" no-hover>
<span>{{ row.invoiceNumber }}</span> <span class="label">{{ t('globals.reference') }}: </span>
</QTd> <span>{{ row.invoiceNumber }}</span>
</QTr> </QTd>
<QTr v-for="(buy, index) in row.buys" :key="index"> </QTr>
<QTd no-hover> <QTr v-for="(buy, index) in row.buys" :key="index">
<QBtn flat color="blue" dense no-caps>{{ buy.itemName }}</QBtn> <QTd no-hover>
<ItemDescriptorProxy :id="buy.itemFk" /> <QBtn flat color="blue" dense no-caps>{{ buy.itemName }}</QBtn>
</QTd> <ItemDescriptorProxy :id="buy.itemFk" />
</QTd>
<QTd no-hover> <QTd no-hover>
<span>{{ buy.subName }}</span> <span>{{ buy.subName }}</span>
<FetchedTags :item="buy" /> <FetchedTags :item="buy" />
</QTd> </QTd>
<QTd no-hover> {{ dashIfEmpty(buy.quantity) }}</QTd> <QTd no-hover> {{ dashIfEmpty(buy.quantity) }}</QTd>
<QTd no-hover> {{ dashIfEmpty(buy.price) }}</QTd> <QTd no-hover> {{ dashIfEmpty(buy.price) }}</QTd>
<QTd colspan="2" no-hover> {{ dashIfEmpty(buy.total) }}</QTd> <QTd colspan="2" no-hover> {{ dashIfEmpty(buy.total) }}</QTd>
</QTr> </QTr>
<QTr> <QTr>
<QTd colspan="5" no-hover> <QTd colspan="5" no-hover>
<span class="label">{{ t('Total entry') }}: </span> <span class="label">{{ t('Total entry') }}: </span>
<span>{{ row.total }} €</span> <span>{{ row.total }} €</span>
</QTd> </QTd>
<QTd no-hover> <QTd no-hover>
<span class="label">{{ t('Total stems') }}: </span> <span class="label">{{ t('Total stems') }}: </span>
<span>{{ row.quantity }}</span> <span>{{ row.quantity }}</span>
</QTd> </QTd>
</QTr> </QTr>
</template> </template>
</QTable> </QTable>
</QPage>
</template> </template>
<style scoped lang="scss"> <style scoped lang="scss">

38
src/pages/Supplier/SupplierList.vue
View File

@ -2,14 +2,15 @@
import { computed, ref } from 'vue'; import { computed, ref } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import VnTable from 'components/VnTable/VnTable.vue'; import VnTable from 'components/VnTable/VnTable.vue';
import SupplierListFilter from './SupplierListFilter.vue';
import VnSection from 'src/components/common/VnSection.vue'; import VnSection from 'src/components/common/VnSection.vue';
import VnInput from 'src/components/common/VnInput.vue'; import VnInput from 'src/components/common/VnInput.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import FetchData from 'src/components/FetchData.vue';
const { t } = useI18n(); const { t } = useI18n();
const tableRef = ref(); const tableRef = ref();
const dataKey = 'SupplierList'; const dataKey = 'SupplierList';
const provincesOptions = ref([]);
const columns = computed(() => [ const columns = computed(() => [
{ {
align: 'left', align: 'left',
@ -105,8 +106,12 @@ const columns = computed(() => [
]); ]);
</script> </script>
<template> <template>
<!-- <SupplierListFilter data-key="SuppliersList" /> --> <FetchData
url="Provinces"
:filter="{ fields: ['id', 'name'], order: 'name ASC' }"
@on-fetch="(data) => (provincesOptions = data)"
auto-load
/>
<VnSection <VnSection
:data-key="dataKey" :data-key="dataKey"
:columns="columns" :columns="columns"
@ -133,13 +138,26 @@ const columns = computed(() => [
}" }"
:columns="columns" :columns="columns"
redirect="supplier" redirect="supplier"
/> :right-search="false"
>
<template #more-create-dialog="{ data }">
<VnInput
:label="t('globals.name')"
v-model="data.socialName"
:uppercase="true"
/>
</template>
</VnTable>
</template> </template>
<template #more-create-dialog="{ data }"> <template #moreFilterPanel="{ params, searchFn }">
<VnInput <VnSelect
:label="t('globals.name')" :label="t('globals.params.provinceFk')"
v-model="data.socialName" v-model="params.provinceFk"
:uppercase="true" @update:model-value="searchFn()"
:options="provincesOptions"
filled
dense
class="q-px-sm q-pr-lg"
/> />
</template> </template>
</VnSection> </VnSection>

122
src/pages/Supplier/SupplierListFilter.vue
View File

@ -1,122 +0,0 @@
<script setup>
import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import VnInput from 'src/components/common/VnInput.vue';
import FetchData from 'components/FetchData.vue';
const props = defineProps({
dataKey: {
type: String,
required: true,
},
});
const { t } = useI18n();
const provincesOptions = ref([]);
const countriesOptions = ref([]);
</script>
<template>
<FetchData
url="Provinces"
:filter="{ fields: ['id', 'name'], order: 'name ASC'}"
@on-fetch="(data) => (provincesOptions = data)"
auto-load
/>
<FetchData
url="countries"
:filter="{ fields: ['id', 'name'], order: 'name ASC'}"
@on-fetch="(data) => (countriesOptions = data)"
auto-load
/>
<VnFilterPanel
:data-key="props.dataKey"
:search-button="true"
:unremovable-params="['supplierFk']"
>
<template #tags="{ tag, formatFn }">
<div class="q-gutter-x-xs">
<strong>{{ t(`params.${tag.label}`) }}: </strong>
<span>{{ formatFn(tag.value) }}</span>
</div>
</template>
<template #body="{ params, searchFn }">
<QItem>
<QItemSection>
<VnInput
v-model="params.search"
:label="t('params.search')"
is-outlined
/>
</QItemSection>
</QItem>
<QItem>
<QItemSection>
<VnInput
v-model="params.nickname"
:label="t('params.nickname')"
is-outlined
/>
</QItemSection>
</QItem>
<QItem>
<QItemSection>
<VnInput v-model="params.nif" :label="t('params.nif')" is-outlined />
</QItemSection>
</QItem>
<QItem>
<QItemSection>
<VnSelect
:label="t('params.provinceFk')"
v-model="params.provinceFk"
@update:model-value="searchFn()"
:options="provincesOptions"
option-value="id"
option-label="name"
hide-selected
dense
outlined
rounded
/>
</QItemSection>
</QItem>
<QItem>
<QItemSection>
<VnSelect
:label="t('params.countryFk')"
v-model="params.countryFk"
@update:model-value="searchFn()"
:options="countriesOptions"
option-value="id"
option-label="name"
hide-selected
dense
outlined
rounded
/>
</QItemSection>
</QItem>
</template>
</VnFilterPanel>
</template>
<i18n>
en:
params:
search: General search
nickname: Alias
nif: Tax number
provinceFk: Province
countryFk: Country
es:
params:
search: Búsqueda general
nickname: Alias
nif: NIF/CIF
provinceFk: Provincia
countryFk: País
</i18n>

9
src/router/modules/supplier.js
View File

@ -99,6 +99,15 @@ const supplierCard = {
component: () => component: () =>
import('src/pages/Supplier/Card/SupplierAddressesCreate.vue'), import('src/pages/Supplier/Card/SupplierAddressesCreate.vue'),
}, },
{
path: 'balance',
name: 'SupplierBalance',
meta: {
title: 'balance',
icon: 'balance',
},
component: () => import('src/pages/Supplier/Card/SupplierBalance.vue'),
},
{ {
path: 'consumption', path: 'consumption',
name: 'SupplierConsumption', name: 'SupplierConsumption',