Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
commit
96719884fb
|
@ -13,6 +13,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
|
- (Worker) => Se crea la sección Taquilla
|
||||||
|
- (General) => Se mantiene el filtro lateral en cualquier parte de la seccíon.
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- (General) => Se vuelven a mostrar los parámetros en la url al aplicar un filtro
|
- (General) => Se vuelven a mostrar los parámetros en la url al aplicar un filtro
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "salix-front",
|
"name": "salix-front",
|
||||||
"version": "24.22.0",
|
"version": "24.24.0",
|
||||||
"description": "Salix frontend",
|
"description": "Salix frontend",
|
||||||
"productName": "Salix",
|
"productName": "Salix",
|
||||||
"author": "Verdnatura",
|
"author": "Verdnatura",
|
||||||
|
|
|
@ -8,12 +8,7 @@ import FetchData from 'components/FetchData.vue';
|
||||||
import VnRow from 'components/ui/VnRow.vue';
|
import VnRow from 'components/ui/VnRow.vue';
|
||||||
import FormModelPopup from './FormModelPopup.vue';
|
import FormModelPopup from './FormModelPopup.vue';
|
||||||
|
|
||||||
const props = defineProps({
|
defineProps({ showEntityField: { type: Boolean, default: true } });
|
||||||
showEntityField: {
|
|
||||||
type: Boolean,
|
|
||||||
default: true,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const emit = defineEmits(['onDataSaved']);
|
const emit = defineEmits(['onDataSaved']);
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
@ -26,7 +21,7 @@ const bankEntityFormData = reactive({
|
||||||
});
|
});
|
||||||
|
|
||||||
const countriesFilter = {
|
const countriesFilter = {
|
||||||
fields: ['id', 'country', 'code'],
|
fields: ['id', 'name', 'code'],
|
||||||
};
|
};
|
||||||
|
|
||||||
const countriesOptions = ref([]);
|
const countriesOptions = ref([]);
|
||||||
|
@ -58,15 +53,12 @@ onMounted(async () => {
|
||||||
>
|
>
|
||||||
<template #form-inputs="{ data, validate }">
|
<template #form-inputs="{ data, validate }">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('name')"
|
:label="t('name')"
|
||||||
v-model="data.name"
|
v-model="data.name"
|
||||||
:required="true"
|
:required="true"
|
||||||
:rules="validate('bankEntity.name')"
|
:rules="validate('bankEntity.name')"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
ref="bicInputRef"
|
ref="bicInputRef"
|
||||||
:label="t('swift')"
|
:label="t('swift')"
|
||||||
|
@ -74,7 +66,6 @@ onMounted(async () => {
|
||||||
:required="true"
|
:required="true"
|
||||||
:rules="validate('bankEntity.bic')"
|
:rules="validate('bankEntity.bic')"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
|
@ -83,7 +74,7 @@ onMounted(async () => {
|
||||||
v-model="data.countryFk"
|
v-model="data.countryFk"
|
||||||
:options="countriesOptions"
|
:options="countriesOptions"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
option-label="country"
|
option-label="name"
|
||||||
hide-selected
|
hide-selected
|
||||||
:required="true"
|
:required="true"
|
||||||
:rules="validate('bankEntity.countryFk')"
|
:rules="validate('bankEntity.countryFk')"
|
||||||
|
|
|
@ -52,9 +52,7 @@ onMounted(() => {
|
||||||
</span>
|
</span>
|
||||||
<h1 class="title">{{ t('New department') }}</h1>
|
<h1 class="title">{{ t('New department') }}</h1>
|
||||||
<VnRow class="row q-gutter-md q-mb-md" style="min-width: 250px">
|
<VnRow class="row q-gutter-md q-mb-md" style="min-width: 250px">
|
||||||
<div class="col">
|
|
||||||
<VnInput :label="t('Name')" v-model="data.name" />
|
<VnInput :label="t('Name')" v-model="data.name" />
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<div class="q-mt-lg row justify-end">
|
<div class="q-mt-lg row justify-end">
|
||||||
<QBtn
|
<QBtn
|
||||||
|
|
|
@ -72,7 +72,6 @@ const onDataSaved = async (formData, requestResponse) => {
|
||||||
{{ t('Invoicing in progress...') }}
|
{{ t('Invoicing in progress...') }}
|
||||||
</span>
|
</span>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Ticket')"
|
:label="t('Ticket')"
|
||||||
:options="ticketsOptions"
|
:options="ticketsOptions"
|
||||||
|
@ -86,18 +85,14 @@ const onDataSaved = async (formData, requestResponse) => {
|
||||||
<QItem v-bind="scope.itemProps">
|
<QItem v-bind="scope.itemProps">
|
||||||
<QItemSection>
|
<QItemSection>
|
||||||
<QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
|
<QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
|
||||||
<QItemLabel caption>{{
|
<QItemLabel caption>{{ scope.opt?.nickname }}</QItemLabel>
|
||||||
scope.opt?.nickname
|
|
||||||
}}</QItemLabel>
|
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
</template>
|
</template>
|
||||||
</VnSelect>
|
</VnSelect>
|
||||||
</div>
|
|
||||||
<span class="row items-center" style="max-width: max-content">{{
|
<span class="row items-center" style="max-width: max-content">{{
|
||||||
t('Or')
|
t('Or')
|
||||||
}}</span>
|
}}</span>
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Client')"
|
:label="t('Client')"
|
||||||
:options="clientsOptions"
|
:options="clientsOptions"
|
||||||
|
@ -107,13 +102,9 @@ const onDataSaved = async (formData, requestResponse) => {
|
||||||
v-model="data.clientFk"
|
v-model="data.clientFk"
|
||||||
@update:model-value="data.ticketFk = null"
|
@update:model-value="data.ticketFk = null"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
|
<VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Serial')"
|
:label="t('Serial')"
|
||||||
:options="invoiceOutSerialsOptions"
|
:options="invoiceOutSerialsOptions"
|
||||||
|
@ -123,8 +114,6 @@ const onDataSaved = async (formData, requestResponse) => {
|
||||||
v-model="data.serial"
|
v-model="data.serial"
|
||||||
:required="true"
|
:required="true"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Area')"
|
:label="t('Area')"
|
||||||
:options="taxAreasOptions"
|
:options="taxAreasOptions"
|
||||||
|
@ -134,7 +123,6 @@ const onDataSaved = async (formData, requestResponse) => {
|
||||||
v-model="data.taxArea"
|
v-model="data.taxArea"
|
||||||
:required="true"
|
:required="true"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<VnInput
|
<VnInput
|
||||||
|
|
|
@ -40,14 +40,11 @@ const onDataSaved = (dataSaved) => {
|
||||||
>
|
>
|
||||||
<template #form-inputs="{ data, validate }">
|
<template #form-inputs="{ data, validate }">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('Name')"
|
:label="t('Name')"
|
||||||
v-model="data.name"
|
v-model="data.name"
|
||||||
:rules="validate('city.name')"
|
:rules="validate('city.name')"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Province')"
|
:label="t('Province')"
|
||||||
:options="provincesOptions"
|
:options="provincesOptions"
|
||||||
|
@ -57,7 +54,6 @@ const onDataSaved = (dataSaved) => {
|
||||||
v-model="data.provinceFk"
|
v-model="data.provinceFk"
|
||||||
:rules="validate('city.provinceFk')"
|
:rules="validate('city.provinceFk')"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
</template>
|
</template>
|
||||||
</FormModelPopup>
|
</FormModelPopup>
|
||||||
|
|
|
@ -30,7 +30,7 @@ const townsLocationOptions = ref([]);
|
||||||
|
|
||||||
const onDataSaved = (formData) => {
|
const onDataSaved = (formData) => {
|
||||||
const newPostcode = {
|
const newPostcode = {
|
||||||
...formData
|
...formData,
|
||||||
};
|
};
|
||||||
const townObject = townsLocationOptions.value.find(
|
const townObject = townsLocationOptions.value.find(
|
||||||
({ id }) => id === formData.townFk
|
({ id }) => id === formData.townFk
|
||||||
|
@ -92,14 +92,11 @@ const onProvinceCreated = async ({ name }, formData) => {
|
||||||
>
|
>
|
||||||
<template #form-inputs="{ data, validate }">
|
<template #form-inputs="{ data, validate }">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('Postcode')"
|
:label="t('Postcode')"
|
||||||
v-model="data.code"
|
v-model="data.code"
|
||||||
:rules="validate('postcode.code')"
|
:rules="validate('postcode.code')"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnSelectDialog
|
<VnSelectDialog
|
||||||
:label="t('City')"
|
:label="t('City')"
|
||||||
:options="townsLocationOptions"
|
:options="townsLocationOptions"
|
||||||
|
@ -111,15 +108,11 @@ const onProvinceCreated = async ({ name }, formData) => {
|
||||||
:roles-allowed-to-create="['deliveryAssistant']"
|
:roles-allowed-to-create="['deliveryAssistant']"
|
||||||
>
|
>
|
||||||
<template #form>
|
<template #form>
|
||||||
<CreateNewCityForm
|
<CreateNewCityForm @on-data-saved="onCityCreated($event, data)" />
|
||||||
@on-data-saved="onCityCreated($event, data)"
|
|
||||||
/>
|
|
||||||
</template>
|
</template>
|
||||||
</VnSelectDialog>
|
</VnSelectDialog>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-xl">
|
<VnRow class="row q-gutter-md q-mb-xl">
|
||||||
<div class="col">
|
|
||||||
<VnSelectDialog
|
<VnSelectDialog
|
||||||
:label="t('Province')"
|
:label="t('Province')"
|
||||||
:options="provincesOptions"
|
:options="provincesOptions"
|
||||||
|
@ -134,21 +127,20 @@ const onProvinceCreated = async ({ name }, formData) => {
|
||||||
<CreateNewProvinceForm
|
<CreateNewProvinceForm
|
||||||
@on-data-saved="onProvinceCreated($event, data)"
|
@on-data-saved="onProvinceCreated($event, data)"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template> </VnSelectDialog
|
||||||
</VnSelectDialog>
|
></VnRow>
|
||||||
</div>
|
<VnRow class="row q-gutter-md q-mb-xl"
|
||||||
<div class="col">
|
><VnSelect
|
||||||
<VnSelect
|
|
||||||
:label="t('Country')"
|
:label="t('Country')"
|
||||||
:options="countriesOptions"
|
:options="countriesOptions"
|
||||||
hide-selected
|
hide-selected
|
||||||
option-label="country"
|
option-label="name"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="data.countryFk"
|
v-model="data.countryFk"
|
||||||
:rules="validate('postcode.countryFk')"
|
:rules="validate('postcode.countryFk')"
|
||||||
/>
|
/>
|
||||||
</div> </VnRow
|
</VnRow>
|
||||||
></template>
|
</template>
|
||||||
</FormModelPopup>
|
</FormModelPopup>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
|
@ -40,14 +40,11 @@ const onDataSaved = (dataSaved) => {
|
||||||
>
|
>
|
||||||
<template #form-inputs="{ data, validate }">
|
<template #form-inputs="{ data, validate }">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('Name')"
|
:label="t('Name')"
|
||||||
v-model="data.name"
|
v-model="data.name"
|
||||||
:rules="validate('province.name')"
|
:rules="validate('province.name')"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Autonomy')"
|
:label="t('Autonomy')"
|
||||||
:options="autonomiesOptions"
|
:options="autonomiesOptions"
|
||||||
|
@ -57,7 +54,6 @@ const onDataSaved = (dataSaved) => {
|
||||||
v-model="data.autonomyFk"
|
v-model="data.autonomyFk"
|
||||||
:rules="validate('province.autonomyFk')"
|
:rules="validate('province.autonomyFk')"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
</template>
|
</template>
|
||||||
</FormModelPopup>
|
</FormModelPopup>
|
||||||
|
|
|
@ -54,16 +54,12 @@ const onDataSaved = (dataSaved) => {
|
||||||
>
|
>
|
||||||
<template #form-inputs="{ data, validate }">
|
<template #form-inputs="{ data, validate }">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('Identifier')"
|
:label="t('Identifier')"
|
||||||
v-model="data.thermographId"
|
v-model="data.thermographId"
|
||||||
:required="true"
|
:required="true"
|
||||||
:rules="validate('thermograph.id')"
|
:rules="validate('thermograph.id')"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Model')"
|
:label="t('Model')"
|
||||||
:options="thermographsModels"
|
:options="thermographsModels"
|
||||||
|
@ -74,10 +70,8 @@ const onDataSaved = (dataSaved) => {
|
||||||
:required="true"
|
:required="true"
|
||||||
:rules="validate('thermograph.model')"
|
:rules="validate('thermograph.model')"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-xl">
|
<VnRow class="row q-gutter-md q-mb-xl">
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Warehouse')"
|
:label="t('Warehouse')"
|
||||||
:options="warehousesOptions"
|
:options="warehousesOptions"
|
||||||
|
@ -87,8 +81,6 @@ const onDataSaved = (dataSaved) => {
|
||||||
v-model="data.warehouseId"
|
v-model="data.warehouseId"
|
||||||
:required="true"
|
:required="true"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Temperature')"
|
:label="t('Temperature')"
|
||||||
:options="temperaturesOptions"
|
:options="temperaturesOptions"
|
||||||
|
@ -98,7 +90,6 @@ const onDataSaved = (dataSaved) => {
|
||||||
v-model="data.temperatureFk"
|
v-model="data.temperatureFk"
|
||||||
:required="true"
|
:required="true"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
</template>
|
</template>
|
||||||
</FormModelPopup>
|
</FormModelPopup>
|
||||||
|
|
|
@ -250,16 +250,13 @@ const makeRequest = async () => {
|
||||||
|
|
||||||
<div class="column">
|
<div class="column">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QOptionGroup
|
<QOptionGroup
|
||||||
:options="uploadMethodsOptions"
|
:options="uploadMethodsOptions"
|
||||||
type="radio"
|
type="radio"
|
||||||
v-model="uploadMethodSelected"
|
v-model="uploadMethodSelected"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QFile
|
<QFile
|
||||||
v-if="uploadMethodSelected === 'computer'"
|
v-if="uploadMethodSelected === 'computer'"
|
||||||
ref="inputFileRef"
|
ref="inputFileRef"
|
||||||
|
@ -293,10 +290,8 @@ const makeRequest = async () => {
|
||||||
@update:model-value="updatePhotoPreview($event)"
|
@update:model-value="updatePhotoPreview($event)"
|
||||||
placeholder="https://"
|
placeholder="https://"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Orientation')"
|
:label="t('Orientation')"
|
||||||
:options="viewportTypes"
|
:options="viewportTypes"
|
||||||
|
@ -304,7 +299,6 @@ const makeRequest = async () => {
|
||||||
option-label="description"
|
option-label="description"
|
||||||
v-model="viewportSelection"
|
v-model="viewportSelection"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<div class="q-mt-lg row justify-end">
|
<div class="q-mt-lg row justify-end">
|
||||||
<QBtn
|
<QBtn
|
||||||
|
|
|
@ -152,19 +152,8 @@ const selectItem = ({ id }) => {
|
||||||
</span>
|
</span>
|
||||||
<h1 class="title">{{ t('Filter item') }}</h1>
|
<h1 class="title">{{ t('Filter item') }}</h1>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
<VnInput :label="t('entry.buys.name')" v-model="itemFilterParams.name" />
|
||||||
<VnInput
|
<VnInput :label="t('entry.buys.size')" v-model="itemFilterParams.size" />
|
||||||
:label="t('entry.buys.name')"
|
|
||||||
v-model="itemFilterParams.name"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
|
||||||
:label="t('entry.buys.size')"
|
|
||||||
v-model="itemFilterParams.size"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('entry.buys.producer')"
|
:label="t('entry.buys.producer')"
|
||||||
:options="producersOptions"
|
:options="producersOptions"
|
||||||
|
@ -173,8 +162,6 @@ const selectItem = ({ id }) => {
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="itemFilterParams.producerFk"
|
v-model="itemFilterParams.producerFk"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('entry.buys.type')"
|
:label="t('entry.buys.type')"
|
||||||
:options="ItemTypesOptions"
|
:options="ItemTypesOptions"
|
||||||
|
@ -183,8 +170,6 @@ const selectItem = ({ id }) => {
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="itemFilterParams.typeFk"
|
v-model="itemFilterParams.typeFk"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('entry.buys.color')"
|
:label="t('entry.buys.color')"
|
||||||
:options="InksOptions"
|
:options="InksOptions"
|
||||||
|
@ -193,7 +178,6 @@ const selectItem = ({ id }) => {
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="itemFilterParams.inkFk"
|
v-model="itemFilterParams.inkFk"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<div class="q-mt-lg row justify-end">
|
<div class="q-mt-lg row justify-end">
|
||||||
<QBtn
|
<QBtn
|
||||||
|
|
|
@ -145,7 +145,6 @@ const selectTravel = ({ id }) => {
|
||||||
</span>
|
</span>
|
||||||
<h1 class="title">{{ t('Filter travels') }}</h1>
|
<h1 class="title">{{ t('Filter travels') }}</h1>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('entry.basicData.agency')"
|
:label="t('entry.basicData.agency')"
|
||||||
:options="agenciesOptions"
|
:options="agenciesOptions"
|
||||||
|
@ -154,8 +153,6 @@ const selectTravel = ({ id }) => {
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="travelFilterParams.agencyModeFk"
|
v-model="travelFilterParams.agencyModeFk"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('entry.basicData.warehouseOut')"
|
:label="t('entry.basicData.warehouseOut')"
|
||||||
:options="warehousesOptions"
|
:options="warehousesOptions"
|
||||||
|
@ -164,8 +161,6 @@ const selectTravel = ({ id }) => {
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="travelFilterParams.warehouseOutFk"
|
v-model="travelFilterParams.warehouseOutFk"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('entry.basicData.warehouseIn')"
|
:label="t('entry.basicData.warehouseIn')"
|
||||||
:options="warehousesOptions"
|
:options="warehousesOptions"
|
||||||
|
@ -174,19 +169,14 @@ const selectTravel = ({ id }) => {
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="travelFilterParams.warehouseInFk"
|
v-model="travelFilterParams.warehouseInFk"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnInputDate
|
<VnInputDate
|
||||||
:label="t('entry.basicData.shipped')"
|
:label="t('entry.basicData.shipped')"
|
||||||
v-model="travelFilterParams.shipped"
|
v-model="travelFilterParams.shipped"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnInputDate
|
<VnInputDate
|
||||||
:label="t('entry.basicData.landed')"
|
:label="t('entry.basicData.landed')"
|
||||||
v-model="travelFilterParams.landed"
|
v-model="travelFilterParams.landed"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<div class="q-mt-lg row justify-end">
|
<div class="q-mt-lg row justify-end">
|
||||||
<QBtn
|
<QBtn
|
||||||
|
|
|
@ -156,9 +156,12 @@ const startFormWatcher = () => {
|
||||||
|
|
||||||
async function fetch() {
|
async function fetch() {
|
||||||
try {
|
try {
|
||||||
const { data } = await axios.get($props.url, {
|
let { data } = await axios.get($props.url, {
|
||||||
params: { filter: JSON.stringify($props.filter) },
|
params: { filter: JSON.stringify($props.filter) },
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (Array.isArray(data)) data = data[0] ?? {};
|
||||||
|
|
||||||
state.set($props.model, data);
|
state.set($props.model, data);
|
||||||
originalData.value = data && JSON.parse(JSON.stringify(data));
|
originalData.value = data && JSON.parse(JSON.stringify(data));
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ import FormModel from 'components/FormModel.vue';
|
||||||
|
|
||||||
const emit = defineEmits(['onDataSaved']);
|
const emit = defineEmits(['onDataSaved']);
|
||||||
|
|
||||||
const $props = defineProps({
|
defineProps({
|
||||||
title: {
|
title: {
|
||||||
type: String,
|
type: String,
|
||||||
default: '',
|
default: '',
|
||||||
|
|
|
@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
const emit = defineEmits(['onSubmit']);
|
const emit = defineEmits(['onSubmit']);
|
||||||
|
|
||||||
const $props = defineProps({
|
defineProps({
|
||||||
title: {
|
title: {
|
||||||
type: String,
|
type: String,
|
||||||
default: '',
|
default: '',
|
||||||
|
|
|
@ -50,13 +50,11 @@ const onDataSaved = (data) => {
|
||||||
>
|
>
|
||||||
<template #form-inputs="{ data }">
|
<template #form-inputs="{ data }">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QInput
|
<QInput
|
||||||
:label="t('Type the visible quantity')"
|
:label="t('Type the visible quantity')"
|
||||||
v-model.number="data.quantity"
|
v-model.number="data.quantity"
|
||||||
autofocus
|
autofocus
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
|
|
|
@ -83,7 +83,6 @@ const transferInvoice = async () => {
|
||||||
>
|
>
|
||||||
<template #form-inputs>
|
<template #form-inputs>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Client')"
|
:label="t('Client')"
|
||||||
:options="clientsOptions"
|
:options="clientsOptions"
|
||||||
|
@ -104,8 +103,6 @@ const transferInvoice = async () => {
|
||||||
</QItem>
|
</QItem>
|
||||||
</template>
|
</template>
|
||||||
</VnSelect>
|
</VnSelect>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Rectificative type')"
|
:label="t('Rectificative type')"
|
||||||
:options="rectificativeTypeOptions"
|
:options="rectificativeTypeOptions"
|
||||||
|
@ -115,10 +112,8 @@ const transferInvoice = async () => {
|
||||||
v-model="transferInvoiceParams.cplusRectificationTypeFk"
|
v-model="transferInvoiceParams.cplusRectificationTypeFk"
|
||||||
:required="true"
|
:required="true"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Class')"
|
:label="t('Class')"
|
||||||
:options="siiTypeInvoiceOutsOptions"
|
:options="siiTypeInvoiceOutsOptions"
|
||||||
|
@ -139,8 +134,6 @@ const transferInvoice = async () => {
|
||||||
</QItem>
|
</QItem>
|
||||||
</template>
|
</template>
|
||||||
</VnSelect>
|
</VnSelect>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Type')"
|
:label="t('Type')"
|
||||||
:options="invoiceCorrectionTypesOptions"
|
:options="invoiceCorrectionTypesOptions"
|
||||||
|
@ -150,7 +143,6 @@ const transferInvoice = async () => {
|
||||||
v-model="transferInvoiceParams.invoiceCorrectionTypeFk"
|
v-model="transferInvoiceParams.invoiceCorrectionTypeFk"
|
||||||
:required="true"
|
:required="true"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
</template>
|
</template>
|
||||||
</FormPopup>
|
</FormPopup>
|
||||||
|
|
|
@ -178,6 +178,8 @@ function copyUserToken() {
|
||||||
:options="warehousesData"
|
:options="warehousesData"
|
||||||
option-label="name"
|
option-label="name"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
|
input-debounce="0"
|
||||||
|
hide-selected
|
||||||
/>
|
/>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('components.userPanel.localBank')"
|
:label="t('components.userPanel.localBank')"
|
||||||
|
@ -185,6 +187,8 @@ function copyUserToken() {
|
||||||
:options="accountBankData"
|
:options="accountBankData"
|
||||||
option-label="bank"
|
option-label="bank"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
|
input-debounce="0"
|
||||||
|
hide-selected
|
||||||
>
|
>
|
||||||
<template #option="{ itemProps, opt }">
|
<template #option="{ itemProps, opt }">
|
||||||
<QItem v-bind="itemProps">
|
<QItem v-bind="itemProps">
|
||||||
|
@ -201,10 +205,11 @@ function copyUserToken() {
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('components.userPanel.localCompany')"
|
:label="t('components.userPanel.localCompany')"
|
||||||
hide-selected
|
hide-selected
|
||||||
v-model="user.companyFk"
|
v-model="user.localCompanyFk"
|
||||||
:options="companiesData"
|
:options="companiesData"
|
||||||
option-label="code"
|
option-label="code"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
|
input-debounce="0"
|
||||||
/>
|
/>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('components.userPanel.userWarehouse')"
|
:label="t('components.userPanel.userWarehouse')"
|
||||||
|
@ -213,6 +218,7 @@ function copyUserToken() {
|
||||||
:options="warehousesData"
|
:options="warehousesData"
|
||||||
option-label="name"
|
option-label="name"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
|
input-debounce="0"
|
||||||
/>
|
/>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow>
|
<VnRow>
|
||||||
|
@ -224,6 +230,8 @@ function copyUserToken() {
|
||||||
option-label="code"
|
option-label="code"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
style="flex: 0"
|
style="flex: 0"
|
||||||
|
dense
|
||||||
|
input-debounce="0"
|
||||||
/>
|
/>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -0,0 +1,55 @@
|
||||||
|
<script setup>
|
||||||
|
import { ref, onMounted, useSlots } from 'vue';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
import { useStateStore } from 'stores/useStateStore';
|
||||||
|
|
||||||
|
const slots = useSlots();
|
||||||
|
const hasContent = ref(false);
|
||||||
|
const rightPanel = ref(null);
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
rightPanel.value = document.querySelector('#right-panel');
|
||||||
|
if (rightPanel.value.childNodes.length) hasContent.value = true;
|
||||||
|
|
||||||
|
// Check if there's content to display
|
||||||
|
const observer = new MutationObserver(() => {
|
||||||
|
hasContent.value = rightPanel.value.childNodes.length;
|
||||||
|
});
|
||||||
|
|
||||||
|
if (rightPanel.value)
|
||||||
|
observer.observe(rightPanel.value, {
|
||||||
|
subtree: true,
|
||||||
|
childList: true,
|
||||||
|
attributes: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!slots['right-panel'] && !hasContent.value) stateStore.rightDrawer = false;
|
||||||
|
});
|
||||||
|
|
||||||
|
const { t } = useI18n();
|
||||||
|
const stateStore = useStateStore();
|
||||||
|
</script>
|
||||||
|
<template>
|
||||||
|
<Teleport to="#actions-append">
|
||||||
|
<div class="row q-gutter-x-sm">
|
||||||
|
<QBtn
|
||||||
|
v-if="hasContent || $slots['right-panel']"
|
||||||
|
flat
|
||||||
|
@click="stateStore.toggleRightDrawer()"
|
||||||
|
round
|
||||||
|
dense
|
||||||
|
icon="menu"
|
||||||
|
>
|
||||||
|
<QTooltip bottom anchor="bottom right">
|
||||||
|
{{ t('globals.collapseMenu') }}
|
||||||
|
</QTooltip>
|
||||||
|
</QBtn>
|
||||||
|
</div>
|
||||||
|
</Teleport>
|
||||||
|
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
|
||||||
|
<QScrollArea class="fit text-grey-8">
|
||||||
|
<div id="right-panel"></div>
|
||||||
|
<slot v-if="!hasContent" name="right-panel" />
|
||||||
|
</QScrollArea>
|
||||||
|
</QDrawer>
|
||||||
|
</template>
|
|
@ -29,10 +29,12 @@ async function confirm() {
|
||||||
const response = { address: address.value };
|
const response = { address: address.value };
|
||||||
if (props.promise) {
|
if (props.promise) {
|
||||||
isLoading.value = true;
|
isLoading.value = true;
|
||||||
const { address: _address, ...restData } = props.data;
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Object.assign(response, restData);
|
const dataCopy = JSON.parse(JSON.stringify({ ...props.data }));
|
||||||
|
delete dataCopy.address;
|
||||||
|
|
||||||
|
Object.assign(response, dataCopy);
|
||||||
await props.promise(response);
|
await props.promise(response);
|
||||||
} finally {
|
} finally {
|
||||||
isLoading.value = false;
|
isLoading.value = false;
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { onBeforeMount, computed } from 'vue';
|
import { onBeforeMount, computed, watchEffect } from 'vue';
|
||||||
import { useRoute, onBeforeRouteUpdate } from 'vue-router';
|
import { useRoute, onBeforeRouteUpdate } from 'vue-router';
|
||||||
import { useI18n } from 'vue-i18n';
|
|
||||||
import { useArrayData } from 'src/composables/useArrayData';
|
import { useArrayData } from 'src/composables/useArrayData';
|
||||||
import { useStateStore } from 'stores/useStateStore';
|
import { useStateStore } from 'stores/useStateStore';
|
||||||
import useCardSize from 'src/composables/useCardSize';
|
import useCardSize from 'src/composables/useCardSize';
|
||||||
import VnSubToolbar from '../ui/VnSubToolbar.vue';
|
import VnSubToolbar from '../ui/VnSubToolbar.vue';
|
||||||
import VnSearchbar from 'components/ui/VnSearchbar.vue';
|
import VnSearchbar from 'components/ui/VnSearchbar.vue';
|
||||||
import LeftMenu from 'components/LeftMenu.vue';
|
import LeftMenu from 'components/LeftMenu.vue';
|
||||||
|
import RightMenu from 'components/common/RightMenu.vue';
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
dataKey: { type: String, required: true },
|
dataKey: { type: String, required: true },
|
||||||
|
@ -15,13 +15,13 @@ const props = defineProps({
|
||||||
customUrl: { type: String, default: undefined },
|
customUrl: { type: String, default: undefined },
|
||||||
filter: { type: Object, default: () => {} },
|
filter: { type: Object, default: () => {} },
|
||||||
descriptor: { type: Object, required: true },
|
descriptor: { type: Object, required: true },
|
||||||
searchbarDataKey: { type: String, default: undefined },
|
filterPanel: { type: Object, default: undefined },
|
||||||
searchbarUrl: { type: String, default: undefined },
|
searchDataKey: { type: String, default: undefined },
|
||||||
|
searchUrl: { type: String, default: undefined },
|
||||||
searchbarLabel: { type: String, default: '' },
|
searchbarLabel: { type: String, default: '' },
|
||||||
searchbarInfo: { type: String, default: '' },
|
searchbarInfo: { type: String, default: '' },
|
||||||
});
|
});
|
||||||
|
|
||||||
const { t } = useI18n();
|
|
||||||
const stateStore = useStateStore();
|
const stateStore = useStateStore();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const url = computed(() => {
|
const url = computed(() => {
|
||||||
|
@ -47,19 +47,25 @@ if (props.baseUrl) {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
watchEffect(() => {
|
||||||
|
if (Array.isArray(arrayData.store.data))
|
||||||
|
arrayData.store.data = arrayData.store.data[0];
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<Teleport
|
<template v-if="stateStore.isHeaderMounted()">
|
||||||
to="#searchbar"
|
<Teleport to="#searchbar" v-if="props.searchDataKey">
|
||||||
v-if="stateStore.isHeaderMounted() && props.searchbarDataKey"
|
<slot name="searchbar">
|
||||||
>
|
|
||||||
<VnSearchbar
|
<VnSearchbar
|
||||||
:data-key="props.searchbarDataKey"
|
:data-key="props.searchDataKey"
|
||||||
:url="props.searchbarUrl"
|
:url="props.searchUrl"
|
||||||
:label="t(props.searchbarLabel)"
|
:label="props.searchbarLabel"
|
||||||
:info="t(props.searchbarInfo)"
|
:info="props.searchbarInfo"
|
||||||
/>
|
/>
|
||||||
|
</slot>
|
||||||
</Teleport>
|
</Teleport>
|
||||||
|
<slot v-else name="searchbar" />
|
||||||
<QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
|
<QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
|
||||||
<QScrollArea class="fit">
|
<QScrollArea class="fit">
|
||||||
<component :is="descriptor" />
|
<component :is="descriptor" />
|
||||||
|
@ -67,6 +73,12 @@ if (props.baseUrl) {
|
||||||
<LeftMenu source="card" />
|
<LeftMenu source="card" />
|
||||||
</QScrollArea>
|
</QScrollArea>
|
||||||
</QDrawer>
|
</QDrawer>
|
||||||
|
<RightMenu>
|
||||||
|
<template #right-panel v-if="props.filterPanel">
|
||||||
|
<component :is="props.filterPanel" :data-key="props.searchDataKey" />
|
||||||
|
</template>
|
||||||
|
</RightMenu>
|
||||||
|
</template>
|
||||||
<QPageContainer>
|
<QPageContainer>
|
||||||
<QPage>
|
<QPage>
|
||||||
<VnSubToolbar />
|
<VnSubToolbar />
|
||||||
|
|
|
@ -35,7 +35,7 @@ const $props = defineProps({
|
||||||
downloadModel: {
|
downloadModel: {
|
||||||
type: String,
|
type: String,
|
||||||
required: false,
|
required: false,
|
||||||
default: null,
|
default: undefined,
|
||||||
},
|
},
|
||||||
defaultDmsCode: {
|
defaultDmsCode: {
|
||||||
type: String,
|
type: String,
|
||||||
|
|
|
@ -37,14 +37,6 @@ const styleAttrs = computed(() => {
|
||||||
: {};
|
: {};
|
||||||
});
|
});
|
||||||
|
|
||||||
const onEnterPress = () => {
|
|
||||||
emit('keyup.enter');
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleValue = (val = null) => {
|
|
||||||
value.value = val;
|
|
||||||
};
|
|
||||||
|
|
||||||
const focus = () => {
|
const focus = () => {
|
||||||
vnInputRef.value.focus();
|
vnInputRef.value.focus();
|
||||||
};
|
};
|
||||||
|
@ -73,7 +65,7 @@ const inputRules = [
|
||||||
v-bind="{ ...$attrs, ...styleAttrs }"
|
v-bind="{ ...$attrs, ...styleAttrs }"
|
||||||
:type="$attrs.type"
|
:type="$attrs.type"
|
||||||
:class="{ required: $attrs.required }"
|
:class="{ required: $attrs.required }"
|
||||||
@keyup.enter="onEnterPress()"
|
@keyup.enter="emit('keyup.enter')"
|
||||||
:clearable="false"
|
:clearable="false"
|
||||||
:rules="inputRules"
|
:rules="inputRules"
|
||||||
:lazy-rules="true"
|
:lazy-rules="true"
|
||||||
|
@ -84,12 +76,12 @@ const inputRules = [
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template #append>
|
<template #append>
|
||||||
<slot name="append" v-if="$slots.append" />
|
<slot name="append" v-if="$slots.append && !$attrs.disabled" />
|
||||||
<QIcon
|
<QIcon
|
||||||
name="close"
|
name="close"
|
||||||
size="xs"
|
size="xs"
|
||||||
v-if="hover && value"
|
v-if="$slots.append && hover && value && !$attrs.disabled"
|
||||||
@click="handleValue(null)"
|
@click="value = null"
|
||||||
></QIcon>
|
></QIcon>
|
||||||
</template>
|
</template>
|
||||||
</QInput>
|
</QInput>
|
||||||
|
|
|
@ -22,6 +22,10 @@ const $props = defineProps({
|
||||||
type: String,
|
type: String,
|
||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
|
optionFilter: {
|
||||||
|
type: String,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
url: {
|
url: {
|
||||||
type: String,
|
type: String,
|
||||||
default: '',
|
default: '',
|
||||||
|
@ -59,7 +63,7 @@ const $props = defineProps({
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const requiredFieldRule = (val) => val ?? t('globals.fieldRequired');
|
const requiredFieldRule = (val) => val ?? t('globals.fieldRequired');
|
||||||
|
|
||||||
const { optionLabel, optionValue, options, modelValue } = toRefs($props);
|
const { optionLabel, optionValue, optionFilter, options, modelValue } = toRefs($props);
|
||||||
const myOptions = ref([]);
|
const myOptions = ref([]);
|
||||||
const myOptionsOriginal = ref([]);
|
const myOptionsOriginal = ref([]);
|
||||||
const vnSelectRef = ref();
|
const vnSelectRef = ref();
|
||||||
|
@ -109,9 +113,9 @@ async function fetchFilter(val) {
|
||||||
const { fields, sortBy, limit } = $props;
|
const { fields, sortBy, limit } = $props;
|
||||||
let key = optionLabel.value;
|
let key = optionLabel.value;
|
||||||
|
|
||||||
if (new RegExp(/\d/g).test(val)) key = optionValue.value;
|
if (new RegExp(/\d/g).test(val)) key = optionFilter.value ?? optionValue.value;
|
||||||
|
|
||||||
const where = { [key]: { like: `%${val}%` } };
|
const where = { ...{ [key]: { like: `%${val}%` } }, ...$props.where };
|
||||||
return dataRef.value.fetch({ fields, where, order: sortBy, limit });
|
return dataRef.value.fetch({ fields, where, order: sortBy, limit });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -54,6 +54,13 @@ async function fetch() {
|
||||||
emit('onFetch', Array.isArray(data) ? data[0] : data);
|
emit('onFetch', Array.isArray(data) ? data[0] : data);
|
||||||
isLoading.value = false;
|
isLoading.value = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const showRedirectToSummaryIcon = computed(() => {
|
||||||
|
const routeExists = route.matched.some(
|
||||||
|
(route) => route.name === `${route.meta.moduleName}Summary`
|
||||||
|
);
|
||||||
|
return !isSummary.value && route.meta.moduleName && routeExists;
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
@ -64,7 +71,7 @@ async function fetch() {
|
||||||
<div class="summaryHeader bg-primary q-pa-sm text-weight-bolder">
|
<div class="summaryHeader bg-primary q-pa-sm text-weight-bolder">
|
||||||
<slot name="header-left">
|
<slot name="header-left">
|
||||||
<router-link
|
<router-link
|
||||||
v-if="!isSummary && route.meta.moduleName"
|
v-if="showRedirectToSummaryIcon"
|
||||||
class="header link"
|
class="header link"
|
||||||
:to="{
|
:to="{
|
||||||
name: `${route.meta.moduleName}Summary`,
|
name: `${route.meta.moduleName}Summary`,
|
||||||
|
@ -135,6 +142,9 @@ async function fetch() {
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
|
|
||||||
.vn-label-value {
|
.vn-label-value {
|
||||||
|
&.negative > .value span {
|
||||||
|
color: $alert;
|
||||||
|
}
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
margin-top: 2px;
|
margin-top: 2px;
|
||||||
|
|
|
@ -108,7 +108,7 @@ const containerClasses = computed(() => {
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background-color: var(--vn-accent-color);
|
background-color: var(--vn-label-color);
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,29 +1,17 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="q-pa-md">
|
<div class="q-pa-md">
|
||||||
<div class="row q-gutter-md q-mb-md">
|
<div class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QSkeleton type="QInput" square />
|
<QSkeleton type="QInput" square />
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QSkeleton type="QInput" square />
|
<QSkeleton type="QInput" square />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<div class="row q-gutter-md q-mb-md">
|
<div class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QSkeleton type="QInput" square />
|
<QSkeleton type="QInput" square />
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QSkeleton type="QInput" square />
|
<QSkeleton type="QInput" square />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<div class="row q-gutter-md q-mb-md">
|
<div class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QSkeleton type="QInput" square />
|
<QSkeleton type="QInput" square />
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QSkeleton type="QInput" square />
|
<QSkeleton type="QInput" square />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<div class="row q-gutter-md">
|
<div class="row q-gutter-md">
|
||||||
<QSkeleton type="QBtn" />
|
<QSkeleton type="QBtn" />
|
||||||
<QSkeleton type="QBtn" />
|
<QSkeleton type="QBtn" />
|
||||||
|
|
|
@ -3,39 +3,30 @@
|
||||||
<QSkeleton type="rect" square />
|
<QSkeleton type="rect" square />
|
||||||
</div>
|
</div>
|
||||||
<div class="row q-pa-md q-col-gutter-md q-mb-md">
|
<div class="row q-pa-md q-col-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QSkeleton type="rect" class="q-mb-md" square />
|
<QSkeleton type="rect" class="q-mb-md" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QSkeleton type="rect" class="q-mb-md" square />
|
<QSkeleton type="rect" class="q-mb-md" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QSkeleton type="rect" class="q-mb-md" square />
|
<QSkeleton type="rect" class="q-mb-md" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QSkeleton type="rect" class="q-mb-md" square />
|
<QSkeleton type="rect" class="q-mb-md" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QSkeleton type="rect" class="q-mb-md" square />
|
<QSkeleton type="rect" class="q-mb-md" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
|
@ -43,7 +34,6 @@
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
<QSkeleton type="text" square />
|
<QSkeleton type="text" square />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|
|
@ -1,47 +1,22 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="q-pa-md w">
|
<div class="q-pa-md w">
|
||||||
<div class="row q-gutter-md q-mb-md">
|
<div class="row q-gutter-md q-mb-md">
|
||||||
<div class="col-1">
|
<QSkeleton type="rect" square />
|
||||||
|
<QSkeleton type="rect" square />
|
||||||
|
<QSkeleton type="rect" square />
|
||||||
|
<QSkeleton type="rect" square />
|
||||||
|
<QSkeleton type="rect" square />
|
||||||
<QSkeleton type="rect" square />
|
<QSkeleton type="rect" square />
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
|
||||||
<QSkeleton type="rect" square />
|
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QSkeleton type="rect" square />
|
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QSkeleton type="rect" square />
|
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QSkeleton type="rect" square />
|
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QSkeleton type="rect" square />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="row q-gutter-md q-mb-md" v-for="n in 5" :key="n">
|
<div class="row q-gutter-md q-mb-md" v-for="n in 5" :key="n">
|
||||||
<div class="col-1">
|
|
||||||
<QSkeleton type="QInput" square />
|
<QSkeleton type="QInput" square />
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QSkeleton type="QInput" square />
|
<QSkeleton type="QInput" square />
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QSkeleton type="QInput" square />
|
<QSkeleton type="QInput" square />
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QSkeleton type="QInput" square />
|
<QSkeleton type="QInput" square />
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QSkeleton type="QInput" square />
|
<QSkeleton type="QInput" square />
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QSkeleton type="QInput" square />
|
<QSkeleton type="QInput" square />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.w {
|
.w {
|
||||||
|
|
|
@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
|
||||||
import { useArrayData } from 'composables/useArrayData';
|
import { useArrayData } from 'composables/useArrayData';
|
||||||
import { useRoute } from 'vue-router';
|
import { useRoute } from 'vue-router';
|
||||||
import toDate from 'filters/toDate';
|
import toDate from 'filters/toDate';
|
||||||
|
import useRedirect from 'src/composables/useRedirect';
|
||||||
import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
|
import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
@ -56,6 +56,7 @@ const arrayData = useArrayData(props.dataKey, {
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const store = arrayData.store;
|
const store = arrayData.store;
|
||||||
const userParams = ref({});
|
const userParams = ref({});
|
||||||
|
const { navigate } = useRedirect();
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
if (props.params) userParams.value = JSON.parse(JSON.stringify(props.params));
|
if (props.params) userParams.value = JSON.parse(JSON.stringify(props.params));
|
||||||
|
@ -92,6 +93,7 @@ async function search() {
|
||||||
|
|
||||||
isLoading.value = false;
|
isLoading.value = false;
|
||||||
emit('search');
|
emit('search');
|
||||||
|
navigate(store.data, {});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function reload() {
|
async function reload() {
|
||||||
|
@ -102,6 +104,7 @@ async function reload() {
|
||||||
if (!props.showAll && !params.length) store.data = [];
|
if (!props.showAll && !params.length) store.data = [];
|
||||||
isLoading.value = false;
|
isLoading.value = false;
|
||||||
emit('refresh');
|
emit('refresh');
|
||||||
|
navigate(store.data, {});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function clearFilters() {
|
async function clearFilters() {
|
||||||
|
@ -147,7 +150,7 @@ const customTags = computed(() =>
|
||||||
|
|
||||||
async function remove(key) {
|
async function remove(key) {
|
||||||
userParams.value[key] = null;
|
userParams.value[key] = null;
|
||||||
await search();
|
await arrayData.applyFilter({ params: userParams.value });
|
||||||
emit('remove', key);
|
emit('remove', key);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,21 +1,16 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { useI18n } from 'vue-i18n';
|
defineProps({ phoneNumber: { type: [String, Number], default: null } });
|
||||||
const props = defineProps({
|
|
||||||
phoneNumber: { type: [String, Number], default: null },
|
|
||||||
});
|
|
||||||
const { t } = useI18n();
|
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<QBtn
|
<QBtn
|
||||||
v-if="props.phoneNumber"
|
v-if="phoneNumber"
|
||||||
flat
|
flat
|
||||||
round
|
round
|
||||||
icon="phone"
|
icon="phone"
|
||||||
size="sm"
|
size="sm"
|
||||||
color="primary"
|
color="primary"
|
||||||
padding="none"
|
padding="none"
|
||||||
:href="`sip:${props.phoneNumber}`"
|
:href="`sip:${phoneNumber}`"
|
||||||
@click.stop
|
@click.stop
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
<style scoped></style>
|
|
||||||
|
|
|
@ -42,6 +42,10 @@ const props = defineProps({
|
||||||
type: Object,
|
type: Object,
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
|
keepOpts: {
|
||||||
|
type: Array,
|
||||||
|
default: () => [],
|
||||||
|
},
|
||||||
offset: {
|
offset: {
|
||||||
type: Number,
|
type: Number,
|
||||||
default: 0,
|
default: 0,
|
||||||
|
@ -76,6 +80,7 @@ const arrayData = useArrayData(props.dataKey, {
|
||||||
order: props.order,
|
order: props.order,
|
||||||
userParams: props.userParams,
|
userParams: props.userParams,
|
||||||
exprBuilder: props.exprBuilder,
|
exprBuilder: props.exprBuilder,
|
||||||
|
keepOpts: props.keepOpts,
|
||||||
});
|
});
|
||||||
const store = arrayData.store;
|
const store = arrayData.store;
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,13 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { onMounted, ref } from 'vue';
|
import { onMounted, ref } from 'vue';
|
||||||
import { useRouter } from 'vue-router';
|
|
||||||
import { useQuasar } from 'quasar';
|
import { useQuasar } from 'quasar';
|
||||||
import { useArrayData } from 'composables/useArrayData';
|
import { useArrayData } from 'composables/useArrayData';
|
||||||
import VnInput from 'src/components/common/VnInput.vue';
|
import VnInput from 'src/components/common/VnInput.vue';
|
||||||
|
import useRedirect from 'src/composables/useRedirect';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
const quasar = useQuasar();
|
const quasar = useQuasar();
|
||||||
|
const { t } = useI18n();
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
dataKey: {
|
dataKey: {
|
||||||
|
@ -65,10 +67,10 @@ const props = defineProps({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const router = useRouter();
|
|
||||||
const arrayData = useArrayData(props.dataKey, { ...props });
|
const arrayData = useArrayData(props.dataKey, { ...props });
|
||||||
const { store } = arrayData;
|
const { store } = arrayData;
|
||||||
const searchText = ref('');
|
const searchText = ref('');
|
||||||
|
const { navigate } = useRedirect();
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
const params = store.userParams;
|
const params = store.userParams;
|
||||||
|
@ -81,37 +83,20 @@ async function search() {
|
||||||
const staticParams = Object.entries(store.userParams).filter(
|
const staticParams = Object.entries(store.userParams).filter(
|
||||||
([key, value]) => value && (props.staticParams || []).includes(key)
|
([key, value]) => value && (props.staticParams || []).includes(key)
|
||||||
);
|
);
|
||||||
// const filter =props?.where? { where: JSON.parse(props.where) }: {}
|
store.skip = 0;
|
||||||
await arrayData.applyFilter({
|
await arrayData.applyFilter({
|
||||||
params: {
|
params: {
|
||||||
// filter ,
|
|
||||||
...Object.fromEntries(staticParams),
|
...Object.fromEntries(staticParams),
|
||||||
search: searchText.value,
|
search: searchText.value,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!props.redirect) return;
|
if (!props.redirect) return;
|
||||||
|
|
||||||
if (props.customRouteRedirectName)
|
navigate(store.data, {
|
||||||
return router.push({
|
customRouteRedirectName: props.customRouteRedirectName,
|
||||||
name: props.customRouteRedirectName,
|
searchText: searchText.value,
|
||||||
params: { id: searchText.value },
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const { matched: matches } = router.currentRoute.value;
|
|
||||||
const { path } = matches.at(-1);
|
|
||||||
const [, moduleName] = path.split('/');
|
|
||||||
|
|
||||||
if (!store.data.length || store.data.length > 1)
|
|
||||||
return router.push({ path: `/${moduleName}/list` });
|
|
||||||
|
|
||||||
const targetId = store.data[0].id;
|
|
||||||
let targetUrl;
|
|
||||||
|
|
||||||
if (path.endsWith('/list')) targetUrl = path.replace('/list', `/${targetId}/summary`);
|
|
||||||
if (path.endsWith('-list')) targetUrl = path.replace('-list', `/${targetId}/summary`);
|
|
||||||
else if (path.includes(':id')) targetUrl = path.replace(':id', targetId);
|
|
||||||
|
|
||||||
await router.push({ path: targetUrl });
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
@ -120,7 +105,7 @@ async function search() {
|
||||||
<VnInput
|
<VnInput
|
||||||
id="searchbar"
|
id="searchbar"
|
||||||
v-model="searchText"
|
v-model="searchText"
|
||||||
:placeholder="props.label"
|
:placeholder="t(props.label)"
|
||||||
dense
|
dense
|
||||||
standout
|
standout
|
||||||
autofocus
|
autofocus
|
||||||
|
@ -139,7 +124,7 @@ async function search() {
|
||||||
name="info"
|
name="info"
|
||||||
class="cursor-info"
|
class="cursor-info"
|
||||||
>
|
>
|
||||||
<QTooltip>{{ props.info }}</QTooltip>
|
<QTooltip>{{ t(props.info) }}</QTooltip>
|
||||||
</QIcon>
|
</QIcon>
|
||||||
</template>
|
</template>
|
||||||
</VnInput>
|
</VnInput>
|
||||||
|
|
|
@ -90,7 +90,7 @@ const onNodeCreated = async () => {
|
||||||
await fetchNodeLeaves(creationNodeSelectedId.value);
|
await fetchNodeLeaves(creationNodeSelectedId.value);
|
||||||
};
|
};
|
||||||
|
|
||||||
onMounted(async (n) => {
|
onMounted(async () => {
|
||||||
const tree = [...state.get('Tree'), 1];
|
const tree = [...state.get('Tree'), 1];
|
||||||
const lastStateTree = state.get('TreeState');
|
const lastStateTree = state.get('TreeState');
|
||||||
if (tree) {
|
if (tree) {
|
||||||
|
|
|
@ -47,7 +47,10 @@ export function useArrayData(key, userOptions) {
|
||||||
if (isEmpty || !allowedOptions.includes(option)) continue;
|
if (isEmpty || !allowedOptions.includes(option)) continue;
|
||||||
|
|
||||||
if (Object.prototype.hasOwnProperty.call(store, option)) {
|
if (Object.prototype.hasOwnProperty.call(store, option)) {
|
||||||
store[option] = userOptions[option];
|
const defaultOpts = userOptions[option];
|
||||||
|
store[option] = userOptions.keepOpts?.includes(option)
|
||||||
|
? Object.assign(defaultOpts, store[option])
|
||||||
|
: defaultOpts;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -127,7 +130,8 @@ export function useArrayData(key, userOptions) {
|
||||||
store.filter = {};
|
store.filter = {};
|
||||||
if (params) store.userParams = Object.assign({}, params);
|
if (params) store.userParams = Object.assign({}, params);
|
||||||
|
|
||||||
await fetch({ append: false });
|
const response = await fetch({ append: false });
|
||||||
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function addFilter({ filter, params }) {
|
async function addFilter({ filter, params }) {
|
||||||
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
import { useRouter } from 'vue-router';
|
||||||
|
|
||||||
|
export default function useRedirect() {
|
||||||
|
const router = useRouter();
|
||||||
|
|
||||||
|
const navigate = (data, { customRouteRedirectName, searchText }) => {
|
||||||
|
if (customRouteRedirectName)
|
||||||
|
return router.push({
|
||||||
|
name: customRouteRedirectName,
|
||||||
|
params: { id: searchText },
|
||||||
|
});
|
||||||
|
|
||||||
|
const { matched: matches } = router.currentRoute.value;
|
||||||
|
const { path } = matches.at(-1);
|
||||||
|
|
||||||
|
const to =
|
||||||
|
data.length === 1
|
||||||
|
? path.replace(/\/(list|:id)|-list/, `/${data[0].id}`)
|
||||||
|
: path.replace(/:id.*/, '');
|
||||||
|
|
||||||
|
router.push({ path: to });
|
||||||
|
};
|
||||||
|
|
||||||
|
return { navigate };
|
||||||
|
}
|
|
@ -20,28 +20,12 @@ const headerMounted = ref(false);
|
||||||
export function useState() {
|
export function useState() {
|
||||||
function getUser() {
|
function getUser() {
|
||||||
return computed(() => {
|
return computed(() => {
|
||||||
return {
|
return user.value;
|
||||||
id: user.value.id,
|
|
||||||
name: user.value.name,
|
|
||||||
nickname: user.value.nickname,
|
|
||||||
lang: user.value.lang,
|
|
||||||
darkMode: user.value.darkMode,
|
|
||||||
companyFk: user.value.companyFk,
|
|
||||||
warehouseFk: user.value.warehouseFk,
|
|
||||||
};
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function setUser(data) {
|
function setUser(data) {
|
||||||
user.value = {
|
user.value = data;
|
||||||
id: data.id,
|
|
||||||
name: data.name,
|
|
||||||
nickname: data.nickname,
|
|
||||||
lang: data.lang,
|
|
||||||
darkMode: data.darkMode,
|
|
||||||
companyFk: data.companyFk,
|
|
||||||
warehouseFk: data.warehouseFk,
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function getRoles() {
|
function getRoles() {
|
||||||
|
|
|
@ -32,6 +32,7 @@ globals:
|
||||||
confirm: Confirm
|
confirm: Confirm
|
||||||
assign: Assign
|
assign: Assign
|
||||||
back: Back
|
back: Back
|
||||||
|
downloadPdf: Download PDF
|
||||||
yes: 'Yes'
|
yes: 'Yes'
|
||||||
no: 'No'
|
no: 'No'
|
||||||
noChanges: No changes to save
|
noChanges: No changes to save
|
||||||
|
@ -271,6 +272,7 @@ customer:
|
||||||
tableVisibleColumns:
|
tableVisibleColumns:
|
||||||
id: Identifier
|
id: Identifier
|
||||||
name: Name
|
name: Name
|
||||||
|
socialName: Social name
|
||||||
fi: Tax number
|
fi: Tax number
|
||||||
salesPersonFk: Salesperson
|
salesPersonFk: Salesperson
|
||||||
credit: Credit
|
credit: Credit
|
||||||
|
@ -430,6 +432,7 @@ ticket:
|
||||||
boxing: Boxing
|
boxing: Boxing
|
||||||
sms: Sms
|
sms: Sms
|
||||||
notes: Notes
|
notes: Notes
|
||||||
|
sale: Sale
|
||||||
list:
|
list:
|
||||||
nickname: Nickname
|
nickname: Nickname
|
||||||
state: State
|
state: State
|
||||||
|
@ -826,6 +829,8 @@ worker:
|
||||||
log: Log
|
log: Log
|
||||||
calendar: Calendar
|
calendar: Calendar
|
||||||
timeControl: Time control
|
timeControl: Time control
|
||||||
|
locker: Locker
|
||||||
|
|
||||||
list:
|
list:
|
||||||
name: Name
|
name: Name
|
||||||
email: Email
|
email: Email
|
||||||
|
@ -857,6 +862,15 @@ worker:
|
||||||
role: Role
|
role: Role
|
||||||
sipExtension: Extension
|
sipExtension: Extension
|
||||||
locker: Locker
|
locker: Locker
|
||||||
|
fiDueDate: Fecha de caducidad del DNI
|
||||||
|
sex: Sexo
|
||||||
|
seniority: Antigüedad
|
||||||
|
fi: DNI/NIE/NIF
|
||||||
|
birth: Cumpleaños
|
||||||
|
isFreelance: Autónomo
|
||||||
|
isSsDiscounted: Bonificación SS
|
||||||
|
hasMachineryAuthorized: Autorizado para llevar maquinaria
|
||||||
|
isDisable: Trabajador desactivado
|
||||||
notificationsManager:
|
notificationsManager:
|
||||||
activeNotifications: Active notifications
|
activeNotifications: Active notifications
|
||||||
availableNotifications: Available notifications
|
availableNotifications: Available notifications
|
||||||
|
@ -1234,12 +1248,10 @@ item/itemType:
|
||||||
itemType: Item type
|
itemType: Item type
|
||||||
basicData: Basic data
|
basicData: Basic data
|
||||||
summary: Summary
|
summary: Summary
|
||||||
zone:
|
monitor:
|
||||||
pageTitles:
|
pageTitles:
|
||||||
zones: Zone
|
monitors: Monitors
|
||||||
zonesList: Zones
|
list: List
|
||||||
deliveryList: Delivery days
|
|
||||||
upcomingList: Upcoming deliveries
|
|
||||||
components:
|
components:
|
||||||
topbar: {}
|
topbar: {}
|
||||||
itemsFilterPanel:
|
itemsFilterPanel:
|
||||||
|
|
|
@ -59,6 +59,7 @@ globals:
|
||||||
amount: Importe
|
amount: Importe
|
||||||
packages: Bultos
|
packages: Bultos
|
||||||
download: Descargar
|
download: Descargar
|
||||||
|
downloadPdf: Descargar PDF
|
||||||
selectRows: 'Seleccionar las { numberRows } filas(s)'
|
selectRows: 'Seleccionar las { numberRows } filas(s)'
|
||||||
allRows: 'Todo { numberRows } filas(s)'
|
allRows: 'Todo { numberRows } filas(s)'
|
||||||
markAll: Marcar todo
|
markAll: Marcar todo
|
||||||
|
@ -269,6 +270,7 @@ customer:
|
||||||
tableVisibleColumns:
|
tableVisibleColumns:
|
||||||
id: Identificador
|
id: Identificador
|
||||||
name: Nombre
|
name: Nombre
|
||||||
|
socialName: Razón social
|
||||||
fi: NIF / CIF
|
fi: NIF / CIF
|
||||||
salesPersonFk: Comercial
|
salesPersonFk: Comercial
|
||||||
credit: Crédito
|
credit: Crédito
|
||||||
|
@ -428,6 +430,7 @@ ticket:
|
||||||
boxing: Encajado
|
boxing: Encajado
|
||||||
sms: Sms
|
sms: Sms
|
||||||
notes: Notas
|
notes: Notas
|
||||||
|
sale: Lineas del pedido
|
||||||
list:
|
list:
|
||||||
nickname: Alias
|
nickname: Alias
|
||||||
state: Estado
|
state: Estado
|
||||||
|
@ -824,6 +827,7 @@ worker:
|
||||||
log: Historial
|
log: Historial
|
||||||
calendar: Calendario
|
calendar: Calendario
|
||||||
timeControl: Control de horario
|
timeControl: Control de horario
|
||||||
|
locker: Taquilla
|
||||||
list:
|
list:
|
||||||
name: Nombre
|
name: Nombre
|
||||||
email: Email
|
email: Email
|
||||||
|
@ -1239,6 +1243,10 @@ zone:
|
||||||
zonesList: Zonas
|
zonesList: Zonas
|
||||||
deliveryList: Días de entrega
|
deliveryList: Días de entrega
|
||||||
upcomingList: Próximos repartos
|
upcomingList: Próximos repartos
|
||||||
|
monitor:
|
||||||
|
pageTitles:
|
||||||
|
monitors: Monitores
|
||||||
|
list: Listado
|
||||||
components:
|
components:
|
||||||
topbar: {}
|
topbar: {}
|
||||||
itemsFilterPanel:
|
itemsFilterPanel:
|
||||||
|
|
|
@ -1,34 +1,14 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { onMounted, watch } from 'vue';
|
|
||||||
import { useRoute } from 'vue-router';
|
|
||||||
import { useArrayData } from 'src/composables/useArrayData';
|
|
||||||
|
|
||||||
import AgencyDescriptor from 'pages/Agency/Card/AgencyDescriptor.vue';
|
import AgencyDescriptor from 'pages/Agency/Card/AgencyDescriptor.vue';
|
||||||
import VnCard from 'components/common/VnCard.vue';
|
import VnCard from 'components/common/VnCard.vue';
|
||||||
|
|
||||||
const route = useRoute();
|
|
||||||
const arrayData = useArrayData('Agency', {
|
|
||||||
url: `Agencies/${route.params.id}`,
|
|
||||||
});
|
|
||||||
const { store } = arrayData;
|
|
||||||
onMounted(async () => await arrayData.fetch({ append: false }));
|
|
||||||
watch(
|
|
||||||
() => route.params.id,
|
|
||||||
async (newId) => {
|
|
||||||
if (newId) {
|
|
||||||
store.url = `Agencies/${newId}`;
|
|
||||||
await arrayData.fetch({ append: false });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<VnCard
|
<VnCard
|
||||||
data-key="Agency"
|
data-key="Agency"
|
||||||
base-url="Agencies"
|
base-url="Agencies"
|
||||||
:descriptor="AgencyDescriptor"
|
:descriptor="AgencyDescriptor"
|
||||||
searchbar-data-key="AgencyList"
|
search-data-key="AgencyList"
|
||||||
searchbar-url="Agencies"
|
search-url="Agencies"
|
||||||
searchbar-label="agency.searchBar.label"
|
searchbar-label="agency.searchBar.label"
|
||||||
searchbar-info="agency.searchBar.info"
|
searchbar-info="agency.searchBar.info"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -15,8 +15,8 @@ const props = defineProps({
|
||||||
});
|
});
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const { params } = useRoute();
|
const route = useRoute();
|
||||||
const entityId = computed(() => props.id || params.id);
|
const entityId = computed(() => props.id || route.params.id);
|
||||||
const { store } = useArrayData('Parking');
|
const { store } = useArrayData('Parking');
|
||||||
const card = computed(() => store.data);
|
const card = computed(() => store.data);
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -3,26 +3,13 @@ import { computed } from 'vue';
|
||||||
import { useRoute } from 'vue-router';
|
import { useRoute } from 'vue-router';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
import FetchData from 'src/components/FetchData.vue';
|
|
||||||
import CardSummary from 'components/ui/CardSummary.vue';
|
import CardSummary from 'components/ui/CardSummary.vue';
|
||||||
import VnLv from 'components/ui/VnLv.vue';
|
import VnLv from 'components/ui/VnLv.vue';
|
||||||
import VnTitle from 'src/components/common/VnTitle.vue';
|
import VnTitle from 'src/components/common/VnTitle.vue';
|
||||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({ id: { type: Number, default: 0 } });
|
||||||
id: {
|
|
||||||
type: Number,
|
|
||||||
default: 0,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
const { params } = useRoute();
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const entityId = computed(() => $props.id || params.id);
|
const entityId = computed(() => $props.id || useRoute().params.id);
|
||||||
|
|
||||||
const filter = {
|
|
||||||
fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
|
|
||||||
include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
|
|
||||||
};
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
|
|
@ -201,30 +201,7 @@ async function post(query, params) {
|
||||||
auto-load
|
auto-load
|
||||||
@on-fetch="(data) => (destinationTypes = data)"
|
@on-fetch="(data) => (destinationTypes = data)"
|
||||||
/>
|
/>
|
||||||
<template v-if="stateStore.isHeaderMounted()">
|
<Teleport to="#right-panel" v-if="stateStore.isHeaderMounted() && claim">
|
||||||
<Teleport to="#actions-append">
|
|
||||||
<div class="row q-gutter-x-sm">
|
|
||||||
<QBtn
|
|
||||||
flat
|
|
||||||
@click="stateStore.toggleRightDrawer()"
|
|
||||||
round
|
|
||||||
dense
|
|
||||||
icon="menu"
|
|
||||||
>
|
|
||||||
<QTooltip bottom anchor="bottom right">
|
|
||||||
{{ t('globals.collapseMenu') }}
|
|
||||||
</QTooltip>
|
|
||||||
</QBtn>
|
|
||||||
</div>
|
|
||||||
</Teleport>
|
|
||||||
</template>
|
|
||||||
<QDrawer
|
|
||||||
v-model="stateStore.rightDrawer"
|
|
||||||
side="right"
|
|
||||||
:width="300"
|
|
||||||
show-if-above
|
|
||||||
v-if="claim"
|
|
||||||
>
|
|
||||||
<QCard class="totalClaim q-my-md q-pa-sm no-box-shadow">
|
<QCard class="totalClaim q-my-md q-pa-sm no-box-shadow">
|
||||||
{{ `${t('Total claimed')}: ${toCurrency(totalClaimed)}` }}
|
{{ `${t('Total claimed')}: ${toCurrency(totalClaimed)}` }}
|
||||||
</QCard>
|
</QCard>
|
||||||
|
@ -274,7 +251,7 @@ async function post(query, params) {
|
||||||
v-model="multiplicatorValue"
|
v-model="multiplicatorValue"
|
||||||
/>
|
/>
|
||||||
</QCard>
|
</QCard>
|
||||||
</QDrawer>
|
</Teleport>
|
||||||
<Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()"> </Teleport>
|
<Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()"> </Teleport>
|
||||||
<CrudModel
|
<CrudModel
|
||||||
v-if="claim"
|
v-if="claim"
|
||||||
|
|
|
@ -95,22 +95,17 @@ const statesFilter = {
|
||||||
>
|
>
|
||||||
<template #form="{ data, validate, filter }">
|
<template #form="{ data, validate, filter }">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
v-model="data.client.name"
|
v-model="data.client.name"
|
||||||
:label="t('claim.basicData.customer')"
|
:label="t('claim.basicData.customer')"
|
||||||
disable
|
disable
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnInputDate
|
<VnInputDate
|
||||||
v-model="data.created"
|
v-model="data.created"
|
||||||
:label="t('claim.basicData.created')"
|
:label="t('claim.basicData.created')"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('claim.basicData.assignedTo')"
|
:label="t('claim.basicData.assignedTo')"
|
||||||
v-model="data.workerFk"
|
v-model="data.workerFk"
|
||||||
|
@ -131,8 +126,6 @@ const statesFilter = {
|
||||||
</QAvatar>
|
</QAvatar>
|
||||||
</template>
|
</template>
|
||||||
</VnSelect>
|
</VnSelect>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QSelect
|
<QSelect
|
||||||
v-model="data.claimStateFk"
|
v-model="data.claimStateFk"
|
||||||
:options="claimStates"
|
:options="claimStates"
|
||||||
|
@ -147,10 +140,8 @@ const statesFilter = {
|
||||||
:input-debounce="0"
|
:input-debounce="0"
|
||||||
>
|
>
|
||||||
</QSelect>
|
</QSelect>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QInput
|
<QInput
|
||||||
v-model.number="data.packages"
|
v-model.number="data.packages"
|
||||||
:label="t('globals.packages')"
|
:label="t('globals.packages')"
|
||||||
|
@ -163,8 +154,6 @@ const statesFilter = {
|
||||||
:rules="validate('claim.packages')"
|
:rules="validate('claim.packages')"
|
||||||
type="text"
|
type="text"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QSelect
|
<QSelect
|
||||||
v-model="data.pickup"
|
v-model="data.pickup"
|
||||||
:options="optionsList"
|
:options="optionsList"
|
||||||
|
@ -175,9 +164,7 @@ const statesFilter = {
|
||||||
map-options
|
map-options
|
||||||
use-input
|
use-input
|
||||||
:input-debounce="0"
|
:input-debounce="0"
|
||||||
>
|
/>
|
||||||
</QSelect>
|
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
</template>
|
</template>
|
||||||
</FormModel>
|
</FormModel>
|
||||||
|
|
|
@ -1,14 +1,16 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import VnCard from 'components/common/VnCard.vue';
|
import VnCard from 'components/common/VnCard.vue';
|
||||||
import ClaimDescriptor from './ClaimDescriptor.vue';
|
import ClaimDescriptor from './ClaimDescriptor.vue';
|
||||||
|
import ClaimFilter from '../ClaimFilter.vue';
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<VnCard
|
<VnCard
|
||||||
data-key="Claim"
|
data-key="Claim"
|
||||||
base-url="Claims"
|
base-url="Claims"
|
||||||
:descriptor="ClaimDescriptor"
|
:descriptor="ClaimDescriptor"
|
||||||
searchbar-data-key="ClaimList"
|
:filter-panel="ClaimFilter"
|
||||||
searchbar-url="Claims/filter"
|
search-data-key="ClaimList"
|
||||||
|
search-url="Claims/filter"
|
||||||
searchbar-label="Search claim"
|
searchbar-label="Search claim"
|
||||||
searchbar-info="You can search by claim id or customer name"
|
searchbar-info="You can search by claim id or customer name"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -12,7 +12,6 @@ import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorP
|
||||||
import VnUserLink from 'src/components/ui/VnUserLink.vue';
|
import VnUserLink from 'src/components/ui/VnUserLink.vue';
|
||||||
import ClaimSummary from './Card/ClaimSummary.vue';
|
import ClaimSummary from './Card/ClaimSummary.vue';
|
||||||
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
|
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
|
||||||
import { getUrl } from 'src/composables/getUrl';
|
|
||||||
|
|
||||||
const stateStore = useStateStore();
|
const stateStore = useStateStore();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
|
|
@ -202,9 +202,9 @@ const toCustomerAddressEdit = (addressId) => {
|
||||||
|
|
||||||
<div v-if="item.observations.length">
|
<div v-if="item.observations.length">
|
||||||
<div
|
<div
|
||||||
:key="index"
|
:key="obIndex"
|
||||||
class="flex q-mb-sm"
|
class="flex q-mb-sm"
|
||||||
v-for="(observation, index) in item.observations"
|
v-for="(observation, obIndex) in item.observations"
|
||||||
>
|
>
|
||||||
<div class="text-weight-bold q-mr-sm">
|
<div class="text-weight-bold q-mr-sm">
|
||||||
{{ observation.observationType.description }}:
|
{{ observation.observationType.description }}:
|
||||||
|
|
|
@ -11,6 +11,7 @@ import { useState } from 'src/composables/useState';
|
||||||
import { useStateStore } from 'stores/useStateStore';
|
import { useStateStore } from 'stores/useStateStore';
|
||||||
import { useValidator } from 'src/composables/useValidator';
|
import { useValidator } from 'src/composables/useValidator';
|
||||||
import { usePrintService } from 'src/composables/usePrintService';
|
import { usePrintService } from 'src/composables/usePrintService';
|
||||||
|
import { useSession } from 'src/composables/useSession';
|
||||||
|
|
||||||
import VnPaginate from 'src/components/ui/VnPaginate.vue';
|
import VnPaginate from 'src/components/ui/VnPaginate.vue';
|
||||||
import FetchData from 'components/FetchData.vue';
|
import FetchData from 'components/FetchData.vue';
|
||||||
|
@ -19,6 +20,9 @@ import VnSelect from 'src/components/common/VnSelect.vue';
|
||||||
import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
|
import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
|
||||||
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
||||||
import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
|
import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
|
||||||
|
const session = useSession();
|
||||||
|
|
||||||
|
const tokenMultimedia = session.getTokenMultimedia();
|
||||||
|
|
||||||
const { sendEmail } = usePrintService();
|
const { sendEmail } = usePrintService();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
@ -188,6 +192,11 @@ const saveFieldValue = async (row) => {
|
||||||
const sendEmailAction = () => {
|
const sendEmailAction = () => {
|
||||||
sendEmail(`Suppliers/${route.params.id}/campaign-metrics-email`);
|
sendEmail(`Suppliers/${route.params.id}/campaign-metrics-email`);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const showBalancePdf = (balance) => {
|
||||||
|
const url = `api/InvoiceOuts/${balance.id}/download?access_token=${tokenMultimedia}`;
|
||||||
|
window.open(url, '_blank');
|
||||||
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
@ -257,17 +266,28 @@ const sendEmailAction = () => {
|
||||||
<QTd align="center">
|
<QTd align="center">
|
||||||
<QIcon
|
<QIcon
|
||||||
@click.stop="showDialog = true"
|
@click.stop="showDialog = true"
|
||||||
class="q-ml-md"
|
class="q-ml-md fill-icon"
|
||||||
color="primary"
|
color="primary"
|
||||||
name="outgoing_mail"
|
name="outgoing_mail"
|
||||||
size="sm"
|
size="sm"
|
||||||
style="font-variation-settings: 'FILL' 1"
|
|
||||||
v-if="row.isCompensation"
|
v-if="row.isCompensation"
|
||||||
>
|
>
|
||||||
<QTooltip>
|
<QTooltip>
|
||||||
{{ t('Send compensation') }}
|
{{ t('Send compensation') }}
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
</QIcon>
|
</QIcon>
|
||||||
|
<QIcon
|
||||||
|
@click="showBalancePdf(row)"
|
||||||
|
class="q-ml-md fill-icon"
|
||||||
|
color="primary"
|
||||||
|
name="cloud_download"
|
||||||
|
size="sm"
|
||||||
|
v-if="row.hasPdf"
|
||||||
|
>
|
||||||
|
<QTooltip>
|
||||||
|
{{ t('globals.downloadPdf') }}
|
||||||
|
</QTooltip>
|
||||||
|
</QIcon>
|
||||||
|
|
||||||
<QDialog v-model="showDialog">
|
<QDialog v-model="showDialog">
|
||||||
<QCard class="q-pa-sm">
|
<QCard class="q-pa-sm">
|
||||||
|
|
|
@ -70,7 +70,6 @@ const filterOptions = {
|
||||||
<FormModel :url="`Clients/${route.params.id}`" auto-load model="customer">
|
<FormModel :url="`Clients/${route.params.id}`" auto-load model="customer">
|
||||||
<template #form="{ data, validate, filter }">
|
<template #form="{ data, validate, filter }">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('Comercial name')"
|
:label="t('Comercial name')"
|
||||||
:rules="validate('client.socialName')"
|
:rules="validate('client.socialName')"
|
||||||
|
@ -78,8 +77,7 @@ const filterOptions = {
|
||||||
clearable
|
clearable
|
||||||
v-model="data.name"
|
v-model="data.name"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QSelect
|
<QSelect
|
||||||
:input-debounce="0"
|
:input-debounce="0"
|
||||||
:label="t('customer.basicData.businessType')"
|
:label="t('customer.basicData.businessType')"
|
||||||
|
@ -91,18 +89,14 @@ const filterOptions = {
|
||||||
option-value="code"
|
option-value="code"
|
||||||
v-model="data.businessTypeFk"
|
v-model="data.businessTypeFk"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('customer.basicData.contact')"
|
:label="t('customer.basicData.contact')"
|
||||||
:rules="validate('client.contact')"
|
:rules="validate('client.contact')"
|
||||||
clearable
|
clearable
|
||||||
v-model="data.contact"
|
v-model="data.contact"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('customer.basicData.email')"
|
:label="t('customer.basicData.email')"
|
||||||
:rules="validate('client.email')"
|
:rules="validate('client.email')"
|
||||||
|
@ -118,28 +112,22 @@ const filterOptions = {
|
||||||
</QIcon>
|
</QIcon>
|
||||||
</template>
|
</template>
|
||||||
</VnInput>
|
</VnInput>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('customer.basicData.phone')"
|
:label="t('customer.basicData.phone')"
|
||||||
:rules="validate('client.phone')"
|
:rules="validate('client.phone')"
|
||||||
clearable
|
clearable
|
||||||
v-model="data.phone"
|
v-model="data.phone"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('customer.basicData.mobile')"
|
:label="t('customer.basicData.mobile')"
|
||||||
:rules="validate('client.mobile')"
|
:rules="validate('client.mobile')"
|
||||||
clearable
|
clearable
|
||||||
v-model="data.mobile"
|
v-model="data.mobile"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QSelect
|
<QSelect
|
||||||
:input-debounce="0"
|
:input-debounce="0"
|
||||||
:label="t('customer.basicData.salesPerson')"
|
:label="t('customer.basicData.salesPerson')"
|
||||||
|
@ -163,23 +151,19 @@ const filterOptions = {
|
||||||
</QAvatar>
|
</QAvatar>
|
||||||
</template>
|
</template>
|
||||||
</QSelect>
|
</QSelect>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QSelect
|
<QSelect
|
||||||
:input-debounce="0"
|
|
||||||
:label="t('customer.basicData.contactChannel')"
|
|
||||||
:options="contactChannels"
|
|
||||||
:rules="validate('client.contactChannelFk')"
|
|
||||||
emit-value
|
|
||||||
map-options
|
|
||||||
option-label="name"
|
|
||||||
option-value="id"
|
|
||||||
v-model="data.contactChannelFk"
|
v-model="data.contactChannelFk"
|
||||||
|
:options="contactChannels"
|
||||||
|
option-value="id"
|
||||||
|
option-label="name"
|
||||||
|
emit-value
|
||||||
|
:label="t('customer.basicData.contactChannel')"
|
||||||
|
map-options
|
||||||
|
:rules="validate('client.contactChannelFk')"
|
||||||
|
:input-debounce="0"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QSelect
|
<QSelect
|
||||||
:input-debounce="0"
|
:input-debounce="0"
|
||||||
:label="t('customer.basicData.previousClient')"
|
:label="t('customer.basicData.previousClient')"
|
||||||
|
@ -201,7 +185,6 @@ const filterOptions = {
|
||||||
</QIcon>
|
</QIcon>
|
||||||
</template>
|
</template>
|
||||||
</QSelect>
|
</QSelect>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
</template>
|
</template>
|
||||||
</FormModel>
|
</FormModel>
|
||||||
|
|
|
@ -48,7 +48,6 @@ const getBankEntities = (data, formData) => {
|
||||||
>
|
>
|
||||||
<template #form="{ data, validate }">
|
<template #form="{ data, validate }">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Billing data')"
|
:label="t('Billing data')"
|
||||||
:options="payMethods"
|
:options="payMethods"
|
||||||
|
@ -57,14 +56,10 @@ const getBankEntities = (data, formData) => {
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="data.payMethod"
|
v-model="data.payMethod"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnInput :label="t('Due day')" clearable v-model="data.dueDay" />
|
<VnInput :label="t('Due day')" clearable v-model="data.dueDay" />
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput :label="t('IBAN')" clearable v-model="data.iban">
|
<VnInput :label="t('IBAN')" clearable v-model="data.iban">
|
||||||
<template #append>
|
<template #append>
|
||||||
<QIcon name="info" class="cursor-info">
|
<QIcon name="info" class="cursor-info">
|
||||||
|
@ -72,8 +67,6 @@ const getBankEntities = (data, formData) => {
|
||||||
</QIcon>
|
</QIcon>
|
||||||
</template>
|
</template>
|
||||||
</VnInput>
|
</VnInput>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnSelectDialog
|
<VnSelectDialog
|
||||||
:label="t('Swift / BIC')"
|
:label="t('Swift / BIC')"
|
||||||
:options="bankEntitiesOptions"
|
:options="bankEntitiesOptions"
|
||||||
|
@ -93,29 +86,18 @@ const getBankEntities = (data, formData) => {
|
||||||
<QItem v-bind="scope.itemProps">
|
<QItem v-bind="scope.itemProps">
|
||||||
<QItemSection v-if="scope.opt">
|
<QItemSection v-if="scope.opt">
|
||||||
<QItemLabel
|
<QItemLabel
|
||||||
>{{ scope.opt.bic }}
|
>{{ scope.opt.bic }} {{ scope.opt.name }}</QItemLabel
|
||||||
{{ scope.opt.name }}</QItemLabel
|
|
||||||
>
|
>
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
</template>
|
</template>
|
||||||
</VnSelectDialog>
|
</VnSelectDialog>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QCheckbox :label="t('Received LCR')" v-model="data.hasLcr" />
|
<QCheckbox :label="t('Received LCR')" v-model="data.hasLcr" />
|
||||||
</div>
|
<QCheckbox :label="t('VNL core received')" v-model="data.hasCoreVnl" />
|
||||||
<div class="col">
|
|
||||||
<QCheckbox
|
|
||||||
:label="t('VNL core received')"
|
|
||||||
v-model="data.hasCoreVnl"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QCheckbox :label="t('VNL B2B received')" v-model="data.hasSepaVnl" />
|
<QCheckbox :label="t('VNL B2B received')" v-model="data.hasSepaVnl" />
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
</template>
|
</template>
|
||||||
</FormModel>
|
</FormModel>
|
||||||
|
|
|
@ -1,14 +1,16 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import VnCard from 'components/common/VnCard.vue';
|
import VnCard from 'components/common/VnCard.vue';
|
||||||
import CustomerDescriptor from './CustomerDescriptor.vue';
|
import CustomerDescriptor from './CustomerDescriptor.vue';
|
||||||
|
import CustomerFilter from '../CustomerFilter.vue';
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<VnCard
|
<VnCard
|
||||||
data-key="Client"
|
data-key="Client"
|
||||||
base-url="Clients"
|
base-url="Clients"
|
||||||
:descriptor="CustomerDescriptor"
|
:descriptor="CustomerDescriptor"
|
||||||
searchbar-data-key="CustomerList"
|
:filter-panel="CustomerFilter"
|
||||||
searchbar-url="Clients/filter"
|
search-data-key="CustomerList"
|
||||||
|
search-url="Clients/filter"
|
||||||
searchbar-label="Search customer"
|
searchbar-label="Search customer"
|
||||||
searchbar-info="You can search by customer id or name"
|
searchbar-info="You can search by customer id or name"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -105,7 +105,7 @@ const updateData = () => {
|
||||||
color="primary"
|
color="primary"
|
||||||
name="lock"
|
name="lock"
|
||||||
size="md"
|
size="md"
|
||||||
style="font-variation-settings: 'FILL' 1"
|
class="fill-icon"
|
||||||
>
|
>
|
||||||
<QTooltip>{{ t('Close contract') }}</QTooltip>
|
<QTooltip>{{ t('Close contract') }}</QTooltip>
|
||||||
</QIcon>
|
</QIcon>
|
||||||
|
|
|
@ -41,7 +41,6 @@ function handleLocation(data, location) {
|
||||||
>
|
>
|
||||||
<template #form="{ data, validate }">
|
<template #form="{ data, validate }">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('Social name')"
|
:label="t('Social name')"
|
||||||
:required="true"
|
:required="true"
|
||||||
|
@ -55,20 +54,14 @@ function handleLocation(data, location) {
|
||||||
</QIcon>
|
</QIcon>
|
||||||
</template>
|
</template>
|
||||||
</VnInput>
|
</VnInput>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnInput :label="t('Tax number')" clearable v-model="data.fi" />
|
<VnInput :label="t('Tax number')" clearable v-model="data.fi" />
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput :label="t('Street')" clearable v-model="data.street" />
|
<VnInput :label="t('Street')" clearable v-model="data.street" />
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Sage tax type')"
|
:label="t('Sage tax type')"
|
||||||
:options="typesTaxes"
|
:options="typesTaxes"
|
||||||
|
@ -77,8 +70,6 @@ function handleLocation(data, location) {
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="data.sageTaxTypeFk"
|
v-model="data.sageTaxTypeFk"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Sage transaction type')"
|
:label="t('Sage transaction type')"
|
||||||
:options="typesTransactions"
|
:options="typesTransactions"
|
||||||
|
@ -98,11 +89,9 @@ function handleLocation(data, location) {
|
||||||
</QItem>
|
</QItem>
|
||||||
</template>
|
</template>
|
||||||
</VnSelect>
|
</VnSelect>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnLocation
|
<VnLocation
|
||||||
:rules="validate('Worker.postcode')"
|
:rules="validate('Worker.postcode')"
|
||||||
:roles-allowed-to-create="['deliveryAssistant']"
|
:roles-allowed-to-create="['deliveryAssistant']"
|
||||||
|
@ -111,23 +100,16 @@ function handleLocation(data, location) {
|
||||||
@update:model-value="(location) => handleLocation(data, location)"
|
@update:model-value="(location) => handleLocation(data, location)"
|
||||||
>
|
>
|
||||||
</VnLocation>
|
</VnLocation>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow>
|
||||||
<div class="col">
|
|
||||||
<QCheckbox :label="t('Active')" v-model="data.isActive" />
|
<QCheckbox :label="t('Active')" v-model="data.isActive" />
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QCheckbox :label="t('Frozen')" v-model="data.isFreezed" />
|
<QCheckbox :label="t('Frozen')" v-model="data.isFreezed" />
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow>
|
||||||
<div class="col">
|
|
||||||
<QCheckbox :label="t('Has to invoice')" v-model="data.hasToInvoice" />
|
<QCheckbox :label="t('Has to invoice')" v-model="data.hasToInvoice" />
|
||||||
</div>
|
<div>
|
||||||
<div class="col">
|
|
||||||
<QCheckbox :label="t('Vies')" v-model="data.isVies" />
|
<QCheckbox :label="t('Vies')" v-model="data.isVies" />
|
||||||
<QIcon name="info" class="cursor-info q-ml-sm" size="sm">
|
<QIcon name="info" class="cursor-info q-ml-sm" size="sm">
|
||||||
<QTooltip>
|
<QTooltip>
|
||||||
|
@ -137,23 +119,16 @@ function handleLocation(data, location) {
|
||||||
</div>
|
</div>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow>
|
||||||
<div class="col">
|
<QCheckbox :label="t('Notify by email')" v-model="data.isToBeMailed" />
|
||||||
<QCheckbox
|
|
||||||
:label="t('Notify by email')"
|
|
||||||
v-model="data.isToBeMailed"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QCheckbox
|
<QCheckbox
|
||||||
:label="t('Invoice by address')"
|
:label="t('Invoice by address')"
|
||||||
v-model="data.hasToInvoiceByAddress"
|
v-model="data.hasToInvoiceByAddress"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow>
|
||||||
<div class="col">
|
<div>
|
||||||
<QCheckbox
|
<QCheckbox
|
||||||
:label="t('Is equalizated')"
|
:label="t('Is equalizated')"
|
||||||
v-model="data.isEqualizated"
|
v-model="data.isEqualizated"
|
||||||
|
@ -164,27 +139,18 @@ function handleLocation(data, location) {
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
</QIcon>
|
</QIcon>
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
<QCheckbox :label="t('Verified data')" v-model="data.isTaxDataChecked" />
|
||||||
<QCheckbox
|
|
||||||
:label="t('Verified data')"
|
|
||||||
v-model="data.isTaxDataChecked"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow>
|
||||||
<div class="col">
|
|
||||||
<QCheckbox
|
<QCheckbox
|
||||||
:label="t('Incoterms authorization')"
|
:label="t('Incoterms authorization')"
|
||||||
v-model="data.hasIncoterms"
|
v-model="data.hasIncoterms"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QCheckbox
|
<QCheckbox
|
||||||
:label="t('Electronic invoice')"
|
:label="t('Electronic invoice')"
|
||||||
v-model="data.hasElectronicInvoice"
|
v-model="data.hasElectronicInvoice"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
</template>
|
</template>
|
||||||
</FormModel>
|
</FormModel>
|
||||||
|
|
|
@ -1,20 +1,17 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, computed } from 'vue';
|
import { ref, computed } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useRoute, useRouter } from 'vue-router';
|
import { useRoute } from 'vue-router';
|
||||||
|
|
||||||
import { QBtn } from 'quasar';
|
import { QBtn } from 'quasar';
|
||||||
|
import { useStateStore } from 'src/stores/useStateStore';
|
||||||
import { toCurrency } from 'src/filters';
|
import { toCurrency } from 'src/filters';
|
||||||
import { toDateTimeFormat } from 'src/filters/date';
|
import { toDateTimeFormat } from 'src/filters/date';
|
||||||
|
|
||||||
import FetchData from 'components/FetchData.vue';
|
import FetchData from 'components/FetchData.vue';
|
||||||
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const router = useRouter();
|
const stateStore = computed(() => useStateStore());
|
||||||
|
|
||||||
const rows = ref([]);
|
const rows = ref([]);
|
||||||
const totalAmount = ref(0);
|
const totalAmount = ref(0);
|
||||||
|
|
||||||
|
@ -105,28 +102,40 @@ const columns = computed(() => [
|
||||||
|
|
||||||
const setRows = (data) => {
|
const setRows = (data) => {
|
||||||
rows.value = data;
|
rows.value = data;
|
||||||
totalAmount.value = data.reduce((accumulator, currentValue) => {
|
totalAmount.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
|
||||||
return accumulator + currentValue.amount;
|
|
||||||
}, 0);
|
|
||||||
};
|
|
||||||
|
|
||||||
const toCustomerGreugeCreate = () => {
|
|
||||||
router.push({ name: 'CustomerGreugeCreate' });
|
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<FetchData :filter="filter" @on-fetch="setRows" auto-load url="greuges" />
|
<FetchData :filter="filter" @on-fetch="setRows" auto-load url="greuges" />
|
||||||
|
<template v-if="stateStore.isHeaderMounted()">
|
||||||
<div class="full-width flex justify-center">
|
<Teleport to="#actions-append">
|
||||||
<QPage class="card-width q-pa-lg">
|
<div class="row q-gutter-x-sm">
|
||||||
<QCard class="full-width q-pa-sm" v-if="totalAmount">
|
<QBtn
|
||||||
<h6 class="flex justify-end q-my-lg q-pr-lg">
|
flat
|
||||||
|
@click="stateStore.toggleRightDrawer()"
|
||||||
|
round
|
||||||
|
dense
|
||||||
|
icon="menu"
|
||||||
|
>
|
||||||
|
<QTooltip bottom anchor="bottom right">
|
||||||
|
{{ t('globals.collapseMenu') }}
|
||||||
|
</QTooltip>
|
||||||
|
</QBtn>
|
||||||
|
</div>
|
||||||
|
</Teleport>
|
||||||
|
</template>
|
||||||
|
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="300" show-if-above>
|
||||||
|
<QCard class="full-width q-pa-sm">
|
||||||
|
<h6 class="flex justify-end q-my-lg q-pr-lg" v-if="totalAmount">
|
||||||
<span class="color-vn-label q-mr-md">{{ t('Total') }}:</span>
|
<span class="color-vn-label q-mr-md">{{ t('Total') }}:</span>
|
||||||
{{ toCurrency(totalAmount) }}
|
{{ toCurrency(totalAmount) }}
|
||||||
</h6>
|
</h6>
|
||||||
|
<QSkeleton v-else type="QInput" square />
|
||||||
</QCard>
|
</QCard>
|
||||||
|
</QDrawer>
|
||||||
|
<div class="full-width flex justify-center">
|
||||||
|
<QPage class="card-width q-pa-lg">
|
||||||
<QCard class="q-pa-sm q-mt-md">
|
<QCard class="q-pa-sm q-mt-md">
|
||||||
<QTable
|
<QTable
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
|
@ -164,7 +173,7 @@ const toCustomerGreugeCreate = () => {
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<QPageSticky :offset="[18, 18]">
|
<QPageSticky :offset="[18, 18]">
|
||||||
<QBtn @click.stop="toCustomerGreugeCreate()" color="primary" fab icon="add" />
|
<QBtn color="primary" fab icon="add" :to="{ name: 'CustomerGreugeCreate' }" />
|
||||||
<QTooltip>
|
<QTooltip>
|
||||||
{{ t('New greuge') }}
|
{{ t('New greuge') }}
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
|
|
|
@ -11,7 +11,6 @@ import useNotify from 'src/composables/useNotify';
|
||||||
import { useStateStore } from 'stores/useStateStore';
|
import { useStateStore } from 'stores/useStateStore';
|
||||||
|
|
||||||
import FetchData from 'components/FetchData.vue';
|
import FetchData from 'components/FetchData.vue';
|
||||||
import VnRow from 'components/ui/VnRow.vue';
|
|
||||||
import VnInput from 'src/components/common/VnInput.vue';
|
import VnInput from 'src/components/common/VnInput.vue';
|
||||||
import CustomerChangePassword from 'src/pages/Customer/components/CustomerChangePassword.vue';
|
import CustomerChangePassword from 'src/pages/Customer/components/CustomerChangePassword.vue';
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,6 @@ import axios from 'axios';
|
||||||
|
|
||||||
import { toCurrency, toDateHourMinSec } from 'src/filters';
|
import { toCurrency, toDateHourMinSec } from 'src/filters';
|
||||||
|
|
||||||
import FetchData from 'components/FetchData.vue';
|
|
||||||
import CustomerCloseIconTooltip from '../components/CustomerCloseIconTooltip.vue';
|
import CustomerCloseIconTooltip from '../components/CustomerCloseIconTooltip.vue';
|
||||||
import CustomerCheckIconTooltip from '../components/CustomerCheckIconTooltip.vue';
|
import CustomerCheckIconTooltip from '../components/CustomerCheckIconTooltip.vue';
|
||||||
|
|
||||||
|
|
|
@ -49,10 +49,7 @@ function handleLocation(data, location) {
|
||||||
>
|
>
|
||||||
<template #form="{ data, validate }">
|
<template #form="{ data, validate }">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QInput :label="t('Comercial name')" v-model="data.name" />
|
<QInput :label="t('Comercial name')" v-model="data.name" />
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Salesperson')"
|
:label="t('Salesperson')"
|
||||||
:options="workersOptions"
|
:options="workersOptions"
|
||||||
|
@ -61,10 +58,8 @@ function handleLocation(data, location) {
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="data.salesPersonFk"
|
v-model="data.salesPersonFk"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Business type')"
|
:label="t('Business type')"
|
||||||
:options="businessTypesOptions"
|
:options="businessTypesOptions"
|
||||||
|
@ -73,49 +68,35 @@ function handleLocation(data, location) {
|
||||||
option-value="code"
|
option-value="code"
|
||||||
v-model="data.businessTypeFk"
|
v-model="data.businessTypeFk"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QInput v-model="data.fi" :label="t('Tax number')" />
|
<QInput v-model="data.fi" :label="t('Tax number')" />
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QInput
|
<QInput
|
||||||
:label="t('Business name')"
|
:label="t('Business name')"
|
||||||
:rules="validate('client.socialName')"
|
:rules="validate('client.socialName')"
|
||||||
v-model="data.socialName"
|
v-model="data.socialName"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QInput
|
<QInput
|
||||||
:label="t('Street')"
|
:label="t('Street')"
|
||||||
:rules="validate('client.street')"
|
:rules="validate('client.street')"
|
||||||
v-model="data.street"
|
v-model="data.street"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnLocation
|
<VnLocation
|
||||||
:rules="validate('Worker.postcode')"
|
:rules="validate('Worker.postcode')"
|
||||||
:roles-allowed-to-create="['deliveryAssistant']"
|
:roles-allowed-to-create="['deliveryAssistant']"
|
||||||
:options="postcodesOptions"
|
:options="postcodesOptions"
|
||||||
v-model="data.location"
|
v-model="data.location"
|
||||||
@update:model-value="
|
@update:model-value="(location) => handleLocation(data, location)"
|
||||||
(location) => handleLocation(data, location)
|
|
||||||
"
|
|
||||||
>
|
>
|
||||||
</VnLocation>
|
</VnLocation>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QInput v-model="data.userName" :label="t('Web user')" />
|
<QInput v-model="data.userName" :label="t('Web user')" />
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QInput
|
<QInput
|
||||||
:label="t('Email')"
|
:label="t('Email')"
|
||||||
:rules="validate('client.email')"
|
:rules="validate('client.email')"
|
||||||
|
@ -131,7 +112,6 @@ function handleLocation(data, location) {
|
||||||
</QIcon>
|
</QIcon>
|
||||||
</template>
|
</template>
|
||||||
</QInput>
|
</QInput>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<QCheckbox
|
<QCheckbox
|
||||||
:label="t('Is equalizated')"
|
:label="t('Is equalizated')"
|
||||||
|
|
|
@ -3,10 +3,10 @@ import { ref, computed } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
import { QBtn, QCheckbox, useQuasar } from 'quasar';
|
import { QBtn, QCheckbox, useQuasar } from 'quasar';
|
||||||
|
import { useStateStore } from 'stores/useStateStore';
|
||||||
|
|
||||||
import { toCurrency, toDate } from 'filters/index';
|
import { toCurrency, toDate, dateRange } from 'filters/index';
|
||||||
|
import VnPaginate from 'src/components/ui/VnPaginate.vue';
|
||||||
import FetchData from 'components/FetchData.vue';
|
|
||||||
import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
|
import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
|
||||||
import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
|
import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
|
||||||
import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
|
import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
|
||||||
|
@ -14,13 +14,14 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
|
||||||
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
||||||
import VnInput from 'src/components/common/VnInput.vue';
|
import VnInput from 'src/components/common/VnInput.vue';
|
||||||
import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
|
import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
|
||||||
|
const stateStore = useStateStore();
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t, locale } = useI18n();
|
||||||
const quasar = useQuasar();
|
const quasar = useQuasar();
|
||||||
|
const dataRef = ref(null);
|
||||||
|
|
||||||
const balanceDueTotal = ref(0);
|
const balanceDueTotal = ref(0);
|
||||||
const selected = ref([]);
|
const selected = ref([]);
|
||||||
const rows = ref([]);
|
|
||||||
|
|
||||||
const tableColumnComponents = {
|
const tableColumnComponents = {
|
||||||
client: {
|
client: {
|
||||||
|
@ -167,39 +168,61 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const setRows = (data) => {
|
|
||||||
rows.value = data;
|
|
||||||
balanceDueTotal.value = data.reduce((accumulator, currentValue) => {
|
|
||||||
return accumulator + (currentValue['amount'] || 0);
|
|
||||||
}, 0);
|
|
||||||
};
|
|
||||||
|
|
||||||
const viewAddObservation = (rowsSelected) => {
|
const viewAddObservation = (rowsSelected) => {
|
||||||
quasar.dialog({
|
quasar.dialog({
|
||||||
component: CustomerDefaulterAddObservation,
|
component: CustomerDefaulterAddObservation,
|
||||||
componentProps: {
|
componentProps: {
|
||||||
clients: rowsSelected,
|
clients: rowsSelected,
|
||||||
promise: refreshData,
|
promise: async () => await dataRef.value.fetch(),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
const refreshData = () => {
|
const onFetch = (data) => {
|
||||||
setRows();
|
for (const element of data) element.isWorker = element.businessTypeFk === 'worker';
|
||||||
|
|
||||||
|
balanceDueTotal.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
|
||||||
};
|
};
|
||||||
|
|
||||||
const onFetch = (data) => {
|
function exprBuilder(param, value) {
|
||||||
for (const element of data) {
|
switch (param) {
|
||||||
element.isWorker = element.businessTypeFk === 'worker';
|
case 'clientFk':
|
||||||
|
return { [`d.${param}`]: value?.id };
|
||||||
|
case 'creditInsurance':
|
||||||
|
case 'amount':
|
||||||
|
case 'workerFk':
|
||||||
|
case 'countryFk':
|
||||||
|
case 'payMethod':
|
||||||
|
case 'salesPersonFk':
|
||||||
|
return { [`d.${param}`]: value };
|
||||||
|
case 'date':
|
||||||
|
return { 'd.created': { between: dateRange(value) } };
|
||||||
|
case 'defaulterSinced':
|
||||||
|
return { 'd.defaulterSinced': { between: dateRange(value) } };
|
||||||
|
}
|
||||||
}
|
}
|
||||||
rows.value = data;
|
|
||||||
};
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<FetchData :filter="filter" @on-fetch="onFetch" auto-load url="Defaulters/filter" />
|
<template v-if="stateStore.isHeaderMounted()">
|
||||||
|
<Teleport to="#actions-append">
|
||||||
|
<div class="row q-gutter-x-sm">
|
||||||
|
<QBtn
|
||||||
|
flat
|
||||||
|
@click="stateStore.toggleRightDrawer()"
|
||||||
|
round
|
||||||
|
dense
|
||||||
|
icon="menu"
|
||||||
|
>
|
||||||
|
<QTooltip bottom anchor="bottom right">
|
||||||
|
{{ t('globals.collapseMenu') }}
|
||||||
|
</QTooltip>
|
||||||
|
</QBtn>
|
||||||
|
</div>
|
||||||
|
</Teleport>
|
||||||
|
</template>
|
||||||
|
|
||||||
<QDrawer side="right" :width="256" show-if-above>
|
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
|
||||||
<QScrollArea class="fit text-grey-8">
|
<QScrollArea class="fit text-grey-8">
|
||||||
<CustomerNotificationsFilter data-key="CustomerDefaulter" />
|
<CustomerNotificationsFilter data-key="CustomerDefaulter" />
|
||||||
</QScrollArea>
|
</QScrollArea>
|
||||||
|
@ -214,12 +237,25 @@ const onFetch = (data) => {
|
||||||
icon="vn:notes"
|
icon="vn:notes"
|
||||||
:disabled="!selected.length"
|
:disabled="!selected.length"
|
||||||
@click.stop="viewAddObservation(selected)"
|
@click.stop="viewAddObservation(selected)"
|
||||||
/>
|
>
|
||||||
|
<QTooltip>{{ t('Add observation') }}</QTooltip>
|
||||||
|
</QBtn>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</VnSubToolbar>
|
</VnSubToolbar>
|
||||||
|
|
||||||
<QPage class="column items-center q-pa-md">
|
<QPage class="column items-center q-pa-md">
|
||||||
|
<VnPaginate
|
||||||
|
ref="dataRef"
|
||||||
|
@on-fetch="onFetch"
|
||||||
|
data-key="CustomerDefaulter"
|
||||||
|
:filter="filter"
|
||||||
|
:expr-builder="exprBuilder"
|
||||||
|
auto-load
|
||||||
|
url="Defaulters/filter"
|
||||||
|
>
|
||||||
|
<template #body="{ rows }">
|
||||||
|
<div class="q-pa-md">
|
||||||
<QTable
|
<QTable
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:rows="rows"
|
:rows="rows"
|
||||||
|
@ -233,9 +269,15 @@ const onFetch = (data) => {
|
||||||
<QTh>
|
<QTh>
|
||||||
<QCheckbox v-model="props.selected" />
|
<QCheckbox v-model="props.selected" />
|
||||||
</QTh>
|
</QTh>
|
||||||
<QTh v-for="col in props.cols" :key="col.name" :props="props">
|
<QTh
|
||||||
|
v-for="col in props.cols"
|
||||||
|
:key="col.name"
|
||||||
|
:props="props"
|
||||||
|
>
|
||||||
{{ t(col.label) }}
|
{{ t(col.label) }}
|
||||||
<QTooltip v-if="col.tooltip">{{ col.tooltip }}</QTooltip>
|
<QTooltip v-if="col.tooltip">{{
|
||||||
|
col.tooltip
|
||||||
|
}}</QTooltip>
|
||||||
</QTh>
|
</QTh>
|
||||||
</QTr>
|
</QTr>
|
||||||
</template>
|
</template>
|
||||||
|
@ -244,17 +286,33 @@ const onFetch = (data) => {
|
||||||
<QTd :props="props">
|
<QTd :props="props">
|
||||||
<QTr :props="props" class="cursor-pointer">
|
<QTr :props="props" class="cursor-pointer">
|
||||||
<component
|
<component
|
||||||
:is="tableColumnComponents[props.col.name].component"
|
:is="
|
||||||
|
tableColumnComponents[props.col.name]
|
||||||
|
.component
|
||||||
|
"
|
||||||
class="col-content"
|
class="col-content"
|
||||||
v-bind="tableColumnComponents[props.col.name].props(props)"
|
v-bind="
|
||||||
@click="tableColumnComponents[props.col.name].event(props)"
|
tableColumnComponents[props.col.name].props(
|
||||||
|
props
|
||||||
|
)
|
||||||
|
"
|
||||||
|
@click="
|
||||||
|
tableColumnComponents[props.col.name].event(
|
||||||
|
props
|
||||||
|
)
|
||||||
|
"
|
||||||
>
|
>
|
||||||
<template v-if="props.col.name !== 'isWorker'">
|
<template v-if="props.col.name !== 'isWorker'">
|
||||||
<div v-if="props.col.name === 'lastObservation'">
|
<div
|
||||||
|
v-if="
|
||||||
|
props.col.name === 'lastObservation'
|
||||||
|
"
|
||||||
|
>
|
||||||
<VnInput
|
<VnInput
|
||||||
type="textarea"
|
type="textarea"
|
||||||
v-model="props.value"
|
v-model="props.value"
|
||||||
autogrow
|
autogrow
|
||||||
|
:disable="true"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div v-else>{{ props.value }}</div>
|
<div v-else>{{ props.value }}</div>
|
||||||
|
@ -277,6 +335,9 @@ const onFetch = (data) => {
|
||||||
</QTd>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
</QTable>
|
</QTable>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</VnPaginate>
|
||||||
</QPage>
|
</QPage>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
@ -289,6 +350,7 @@ const onFetch = (data) => {
|
||||||
|
|
||||||
<i18n>
|
<i18n>
|
||||||
es:
|
es:
|
||||||
|
Add observation: Añadir observación
|
||||||
Client: Cliente
|
Client: Cliente
|
||||||
Is worker: Es trabajador
|
Is worker: Es trabajador
|
||||||
Salesperson: Comercial
|
Salesperson: Comercial
|
||||||
|
|
|
@ -61,13 +61,11 @@ const onSubmit = async () => {
|
||||||
}}
|
}}
|
||||||
</div>
|
</div>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QInput
|
<QInput
|
||||||
:label="t('Message')"
|
:label="t('Message')"
|
||||||
type="textarea"
|
type="textarea"
|
||||||
v-model="newObservation"
|
v-model="newObservation"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<div class="q-mt-lg row justify-end">
|
<div class="q-mt-lg row justify-end">
|
||||||
<QBtn
|
<QBtn
|
||||||
|
|
|
@ -57,7 +57,7 @@ const authors = ref();
|
||||||
hide-selected
|
hide-selected
|
||||||
map-options
|
map-options
|
||||||
option-label="name"
|
option-label="name"
|
||||||
option-value="clientTypeFk"
|
option-value="id"
|
||||||
outlined
|
outlined
|
||||||
rounded
|
rounded
|
||||||
use-input
|
use-input
|
||||||
|
@ -162,7 +162,7 @@ const authors = ref();
|
||||||
|
|
||||||
<QItem class="q-mb-sm">
|
<QItem class="q-mb-sm">
|
||||||
<QItemSection>
|
<QItemSection>
|
||||||
<VnInput
|
<VnInputDate
|
||||||
:label="t('L. O. Date')"
|
:label="t('L. O. Date')"
|
||||||
clearable
|
clearable
|
||||||
is-outlined
|
is-outlined
|
||||||
|
|
|
@ -10,7 +10,7 @@ import CustomerExtendedListActions from './CustomerExtendedListActions.vue';
|
||||||
import CustomerExtendedListFilter from './CustomerExtendedListFilter.vue';
|
import CustomerExtendedListFilter from './CustomerExtendedListFilter.vue';
|
||||||
import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
|
import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
|
||||||
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
||||||
|
import VnPaginate from 'src/components/ui/VnPaginate.vue';
|
||||||
import { useArrayData } from 'composables/useArrayData';
|
import { useArrayData } from 'composables/useArrayData';
|
||||||
import { useStateStore } from 'stores/useStateStore';
|
import { useStateStore } from 'stores/useStateStore';
|
||||||
import { toDate } from 'src/filters';
|
import { toDate } from 'src/filters';
|
||||||
|
@ -37,8 +37,6 @@ onMounted(() => {
|
||||||
allColumnNames.value = filteredColumns.map((col) => col.name);
|
allColumnNames.value = filteredColumns.map((col) => col.name);
|
||||||
});
|
});
|
||||||
|
|
||||||
const rows = computed(() => arrayData.value.store.data);
|
|
||||||
|
|
||||||
const selectedCustomerId = ref(0);
|
const selectedCustomerId = ref(0);
|
||||||
const selectedSalesPersonId = ref(0);
|
const selectedSalesPersonId = ref(0);
|
||||||
const allColumnNames = ref([]);
|
const allColumnNames = ref([]);
|
||||||
|
@ -70,6 +68,11 @@ const tableColumnComponents = {
|
||||||
props: () => {},
|
props: () => {},
|
||||||
event: () => {},
|
event: () => {},
|
||||||
},
|
},
|
||||||
|
socialName: {
|
||||||
|
component: 'span',
|
||||||
|
props: () => {},
|
||||||
|
event: () => {},
|
||||||
|
},
|
||||||
fi: {
|
fi: {
|
||||||
component: 'span',
|
component: 'span',
|
||||||
props: () => {},
|
props: () => {},
|
||||||
|
@ -283,6 +286,12 @@ const columns = computed(() => [
|
||||||
label: t('customer.extendedList.tableVisibleColumns.name'),
|
label: t('customer.extendedList.tableVisibleColumns.name'),
|
||||||
name: 'name',
|
name: 'name',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
align: 'left',
|
||||||
|
field: 'socialName',
|
||||||
|
label: t('customer.extendedList.tableVisibleColumns.socialName'),
|
||||||
|
name: 'socialName',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
field: 'fi',
|
field: 'fi',
|
||||||
|
@ -485,6 +494,23 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
<template v-if="stateStore.isHeaderMounted()">
|
||||||
|
<Teleport to="#actions-append">
|
||||||
|
<div class="row q-gutter-x-sm">
|
||||||
|
<QBtn
|
||||||
|
flat
|
||||||
|
@click="stateStore.toggleRightDrawer()"
|
||||||
|
round
|
||||||
|
dense
|
||||||
|
icon="menu"
|
||||||
|
>
|
||||||
|
<QTooltip bottom anchor="bottom right">
|
||||||
|
{{ t('globals.collapseMenu') }}
|
||||||
|
</QTooltip>
|
||||||
|
</QBtn>
|
||||||
|
</div>
|
||||||
|
</Teleport></template
|
||||||
|
>
|
||||||
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
|
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
|
||||||
<QScrollArea class="fit text-grey-8">
|
<QScrollArea class="fit text-grey-8">
|
||||||
<CustomerExtendedListFilter
|
<CustomerExtendedListFilter
|
||||||
|
@ -495,7 +521,7 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
|
||||||
</QScrollArea>
|
</QScrollArea>
|
||||||
</QDrawer>
|
</QDrawer>
|
||||||
<VnSubToolbar>
|
<VnSubToolbar>
|
||||||
<template #st-actions>
|
<template #st-data>
|
||||||
<TableVisibleColumns
|
<TableVisibleColumns
|
||||||
:all-columns="allColumnNames"
|
:all-columns="allColumnNames"
|
||||||
table-code="clientsDetail"
|
table-code="clientsDetail"
|
||||||
|
@ -508,6 +534,13 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
|
||||||
</VnSubToolbar>
|
</VnSubToolbar>
|
||||||
|
|
||||||
<QPage class="column items-center q-pa-md">
|
<QPage class="column items-center q-pa-md">
|
||||||
|
<VnPaginate
|
||||||
|
data-key="CustomerExtendedList"
|
||||||
|
url="Clients/extendedListFilter"
|
||||||
|
auto-load
|
||||||
|
>
|
||||||
|
<template #body="{ rows }">
|
||||||
|
<div class="q-pa-md">
|
||||||
<QTable
|
<QTable
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:rows="rows"
|
:rows="rows"
|
||||||
|
@ -521,13 +554,32 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
|
||||||
{{ value }}
|
{{ value }}
|
||||||
</QTd>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
|
<template #body-cell-customerStatus="props">
|
||||||
|
<QTd @click="stopEventPropagation($event, props.col)">
|
||||||
|
<component
|
||||||
|
:is="tableColumnComponents[props.col.name].component"
|
||||||
|
class="col-content"
|
||||||
|
v-bind="
|
||||||
|
tableColumnComponents[props.col.name].props(props)
|
||||||
|
"
|
||||||
|
@click="
|
||||||
|
tableColumnComponents[props.col.name].event(props)
|
||||||
|
"
|
||||||
|
>
|
||||||
|
</component>
|
||||||
|
</QTd>
|
||||||
|
</template>
|
||||||
<template #body-cell-id="props">
|
<template #body-cell-id="props">
|
||||||
<QTd @click="stopEventPropagation($event, props.col)">
|
<QTd @click="stopEventPropagation($event, props.col)">
|
||||||
<component
|
<component
|
||||||
:is="tableColumnComponents[props.col.name].component"
|
:is="tableColumnComponents[props.col.name].component"
|
||||||
class="col-content"
|
class="col-content"
|
||||||
v-bind="tableColumnComponents[props.col.name].props(props)"
|
v-bind="
|
||||||
@click="tableColumnComponents[props.col.name].event(props)"
|
tableColumnComponents[props.col.name].props(props)
|
||||||
|
"
|
||||||
|
@click="
|
||||||
|
tableColumnComponents[props.col.name].event(props)
|
||||||
|
"
|
||||||
>
|
>
|
||||||
<CustomerDescriptorProxy :id="props.row.id" />
|
<CustomerDescriptorProxy :id="props.row.id" />
|
||||||
{{ props.row.id }}
|
{{ props.row.id }}
|
||||||
|
@ -540,10 +592,16 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
|
||||||
v-if="props.row.salesPerson"
|
v-if="props.row.salesPerson"
|
||||||
class="col-content"
|
class="col-content"
|
||||||
:is="tableColumnComponents[props.col.name].component"
|
:is="tableColumnComponents[props.col.name].component"
|
||||||
v-bind="tableColumnComponents[props.col.name].props(props)"
|
v-bind="
|
||||||
@click="tableColumnComponents[props.col.name].event(props)"
|
tableColumnComponents[props.col.name].props(props)
|
||||||
|
"
|
||||||
|
@click="
|
||||||
|
tableColumnComponents[props.col.name].event(props)
|
||||||
|
"
|
||||||
>
|
>
|
||||||
<WorkerDescriptorProxy :id="props.row.salesPersonFk" />
|
<WorkerDescriptorProxy
|
||||||
|
:id="props.row.salesPersonFk"
|
||||||
|
/>
|
||||||
{{ props.row.salesPerson }}
|
{{ props.row.salesPerson }}
|
||||||
</component>
|
</component>
|
||||||
<span class="col-content" v-else>-</span>
|
<span class="col-content" v-else>-</span>
|
||||||
|
@ -554,12 +612,19 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
|
||||||
<component
|
<component
|
||||||
:is="tableColumnComponents[props.col.name].component"
|
:is="tableColumnComponents[props.col.name].component"
|
||||||
class="col-content"
|
class="col-content"
|
||||||
v-bind="tableColumnComponents[props.col.name].props(props)"
|
v-bind="
|
||||||
@click="tableColumnComponents[props.col.name].event(props)"
|
tableColumnComponents[props.col.name].props(props)
|
||||||
|
"
|
||||||
|
@click="
|
||||||
|
tableColumnComponents[props.col.name].event(props)
|
||||||
|
"
|
||||||
/>
|
/>
|
||||||
</QTd>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
</QTable>
|
</QTable>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</VnPaginate>
|
||||||
</QPage>
|
</QPage>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
|
@ -1,17 +1,16 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, computed } from 'vue';
|
import { ref, computed } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
import { QBtn } from 'quasar';
|
import { QBtn } from 'quasar';
|
||||||
|
|
||||||
import FetchData from 'components/FetchData.vue';
|
|
||||||
import CustomerNotificationsFilter from './CustomerNotificationsFilter.vue';
|
import CustomerNotificationsFilter from './CustomerNotificationsFilter.vue';
|
||||||
import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
|
import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
|
||||||
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
||||||
|
import { useStateStore } from 'stores/useStateStore';
|
||||||
|
import VnPaginate from 'src/components/ui/VnPaginate.vue';
|
||||||
|
import CustomerNotificationsCampaignConsumption from './CustomerNotificationsCampaignConsumption.vue';
|
||||||
|
|
||||||
|
const stateStore = useStateStore();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
const rows = ref([]);
|
|
||||||
const selected = ref([]);
|
const selected = ref([]);
|
||||||
const selectedCustomerId = ref(0);
|
const selectedCustomerId = ref(0);
|
||||||
|
|
||||||
|
@ -82,22 +81,42 @@ const selectCustomerId = (id) => {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<FetchData
|
<template v-if="stateStore.isHeaderMounted()">
|
||||||
:filter="filter"
|
<Teleport to="#actions-append">
|
||||||
@on-fetch="(data) => (rows = data)"
|
<div class="row q-gutter-x-sm">
|
||||||
auto-load
|
<QBtn
|
||||||
url="Clients"
|
flat
|
||||||
/>
|
@click="stateStore.toggleRightDrawer()"
|
||||||
|
round
|
||||||
|
dense
|
||||||
|
icon="menu"
|
||||||
|
>
|
||||||
|
<QTooltip bottom anchor="bottom right">
|
||||||
|
{{ t('globals.collapseMenu') }}
|
||||||
|
</QTooltip>
|
||||||
|
</QBtn>
|
||||||
|
</div>
|
||||||
|
</Teleport>
|
||||||
|
</template>
|
||||||
|
|
||||||
<QDrawer side="right" :width="256" show-if-above>
|
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
|
||||||
<QScrollArea class="fit text-grey-8">
|
<QScrollArea class="fit text-grey-8">
|
||||||
<CustomerNotificationsFilter data-key="CustomerNotifications" />
|
<CustomerNotificationsFilter data-key="CustomerNotifications" />
|
||||||
</QScrollArea>
|
</QScrollArea>
|
||||||
</QDrawer>
|
</QDrawer>
|
||||||
|
<VnSubToolbar class="justify-end">
|
||||||
<VnSubToolbar />
|
<template #st-data>
|
||||||
|
<CustomerNotificationsCampaignConsumption
|
||||||
|
:selected-rows="selected.length > 0"
|
||||||
|
:clients="selected"
|
||||||
|
:promise="refreshData"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</VnSubToolbar>
|
||||||
<QPage class="column items-center q-pa-md">
|
<QPage class="column items-center q-pa-md">
|
||||||
|
<VnPaginate data-key="CustomerNotifications" url="Clients" auto-load>
|
||||||
|
<template #body="{ rows }">
|
||||||
|
<div class="q-pa-md">
|
||||||
<QTable
|
<QTable
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:rows="rows"
|
:rows="rows"
|
||||||
|
@ -110,18 +129,34 @@ const selectCustomerId = (id) => {
|
||||||
<QTd :props="props">
|
<QTd :props="props">
|
||||||
<QTr :props="props" class="cursor-pointer">
|
<QTr :props="props" class="cursor-pointer">
|
||||||
<component
|
<component
|
||||||
:is="tableColumnComponents[props.col.name].component"
|
:is="
|
||||||
|
tableColumnComponents[props.col.name]
|
||||||
|
.component
|
||||||
|
"
|
||||||
class="col-content"
|
class="col-content"
|
||||||
v-bind="tableColumnComponents[props.col.name].props(props)"
|
v-bind="
|
||||||
@click="tableColumnComponents[props.col.name].event(props)"
|
tableColumnComponents[props.col.name].props(
|
||||||
|
props
|
||||||
|
)
|
||||||
|
"
|
||||||
|
@click="
|
||||||
|
tableColumnComponents[props.col.name].event(
|
||||||
|
props
|
||||||
|
)
|
||||||
|
"
|
||||||
>
|
>
|
||||||
{{ props.value }}
|
{{ props.value }}
|
||||||
<CustomerDescriptorProxy :id="selectedCustomerId" />
|
<CustomerDescriptorProxy
|
||||||
|
:id="selectedCustomerId"
|
||||||
|
/>
|
||||||
</component>
|
</component>
|
||||||
</QTr>
|
</QTr>
|
||||||
</QTd>
|
</QTd>
|
||||||
</template>
|
</template>
|
||||||
</QTable>
|
</QTable>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</VnPaginate>
|
||||||
</QPage>
|
</QPage>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
@ -140,4 +175,5 @@ es:
|
||||||
Phone: Teléfono
|
Phone: Teléfono
|
||||||
City: Población
|
City: Población
|
||||||
Email: Email
|
Email: Email
|
||||||
|
Campaign consumption: Consumo campaña
|
||||||
</i18n>
|
</i18n>
|
||||||
|
|
|
@ -0,0 +1,152 @@
|
||||||
|
<script setup>
|
||||||
|
import { ref, toRefs } from 'vue';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
import axios from 'axios';
|
||||||
|
import useNotify from 'src/composables/useNotify';
|
||||||
|
import { useValidator } from 'src/composables/useValidator';
|
||||||
|
import VnRow from 'components/ui/VnRow.vue';
|
||||||
|
import VnSelect from 'components/common/VnSelect.vue';
|
||||||
|
import VnInputDate from 'components/common/VnInputDate.vue';
|
||||||
|
import FetchData from 'src/components/FetchData.vue';
|
||||||
|
import { watch } from 'vue';
|
||||||
|
import { onMounted } from 'vue';
|
||||||
|
const $props = defineProps({
|
||||||
|
clients: {
|
||||||
|
type: Array,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
promise: {
|
||||||
|
type: Function,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
selectedRows: {
|
||||||
|
type: Boolean,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const { selectedRows } = toRefs($props);
|
||||||
|
const { notify } = useNotify();
|
||||||
|
const { t } = useI18n();
|
||||||
|
const validationsStore = useValidator();
|
||||||
|
const campaignParams = ref(null);
|
||||||
|
const campaignsOptions = ref(null);
|
||||||
|
const moreFields = ref([]);
|
||||||
|
const popupProxyRef = ref(null);
|
||||||
|
const upcomingOptions = ref(null);
|
||||||
|
const campaignChange = ({ name }) => {
|
||||||
|
const campaign = campaignsOptions.value.find((c) => c.code === name);
|
||||||
|
handleDates(campaign);
|
||||||
|
};
|
||||||
|
const handleDates = (campaign) => {
|
||||||
|
const from = new Date(campaign.dated);
|
||||||
|
from.setDate(from.getDate() - campaign.scopeDays);
|
||||||
|
campaignParams.value = {
|
||||||
|
code: campaign.code,
|
||||||
|
from: from,
|
||||||
|
to: campaign.dated,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
watch(selectedRows, () => {
|
||||||
|
handleDates(upcomingOptions.value);
|
||||||
|
});
|
||||||
|
const onSubmit = async () => {
|
||||||
|
try {
|
||||||
|
const data = {
|
||||||
|
clients: $props.clients.map((item) => item.id),
|
||||||
|
from: campaignParams.value.from,
|
||||||
|
to: campaignParams.value.to,
|
||||||
|
};
|
||||||
|
const params = JSON.stringify(data);
|
||||||
|
await axios.post('ClientConsumptionQueues', { params });
|
||||||
|
|
||||||
|
notify('globals.dataSaved', 'positive');
|
||||||
|
popupProxyRef.value.hide();
|
||||||
|
} catch (error) {
|
||||||
|
notify(error.message, 'negative');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
onMounted(async () => {
|
||||||
|
const { models } = validationsStore;
|
||||||
|
const properties = models.Item?.properties || {};
|
||||||
|
const _moreFields = ['valentinesDay', 'mothersDay', 'allSaints'];
|
||||||
|
|
||||||
|
_moreFields.forEach((field) => {
|
||||||
|
let prop = properties[field];
|
||||||
|
const label = t(`params.${field}`);
|
||||||
|
moreFields.value.push({
|
||||||
|
name: field,
|
||||||
|
label,
|
||||||
|
type: prop ? prop.type : null,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<FetchData
|
||||||
|
url="Campaigns/latest"
|
||||||
|
@on-fetch="(data) => (campaignsOptions = data)"
|
||||||
|
:filter="{ fields: ['id', 'code', 'dated'], order: 'code ASC', limit: 30 }"
|
||||||
|
auto-load
|
||||||
|
/>
|
||||||
|
<FetchData
|
||||||
|
url="Campaigns/upcoming"
|
||||||
|
@on-fetch="(data) => (upcomingOptions = data)"
|
||||||
|
auto-load
|
||||||
|
/>
|
||||||
|
<QBtn color="primary" icon="show_chart" :disable="!selectedRows">
|
||||||
|
<QPopupProxy ref="popupProxyRef">
|
||||||
|
<QCard class="column q-pa-md">
|
||||||
|
<span class="text-body1 q-mb-sm">{{ t('Campaign consumption') }}</span>
|
||||||
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
|
<VnSelect
|
||||||
|
:options="moreFields"
|
||||||
|
option-value="code"
|
||||||
|
option-label="label"
|
||||||
|
v-model="campaignParams.code"
|
||||||
|
:label="t('Campaign')"
|
||||||
|
@update:model-value="campaignChange"
|
||||||
|
/>
|
||||||
|
</VnRow>
|
||||||
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
|
<VnInputDate v-model="campaignParams.from" :label="t('From')" />
|
||||||
|
<VnInputDate v-model="campaignParams.to" :label="t('To')" />
|
||||||
|
</VnRow>
|
||||||
|
<div class="q-mt-lg row justify-end">
|
||||||
|
<QBtn
|
||||||
|
:label="t('globals.cancel')"
|
||||||
|
color="primary"
|
||||||
|
flat
|
||||||
|
class="q-mr-md"
|
||||||
|
v-close-popup
|
||||||
|
/>
|
||||||
|
<QBtn
|
||||||
|
:label="t('globals.save')"
|
||||||
|
type="submit"
|
||||||
|
color="primary"
|
||||||
|
@click="onSubmit()"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</QCard>
|
||||||
|
</QPopupProxy>
|
||||||
|
<QTooltip>{{ t('Campaign consumption') }}</QTooltip>
|
||||||
|
</QBtn>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<i18n>
|
||||||
|
en:
|
||||||
|
params:
|
||||||
|
valentinesDay: Valentine's Day
|
||||||
|
mothersDay: Mother's Day
|
||||||
|
allSaints: All Saints' Day
|
||||||
|
es:
|
||||||
|
params:
|
||||||
|
valentinesDay: Día de San Valentín
|
||||||
|
mothersDay: Día de la Madre
|
||||||
|
allSaints: Día de Todos los Santos
|
||||||
|
Campaign consumption: Consumo campaña
|
||||||
|
Campaign: Campaña
|
||||||
|
From: Desde
|
||||||
|
To: Hasta
|
||||||
|
</i18n>
|
|
@ -110,13 +110,7 @@ function stateColor(row) {
|
||||||
</div>
|
</div>
|
||||||
</Teleport>
|
</Teleport>
|
||||||
</template>
|
</template>
|
||||||
<QDrawer
|
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
|
||||||
v-model="stateStore.rightDrawer"
|
|
||||||
side="right"
|
|
||||||
:width="256"
|
|
||||||
show-if-above
|
|
||||||
:breakpoint="1600"
|
|
||||||
>
|
|
||||||
<QScrollArea class="fit text-grey-8">
|
<QScrollArea class="fit text-grey-8">
|
||||||
<CustomerPaymentsFilter data-key="CustomerTransactions" />
|
<CustomerPaymentsFilter data-key="CustomerTransactions" />
|
||||||
</QScrollArea>
|
</QScrollArea>
|
||||||
|
|
|
@ -11,7 +11,6 @@ import VnRow from 'components/ui/VnRow.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 VnSelect from 'src/components/common/VnSelect.vue';
|
||||||
import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
|
import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
|
||||||
import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
|
|
||||||
import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
|
import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
|
@ -11,7 +11,6 @@ import VnRow from 'components/ui/VnRow.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 VnSelect from 'src/components/common/VnSelect.vue';
|
||||||
import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
|
import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
|
||||||
import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
|
|
||||||
import CustomsNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
|
import CustomsNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
|
@ -56,24 +56,17 @@ const toCustomerGreuges = () => {
|
||||||
|
|
||||||
<template #form="{ data }">
|
<template #form="{ data }">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('Amount')"
|
:label="t('Amount')"
|
||||||
clearable
|
clearable
|
||||||
type="number"
|
type="number"
|
||||||
v-model="data.amount"
|
v-model="data.amount"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnInputDate :label="t('Date')" v-model="data.shipped" />
|
<VnInputDate :label="t('Date')" v-model="data.shipped" />
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput :label="t('Comment')" clearable v-model="data.description" />
|
<VnInput :label="t('Comment')" clearable v-model="data.description" />
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Type')"
|
:label="t('Type')"
|
||||||
:options="greugeTypes"
|
:options="greugeTypes"
|
||||||
|
@ -82,7 +75,6 @@ const toCustomerGreuges = () => {
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="data.greugeTypeFk"
|
v-model="data.greugeTypeFk"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
</template>
|
</template>
|
||||||
</FormModel>
|
</FormModel>
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { reactive } from 'vue';
|
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
import VnRow from 'components/ui/VnRow.vue';
|
import VnRow from 'components/ui/VnRow.vue';
|
||||||
|
@ -24,30 +23,22 @@ const onDataSaved = (dataSaved) => {
|
||||||
>
|
>
|
||||||
<template #form-inputs="{ data }">
|
<template #form-inputs="{ data }">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('NIF')"
|
:label="t('NIF')"
|
||||||
:required="true"
|
:required="true"
|
||||||
clearable
|
clearable
|
||||||
v-model="data.nif"
|
v-model="data.nif"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('Fiscal name')"
|
:label="t('Fiscal name')"
|
||||||
:required="true"
|
:required="true"
|
||||||
clearable
|
clearable
|
||||||
v-model="data.fiscalName"
|
v-model="data.fiscalName"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput :label="t('Street')" clearable v-model="data.street" />
|
<VnInput :label="t('Street')" clearable v-model="data.street" />
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnInput :label="t('Phone')" clearable v-model="data.phone" />
|
<VnInput :label="t('Phone')" clearable v-model="data.phone" />
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
</template>
|
</template>
|
||||||
</FormModelPopup>
|
</FormModelPopup>
|
||||||
|
|
|
@ -135,14 +135,11 @@ const onDataSaved = async () => {
|
||||||
<h5 class="q-mt-none">{{ t('New payment') }}</h5>
|
<h5 class="q-mt-none">{{ t('New payment') }}</h5>
|
||||||
|
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInputDate
|
<VnInputDate
|
||||||
:label="t('Date')"
|
:label="t('Date')"
|
||||||
:required="true"
|
:required="true"
|
||||||
v-model="data.payed"
|
v-model="data.payed"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Company')"
|
:label="t('Company')"
|
||||||
:options="companyOptions"
|
:options="companyOptions"
|
||||||
|
@ -153,11 +150,9 @@ const onDataSaved = async () => {
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="data.companyFk"
|
v-model="data.companyFk"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Bank')"
|
:label="t('Bank')"
|
||||||
:options="bankOptions"
|
:options="bankOptions"
|
||||||
|
@ -178,8 +173,6 @@ const onDataSaved = async () => {
|
||||||
</QItem>
|
</QItem>
|
||||||
</template>
|
</template>
|
||||||
</VnSelect>
|
</VnSelect>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('Amount')"
|
:label="t('Amount')"
|
||||||
:required="true"
|
:required="true"
|
||||||
|
@ -188,7 +181,6 @@ const onDataSaved = async () => {
|
||||||
type="number"
|
type="number"
|
||||||
v-model.number="data.amountPaid"
|
v-model.number="data.amountPaid"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
||||||
<div class="text-h6" v-if="data.bankFk === 3 || data.bankFk === 3117">
|
<div class="text-h6" v-if="data.bankFk === 3 || data.bankFk === 3117">
|
||||||
|
@ -203,21 +195,18 @@ const onDataSaved = async () => {
|
||||||
v-model="data.compensationAccount"
|
v-model="data.compensationAccount"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('Reference')"
|
:label="t('Reference')"
|
||||||
:required="true"
|
:required="true"
|
||||||
clearable
|
clearable
|
||||||
v-model="data.description"
|
v-model="data.description"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
||||||
<div class="q-mt-lg" v-if="data.bankFk === 2">
|
<div class="q-mt-lg" v-if="data.bankFk === 2">
|
||||||
<div class="text-h6">{{ t('Cash') }}</div>
|
<div class="text-h6">{{ t('Cash') }}</div>
|
||||||
|
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('Delivered amount')"
|
:label="t('Delivered amount')"
|
||||||
@update:model-value="calculateFromDeliveredAmount($event)"
|
@update:model-value="calculateFromDeliveredAmount($event)"
|
||||||
|
@ -225,8 +214,6 @@ const onDataSaved = async () => {
|
||||||
type="number"
|
type="number"
|
||||||
v-model="deliveredAmount"
|
v-model="deliveredAmount"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('Amount to return')"
|
:label="t('Amount to return')"
|
||||||
clearable
|
clearable
|
||||||
|
@ -234,16 +221,11 @@ const onDataSaved = async () => {
|
||||||
type="number"
|
type="number"
|
||||||
v-model="amountToReturn"
|
v-model="amountToReturn"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QCheckbox v-model="viewRecipt" />
|
<QCheckbox v-model="viewRecipt" />
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QCheckbox v-model="sendEmail" />
|
<QCheckbox v-model="sendEmail" />
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -45,9 +45,7 @@ const toCustomerNotes = () => {
|
||||||
|
|
||||||
<template #form="{ data }">
|
<template #form="{ data }">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QInput :label="t('Note')" type="textarea" v-model="data.text" />
|
<QInput :label="t('Note')" type="textarea" v-model="data.text" />
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
</template>
|
</template>
|
||||||
</FormModel>
|
</FormModel>
|
||||||
|
|
|
@ -50,31 +50,23 @@ const toCustomerRecoveries = () => {
|
||||||
|
|
||||||
<template #form="{ data }">
|
<template #form="{ data }">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInputDate :label="t('Since')" v-model="data.started" />
|
<VnInputDate :label="t('Since')" v-model="data.started" />
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnInputDate :label="t('To')" v-model="data.finished" />
|
<VnInputDate :label="t('To')" v-model="data.finished" />
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('Amount')"
|
:label="t('Amount')"
|
||||||
clearable
|
clearable
|
||||||
type="number"
|
type="number"
|
||||||
v-model="data.amount"
|
v-model="data.amount"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('Period')"
|
:label="t('Period')"
|
||||||
clearable
|
clearable
|
||||||
type="number"
|
type="number"
|
||||||
v-model="data.period"
|
v-model="data.period"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
</template>
|
</template>
|
||||||
</FormModel>
|
</FormModel>
|
||||||
|
|
|
@ -30,7 +30,6 @@ const clientsOptions = ref([]);
|
||||||
>
|
>
|
||||||
<template #form="{ data, validate }">
|
<template #form="{ data, validate }">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('department.name')"
|
:label="t('department.name')"
|
||||||
v-model="data.name"
|
v-model="data.name"
|
||||||
|
@ -38,36 +37,28 @@ const clientsOptions = ref([]);
|
||||||
clearable
|
clearable
|
||||||
autofocus
|
autofocus
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
v-model="data.code"
|
v-model="data.code"
|
||||||
:label="t('department.code')"
|
:label="t('department.code')"
|
||||||
:rules="validate('department.code')"
|
:rules="validate('department.code')"
|
||||||
clearable
|
clearable
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('department.chat')"
|
:label="t('department.chat')"
|
||||||
v-model="data.chatName"
|
v-model="data.chatName"
|
||||||
:rules="validate('department.chat')"
|
:rules="validate('department.chat')"
|
||||||
clearable
|
clearable
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
v-model="data.notificationEmail"
|
v-model="data.notificationEmail"
|
||||||
:label="t('department.email')"
|
:label="t('department.email')"
|
||||||
:rules="validate('department.email')"
|
:rules="validate('department.email')"
|
||||||
clearable
|
clearable
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('department.bossDepartment')"
|
:label="t('department.bossDepartment')"
|
||||||
v-model="data.workerFk"
|
v-model="data.workerFk"
|
||||||
|
@ -78,8 +69,6 @@ const clientsOptions = ref([]);
|
||||||
map-options
|
map-options
|
||||||
:rules="validate('department.workerFk')"
|
:rules="validate('department.workerFk')"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('department.selfConsumptionCustomer')"
|
:label="t('department.selfConsumptionCustomer')"
|
||||||
v-model="data.clientFk"
|
v-model="data.clientFk"
|
||||||
|
@ -90,45 +79,34 @@ const clientsOptions = ref([]);
|
||||||
map-options
|
map-options
|
||||||
:rules="validate('department.clientFk')"
|
:rules="validate('department.clientFk')"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QCheckbox
|
<QCheckbox
|
||||||
:label="t('department.telework')"
|
:label="t('department.telework')"
|
||||||
v-model="data.isTeleworking"
|
v-model="data.isTeleworking"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QCheckbox
|
<QCheckbox
|
||||||
:label="t('department.notifyOnErrors')"
|
:label="t('department.notifyOnErrors')"
|
||||||
v-model="data.hasToMistake"
|
v-model="data.hasToMistake"
|
||||||
:false-value="0"
|
:false-value="0"
|
||||||
:true-value="1"
|
:true-value="1"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QCheckbox
|
<QCheckbox
|
||||||
:label="t('department.worksInProduction')"
|
:label="t('department.worksInProduction')"
|
||||||
v-model="data.isProduction"
|
v-model="data.isProduction"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QCheckbox
|
<QCheckbox
|
||||||
:label="t('department.hasToRefill')"
|
:label="t('department.hasToRefill')"
|
||||||
v-model="data.hasToRefill"
|
v-model="data.hasToRefill"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QCheckbox
|
<QCheckbox
|
||||||
:label="t('department.hasToSendMail')"
|
:label="t('department.hasToSendMail')"
|
||||||
v-model="data.hasToSendMail"
|
v-model="data.hasToSendMail"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
</template>
|
</template>
|
||||||
</FormModel>
|
</FormModel>
|
||||||
|
|
|
@ -3,7 +3,7 @@ import { computed, ref } from 'vue';
|
||||||
import { useRoute, useRouter } from 'vue-router';
|
import { useRoute, useRouter } from 'vue-router';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useQuasar } from 'quasar';
|
import { useQuasar } from 'quasar';
|
||||||
|
import { useVnConfirm } from 'composables/useVnConfirm';
|
||||||
import VnLv from 'src/components/ui/VnLv.vue';
|
import VnLv from 'src/components/ui/VnLv.vue';
|
||||||
import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
|
import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
|
||||||
import useCardDescription from 'src/composables/useCardDescription';
|
import useCardDescription from 'src/composables/useCardDescription';
|
||||||
|
@ -43,30 +43,17 @@ const setData = (entity) => {
|
||||||
data.value = useCardDescription(entity.name, entity.id);
|
data.value = useCardDescription(entity.name, entity.id);
|
||||||
};
|
};
|
||||||
|
|
||||||
const removeDepartment = () => {
|
const removeDepartment = async () => {
|
||||||
quasar
|
|
||||||
.dialog({
|
|
||||||
title: 'Are you sure you want to delete it?',
|
|
||||||
message: 'Delete department',
|
|
||||||
ok: {
|
|
||||||
push: true,
|
|
||||||
color: 'primary',
|
|
||||||
},
|
|
||||||
cancel: true,
|
|
||||||
})
|
|
||||||
.onOk(async () => {
|
|
||||||
try {
|
try {
|
||||||
await axios.post(
|
await axios.post(`/Departments/${entityId.value}/removeChild`, entityId.value);
|
||||||
`/Departments/${entityId.value}/removeChild`,
|
|
||||||
entityId.value
|
|
||||||
);
|
|
||||||
router.push({ name: 'WorkerDepartment' });
|
router.push({ name: 'WorkerDepartment' });
|
||||||
notify('department.departmentRemoved', 'positive');
|
notify('department.departmentRemoved', 'positive');
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('Error removing department');
|
console.error('Error removing department');
|
||||||
}
|
}
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const { openConfirmationModal } = useVnConfirm();
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<CardDescriptor
|
<CardDescriptor
|
||||||
|
@ -84,7 +71,17 @@ const removeDepartment = () => {
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
<template #menu="{}">
|
<template #menu="{}">
|
||||||
<QItem v-ripple clickable @click="removeDepartment()">
|
<QItem
|
||||||
|
v-ripple
|
||||||
|
clickable
|
||||||
|
@click="
|
||||||
|
openConfirmationModal(
|
||||||
|
t('Are you sure you want to delete it?'),
|
||||||
|
t('Delete department'),
|
||||||
|
removeDepartment
|
||||||
|
)
|
||||||
|
"
|
||||||
|
>
|
||||||
<QItemSection>{{ t('Delete') }}</QItemSection>
|
<QItemSection>{{ t('Delete') }}</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -68,7 +68,6 @@ const onFilterTravelSelected = (formData, id) => {
|
||||||
>
|
>
|
||||||
<template #form="{ data }">
|
<template #form="{ data }">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('entry.basicData.supplier')"
|
:label="t('entry.basicData.supplier')"
|
||||||
v-model="data.supplierFk"
|
v-model="data.supplierFk"
|
||||||
|
@ -90,8 +89,6 @@ const onFilterTravelSelected = (formData, id) => {
|
||||||
</QItem>
|
</QItem>
|
||||||
</template>
|
</template>
|
||||||
</VnSelect>
|
</VnSelect>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnSelectDialog
|
<VnSelectDialog
|
||||||
:label="t('entry.basicData.travel')"
|
:label="t('entry.basicData.travel')"
|
||||||
v-model="data.travelFk"
|
v-model="data.travelFk"
|
||||||
|
@ -123,24 +120,18 @@ const onFilterTravelSelected = (formData, id) => {
|
||||||
</QItem>
|
</QItem>
|
||||||
</template>
|
</template>
|
||||||
</VnSelectDialog>
|
</VnSelectDialog>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
v-model="data.reference"
|
v-model="data.reference"
|
||||||
:label="t('entry.basicData.reference')"
|
:label="t('entry.basicData.reference')"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
v-model="data.invoiceNumber"
|
v-model="data.invoiceNumber"
|
||||||
:label="t('entry.basicData.invoiceNumber')"
|
:label="t('entry.basicData.invoiceNumber')"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('entry.basicData.company')"
|
:label="t('entry.basicData.company')"
|
||||||
v-model="data.companyFk"
|
v-model="data.companyFk"
|
||||||
|
@ -151,10 +142,8 @@ const onFilterTravelSelected = (formData, id) => {
|
||||||
hide-selected
|
hide-selected
|
||||||
:required="true"
|
:required="true"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('entry.basicData.currency')"
|
:label="t('entry.basicData.currency')"
|
||||||
v-model="data.currencyFk"
|
v-model="data.currencyFk"
|
||||||
|
@ -162,8 +151,6 @@ const onFilterTravelSelected = (formData, id) => {
|
||||||
option-value="id"
|
option-value="id"
|
||||||
option-label="code"
|
option-label="code"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QInput
|
<QInput
|
||||||
:label="t('entry.basicData.commission')"
|
:label="t('entry.basicData.commission')"
|
||||||
v-model="data.commission"
|
v-model="data.commission"
|
||||||
|
@ -171,10 +158,8 @@ const onFilterTravelSelected = (formData, id) => {
|
||||||
autofocus
|
autofocus
|
||||||
min="0"
|
min="0"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QInput
|
<QInput
|
||||||
:label="t('entry.basicData.observation')"
|
:label="t('entry.basicData.observation')"
|
||||||
type="textarea"
|
type="textarea"
|
||||||
|
@ -183,37 +168,26 @@ const onFilterTravelSelected = (formData, id) => {
|
||||||
counter
|
counter
|
||||||
fill-input
|
fill-input
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QCheckbox
|
<QCheckbox
|
||||||
v-model="data.isOrdered"
|
v-model="data.isOrdered"
|
||||||
:label="t('entry.basicData.ordered')"
|
:label="t('entry.basicData.ordered')"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QCheckbox
|
<QCheckbox
|
||||||
v-model="data.isConfirmed"
|
v-model="data.isConfirmed"
|
||||||
:label="t('entry.basicData.confirmed')"
|
:label="t('entry.basicData.confirmed')"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QCheckbox
|
<QCheckbox
|
||||||
v-model="data.isExcludedFromAvailable"
|
v-model="data.isExcludedFromAvailable"
|
||||||
:label="t('entry.basicData.excludedFromAvailable')"
|
:label="t('entry.basicData.excludedFromAvailable')"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QCheckbox v-model="data.isRaid" :label="t('entry.basicData.raid')" />
|
<QCheckbox v-model="data.isRaid" :label="t('entry.basicData.raid')" />
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QCheckbox
|
<QCheckbox
|
||||||
v-if="isAdministrative()"
|
v-if="isAdministrative()"
|
||||||
v-model="data.isBooked"
|
v-model="data.isBooked"
|
||||||
:label="t('entry.basicData.booked')"
|
:label="t('entry.basicData.booked')"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
</template>
|
</template>
|
||||||
</FormModel>
|
</FormModel>
|
||||||
|
|
|
@ -198,7 +198,6 @@ const redirectToBuysView = () => {
|
||||||
</Teleport>
|
</Teleport>
|
||||||
<QCard class="q-pa-lg">
|
<QCard class="q-pa-lg">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<QFile
|
<QFile
|
||||||
ref="inputFileRef"
|
ref="inputFileRef"
|
||||||
:label="t('entry.buys.file')"
|
:label="t('entry.buys.file')"
|
||||||
|
@ -218,24 +217,19 @@ const redirectToBuysView = () => {
|
||||||
</QIcon>
|
</QIcon>
|
||||||
</template>
|
</template>
|
||||||
</QFile>
|
</QFile>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<div v-if="importData.file">
|
<div v-if="importData.file">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('entry.buys.reference')"
|
:label="t('entry.buys.reference')"
|
||||||
v-model="importData.ref"
|
v-model="importData.ref"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('entry.buys.observations')"
|
:label="t('entry.buys.observations')"
|
||||||
v-model="importData.observation"
|
v-model="importData.observation"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow>
|
<VnRow>
|
||||||
<QTable :columns="columns" :rows="importData.buys">
|
<QTable :columns="columns" :rows="importData.buys">
|
||||||
|
|
|
@ -1,14 +1,16 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import VnCard from 'components/common/VnCard.vue';
|
import VnCard from 'components/common/VnCard.vue';
|
||||||
import EntryDescriptor from './EntryDescriptor.vue';
|
import EntryDescriptor from './EntryDescriptor.vue';
|
||||||
|
import EntryFilter from '../EntryFilter.vue';
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<VnCard
|
<VnCard
|
||||||
data-key="Entry"
|
data-key="Entry"
|
||||||
base-url="Entries"
|
base-url="Entries"
|
||||||
:descriptor="EntryDescriptor"
|
:descriptor="EntryDescriptor"
|
||||||
searchbar-data-key="EntryList"
|
:filter-panel="EntryFilter"
|
||||||
searchbar-url="Entries/filter"
|
search-data-key="EntryList"
|
||||||
|
search-url="Entries/filter"
|
||||||
searchbar-label="Search entries"
|
searchbar-label="Search entries"
|
||||||
searchbar-info="You can search by entry reference"
|
searchbar-info="You can search by entry reference"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -6,7 +6,6 @@ import { useI18n } from 'vue-i18n';
|
||||||
import CardSummary from 'components/ui/CardSummary.vue';
|
import CardSummary from 'components/ui/CardSummary.vue';
|
||||||
import VnLv from 'src/components/ui/VnLv.vue';
|
import VnLv from 'src/components/ui/VnLv.vue';
|
||||||
import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
|
import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
|
||||||
import VnTitle from 'src/components/common/VnTitle.vue';
|
|
||||||
|
|
||||||
import { toDate, toCurrency } from 'src/filters';
|
import { toDate, toCurrency } from 'src/filters';
|
||||||
import { getUrl } from 'src/composables/getUrl';
|
import { getUrl } from 'src/composables/getUrl';
|
||||||
|
|
|
@ -79,7 +79,6 @@ const redirectToEntryBasicData = (_, { id }) => {
|
||||||
>
|
>
|
||||||
<template #form="{ data, validate }">
|
<template #form="{ data, validate }">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Supplier')"
|
:label="t('Supplier')"
|
||||||
class="full-width"
|
class="full-width"
|
||||||
|
@ -102,10 +101,8 @@ const redirectToEntryBasicData = (_, { id }) => {
|
||||||
</QItem>
|
</QItem>
|
||||||
</template>
|
</template>
|
||||||
</VnSelect>
|
</VnSelect>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Travel')"
|
:label="t('Travel')"
|
||||||
class="full-width"
|
class="full-width"
|
||||||
|
@ -125,8 +122,7 @@ const redirectToEntryBasicData = (_, { id }) => {
|
||||||
>{{ scope.opt?.agencyModeName }} -
|
>{{ scope.opt?.agencyModeName }} -
|
||||||
{{ scope.opt?.warehouseInName }} ({{
|
{{ scope.opt?.warehouseInName }} ({{
|
||||||
toDate(scope.opt?.shipped)
|
toDate(scope.opt?.shipped)
|
||||||
}}) →
|
}}) → {{ scope.opt?.warehouseOutName }} ({{
|
||||||
{{ scope.opt?.warehouseOutName }} ({{
|
|
||||||
toDate(scope.opt?.landed)
|
toDate(scope.opt?.landed)
|
||||||
}})</QItemLabel
|
}})</QItemLabel
|
||||||
>
|
>
|
||||||
|
@ -134,10 +130,8 @@ const redirectToEntryBasicData = (_, { id }) => {
|
||||||
</QItem>
|
</QItem>
|
||||||
</template>
|
</template>
|
||||||
</VnSelect>
|
</VnSelect>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Company')"
|
:label="t('Company')"
|
||||||
class="full-width"
|
class="full-width"
|
||||||
|
@ -150,7 +144,6 @@ const redirectToEntryBasicData = (_, { id }) => {
|
||||||
:required="true"
|
:required="true"
|
||||||
:rules="validate('entry.companyFk')"
|
:rules="validate('entry.companyFk')"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
</VnRow>
|
</VnRow>
|
||||||
</template>
|
</template>
|
||||||
</FormModel>
|
</FormModel>
|
||||||
|
|
|
@ -12,6 +12,7 @@ import VnInput from 'src/components/common/VnInput.vue';
|
||||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||||
import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
|
import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
|
||||||
import ItemDescriptorProxy from '../Item/Card/ItemDescriptorProxy.vue';
|
import ItemDescriptorProxy from '../Item/Card/ItemDescriptorProxy.vue';
|
||||||
|
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
||||||
|
|
||||||
import { useStateStore } from 'stores/useStateStore';
|
import { useStateStore } from 'stores/useStateStore';
|
||||||
import { toDate, toCurrency } from 'src/filters';
|
import { toDate, toCurrency } from 'src/filters';
|
||||||
|
@ -636,18 +637,18 @@ onUnmounted(() => (stateStore.rightDrawer = false));
|
||||||
auto-load
|
auto-load
|
||||||
@on-fetch="(data) => (intrastatOptions = data)"
|
@on-fetch="(data) => (intrastatOptions = data)"
|
||||||
/>
|
/>
|
||||||
<QToolbar class="justify-end">
|
<VnSubToolbar>
|
||||||
<div id="st-data">
|
<template #st-data>
|
||||||
<TableVisibleColumns
|
<TableVisibleColumns
|
||||||
:all-columns="allColumnNames"
|
:all-columns="allColumnNames"
|
||||||
table-code="latestBuys"
|
table-code="latestBuys"
|
||||||
labels-traductions-path="entry.latestBuys"
|
labels-traductions-path="entry.latestBuys"
|
||||||
@on-config-saved="visibleColumns = ['picture', ...$event]"
|
@on-config-saved="visibleColumns = ['picture', ...$event]"
|
||||||
/>
|
/>
|
||||||
</div>
|
</template>
|
||||||
<QSpace />
|
<QSpace />
|
||||||
<div id="st-actions"></div>
|
<div id="st-actions"></div>
|
||||||
</QToolbar>
|
</VnSubToolbar>
|
||||||
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
|
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
|
||||||
<QScrollArea class="fit text-grey-8">
|
<QScrollArea class="fit text-grey-8">
|
||||||
<EntryLatestBuysFilter data-key="EntryLatestBuys" />
|
<EntryLatestBuysFilter data-key="EntryLatestBuys" />
|
||||||
|
|
|
@ -3,14 +3,13 @@ import { ref, computed } from 'vue';
|
||||||
import { useRoute } from 'vue-router';
|
import { useRoute } from 'vue-router';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useQuasar } from 'quasar';
|
import { useQuasar } from 'quasar';
|
||||||
|
import axios from 'axios';
|
||||||
import { useArrayData } from 'src/composables/useArrayData';
|
import { useArrayData } from 'src/composables/useArrayData';
|
||||||
import { downloadFile } from 'src/composables/downloadFile';
|
import { downloadFile } from 'src/composables/downloadFile';
|
||||||
|
|
||||||
import FormModel from 'components/FormModel.vue';
|
import FormModel from 'components/FormModel.vue';
|
||||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||||
import FetchData from 'src/components/FetchData.vue';
|
import FetchData from 'src/components/FetchData.vue';
|
||||||
|
import VnRow from 'src/components/ui/VnRow.vue';
|
||||||
import axios from 'axios';
|
|
||||||
|
|
||||||
const quasar = useQuasar();
|
const quasar = useQuasar();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
|
@ -181,8 +180,7 @@ async function upsert() {
|
||||||
:auto-load="true"
|
:auto-load="true"
|
||||||
>
|
>
|
||||||
<template #form="{ data }">
|
<template #form="{ data }">
|
||||||
<div class="row q-gutter-md q-mb-md">
|
<VnRow>
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('supplierFk')"
|
:label="t('supplierFk')"
|
||||||
v-model="data.supplierFk"
|
v-model="data.supplierFk"
|
||||||
|
@ -203,29 +201,21 @@ async function upsert() {
|
||||||
</QItem>
|
</QItem>
|
||||||
</template>
|
</template>
|
||||||
</VnSelect>
|
</VnSelect>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QInput
|
<QInput
|
||||||
clearable
|
clearable
|
||||||
clear-icon="close"
|
clear-icon="close"
|
||||||
:label="t('Supplier ref')"
|
:label="t('Supplier ref')"
|
||||||
v-model="data.supplierRef"
|
v-model="data.supplierRef"
|
||||||
/>
|
/>
|
||||||
</div>
|
</VnRow>
|
||||||
</div>
|
<VnRow>
|
||||||
<div class="row q-gutter-md q-mb-md">
|
|
||||||
<div class="col">
|
|
||||||
<QInput
|
<QInput
|
||||||
:label="t('Expedition date')"
|
:label="t('Expedition date')"
|
||||||
v-model="data.issued"
|
v-model="data.issued"
|
||||||
:mask="dateMask"
|
:mask="dateMask"
|
||||||
>
|
>
|
||||||
<template #append>
|
<template #append>
|
||||||
<QIcon
|
<QIcon name="event" class="cursor-pointer" :fill-mask="fillMask">
|
||||||
name="event"
|
|
||||||
class="cursor-pointer"
|
|
||||||
:fill-mask="fillMask"
|
|
||||||
>
|
|
||||||
<QPopupProxy
|
<QPopupProxy
|
||||||
cover
|
cover
|
||||||
transition-show="scale"
|
transition-show="scale"
|
||||||
|
@ -245,8 +235,6 @@ async function upsert() {
|
||||||
</QIcon>
|
</QIcon>
|
||||||
</template>
|
</template>
|
||||||
</QInput>
|
</QInput>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QInput
|
<QInput
|
||||||
:label="t('Operation date')"
|
:label="t('Operation date')"
|
||||||
v-model="data.operated"
|
v-model="data.operated"
|
||||||
|
@ -281,18 +269,14 @@ async function upsert() {
|
||||||
</QIcon>
|
</QIcon>
|
||||||
</template>
|
</template>
|
||||||
</QInput>
|
</QInput>
|
||||||
</div>
|
</VnRow>
|
||||||
</div>
|
<VnRow>
|
||||||
<div class="row q-gutter-md q-mb-md">
|
|
||||||
<div class="col">
|
|
||||||
<QInput
|
<QInput
|
||||||
:label="t('Undeductible VAT')"
|
:label="t('Undeductible VAT')"
|
||||||
v-model="data.deductibleExpenseFk"
|
v-model="data.deductibleExpenseFk"
|
||||||
clearable
|
clearable
|
||||||
clear-icon="close"
|
clear-icon="close"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QInput
|
<QInput
|
||||||
:label="t('Document')"
|
:label="t('Document')"
|
||||||
v-model="data.dmsFk"
|
v-model="data.dmsFk"
|
||||||
|
@ -339,10 +323,8 @@ async function upsert() {
|
||||||
</QBtn>
|
</QBtn>
|
||||||
</template>
|
</template>
|
||||||
</QInput>
|
</QInput>
|
||||||
</div>
|
</VnRow>
|
||||||
</div>
|
<VnRow>
|
||||||
<div class="row q-gutter-md q-mb-md">
|
|
||||||
<div class="col">
|
|
||||||
<QInput
|
<QInput
|
||||||
:label="t('Entry date')"
|
:label="t('Entry date')"
|
||||||
v-model="data.bookEntried"
|
v-model="data.bookEntried"
|
||||||
|
@ -378,8 +360,6 @@ async function upsert() {
|
||||||
</QIcon>
|
</QIcon>
|
||||||
</template>
|
</template>
|
||||||
</QInput>
|
</QInput>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<QInput
|
<QInput
|
||||||
:label="t('Accounted date')"
|
:label="t('Accounted date')"
|
||||||
v-model="data.booked"
|
v-model="data.booked"
|
||||||
|
@ -409,10 +389,8 @@ async function upsert() {
|
||||||
</QIcon>
|
</QIcon>
|
||||||
</template>
|
</template>
|
||||||
</QInput>
|
</QInput>
|
||||||
</div>
|
</VnRow>
|
||||||
</div>
|
<VnRow>
|
||||||
<div class="row q-gutter-md q-mb-md">
|
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Currency')"
|
:label="t('Currency')"
|
||||||
v-model="data.currencyFk"
|
v-model="data.currencyFk"
|
||||||
|
@ -420,8 +398,6 @@ async function upsert() {
|
||||||
option-value="id"
|
option-value="id"
|
||||||
option-label="code"
|
option-label="code"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<VnSelect
|
<VnSelect
|
||||||
v-if="companiesRef"
|
v-if="companiesRef"
|
||||||
:label="t('Company')"
|
:label="t('Company')"
|
||||||
|
@ -430,17 +406,8 @@ async function upsert() {
|
||||||
option-value="id"
|
option-value="id"
|
||||||
option-label="code"
|
option-label="code"
|
||||||
/>
|
/>
|
||||||
</div>
|
</VnRow>
|
||||||
</div>
|
<QCheckbox :label="t('invoiceIn.summary.booked')" v-model="data.isBooked" />
|
||||||
<div class="row q-gutter-md q-mb-md">
|
|
||||||
<div class="col">
|
|
||||||
<QCheckbox
|
|
||||||
:label="t('invoiceIn.summary.booked')"
|
|
||||||
v-model="data.isBooked"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="col"></div>
|
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
</FormModel>
|
</FormModel>
|
||||||
<QDialog ref="editDmsRef" @keyup.enter="upsert">
|
<QDialog ref="editDmsRef" @keyup.enter="upsert">
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import VnCard from 'components/common/VnCard.vue';
|
import VnCard from 'components/common/VnCard.vue';
|
||||||
import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
|
import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
|
||||||
|
import InvoiceInFilter from '../InvoiceInFilter.vue';
|
||||||
|
|
||||||
const filter = {
|
const filter = {
|
||||||
include: [
|
include: [
|
||||||
|
@ -25,8 +26,9 @@ const filter = {
|
||||||
base-url="InvoiceIns"
|
base-url="InvoiceIns"
|
||||||
:filter="filter"
|
:filter="filter"
|
||||||
:descriptor="InvoiceInDescriptor"
|
:descriptor="InvoiceInDescriptor"
|
||||||
searchbar-data-key="InvoiceInList"
|
:filter-panel="InvoiceInFilter"
|
||||||
searchbar-url="InvoiceIns/filter"
|
search-data-key="InvoiceInList"
|
||||||
|
search-url="InvoiceIns/filter"
|
||||||
searchbar-label="Search invoice"
|
searchbar-label="Search invoice"
|
||||||
searchbar-info="You can search by invoice reference"
|
searchbar-info="You can search by invoice reference"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -90,7 +90,7 @@ function getTotal(type) {
|
||||||
url="Countries"
|
url="Countries"
|
||||||
auto-load
|
auto-load
|
||||||
@on-fetch="(data) => (countries = data)"
|
@on-fetch="(data) => (countries = data)"
|
||||||
sort-by="country"
|
sort-by="name"
|
||||||
/>
|
/>
|
||||||
<FetchData
|
<FetchData
|
||||||
url="Intrastats"
|
url="Intrastats"
|
||||||
|
|
|
@ -1,14 +1,16 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
|
import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
|
||||||
import VnCard from 'components/common/VnCard.vue';
|
import VnCard from 'components/common/VnCard.vue';
|
||||||
|
import InvoiceOutFilter from '../InvoiceOutFilter.vue';
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<VnCard
|
<VnCard
|
||||||
data-key="InvoiceOut"
|
data-key="InvoiceOut"
|
||||||
base-url="InvoiceOuts"
|
base-url="InvoiceOuts"
|
||||||
:descriptor="InvoiceOutDescriptor"
|
:descriptor="InvoiceOutDescriptor"
|
||||||
searchbar-data-key="InvoiceOutList"
|
:filter-panel="InvoiceOutFilter"
|
||||||
searchbar-url="InvoiceOuts/filter"
|
search-data-key="InvoiceOutList"
|
||||||
|
search-url="InvoiceOuts/filter"
|
||||||
searchbar-label="Search invoice"
|
searchbar-label="Search invoice"
|
||||||
searchbar-info="You can search by invoice reference"
|
searchbar-info="You can search by invoice reference"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -139,7 +139,7 @@ const openCreateInvoiceModal = () => {
|
||||||
icon="cloud_download"
|
icon="cloud_download"
|
||||||
:disable="selectedCards.size === 0"
|
:disable="selectedCards.size === 0"
|
||||||
>
|
>
|
||||||
<QTooltip>{{ t('downloadPdf') }}</QTooltip>
|
<QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
|
||||||
</QBtn>
|
</QBtn>
|
||||||
<QCheckbox
|
<QCheckbox
|
||||||
left-label
|
left-label
|
||||||
|
@ -234,13 +234,11 @@ en:
|
||||||
fileDenied: Browser denied file download...
|
fileDenied: Browser denied file download...
|
||||||
fileAllowed: Successful download of CSV file
|
fileAllowed: Successful download of CSV file
|
||||||
youCanSearchByInvoiceReference: You can search by invoice reference
|
youCanSearchByInvoiceReference: You can search by invoice reference
|
||||||
downloadPdf: Download PDF
|
|
||||||
createInvoice: Make invoice
|
createInvoice: Make invoice
|
||||||
es:
|
es:
|
||||||
searchInvoice: Buscar factura emitida
|
searchInvoice: Buscar factura emitida
|
||||||
fileDenied: El navegador denegó la descarga de archivos...
|
fileDenied: El navegador denegó la descarga de archivos...
|
||||||
fileAllowed: Descarga exitosa de archivo CSV
|
fileAllowed: Descarga exitosa de archivo CSV
|
||||||
youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
|
youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
|
||||||
downloadPdf: Descargar PDF
|
|
||||||
createInvoice: Crear factura
|
createInvoice: Crear factura
|
||||||
</i18n>
|
</i18n>
|
||||||
|
|
|
@ -1,7 +1,17 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import VnCard from 'components/common/VnCard.vue';
|
import VnCard from 'components/common/VnCard.vue';
|
||||||
import ItemDescriptor from './ItemDescriptor.vue';
|
import ItemDescriptor from './ItemDescriptor.vue';
|
||||||
|
import ItemListFilter from '../ItemListFilter.vue';
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<VnCard data-key="Item" base-url="Items" :descriptor="ItemDescriptor" />
|
<VnCard
|
||||||
|
data-key="Item"
|
||||||
|
base-url="Items"
|
||||||
|
:descriptor="ItemDescriptor"
|
||||||
|
:filter-panel="ItemListFilter"
|
||||||
|
search-data-key="ItemList"
|
||||||
|
search-url="Items/filter"
|
||||||
|
searchbar-label="searchbar.label"
|
||||||
|
searchbar-info="searchbar.info"
|
||||||
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -309,9 +309,9 @@ const addRow = () => {
|
||||||
const lastItemCopy = JSON.parse(
|
const lastItemCopy = JSON.parse(
|
||||||
JSON.stringify(fixedPrices.value[fixedPrices.value.length - 1])
|
JSON.stringify(fixedPrices.value[fixedPrices.value.length - 1])
|
||||||
);
|
);
|
||||||
const { id, ...restOfItem } = lastItemCopy;
|
delete lastItemCopy.id;
|
||||||
fixedPricesOriginalData.value.push(restOfItem);
|
fixedPricesOriginalData.value.push(lastItemCopy);
|
||||||
fixedPrices.value.push(restOfItem);
|
fixedPrices.value.push(lastItemCopy);
|
||||||
};
|
};
|
||||||
|
|
||||||
const openEditTableCellDialog = () => {
|
const openEditTableCellDialog = () => {
|
||||||
|
|
|
@ -457,6 +457,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
|
||||||
:limit="12"
|
:limit="12"
|
||||||
:expr-builder="exprBuilder"
|
:expr-builder="exprBuilder"
|
||||||
:user-params="params"
|
:user-params="params"
|
||||||
|
:keep-opts="['userParams']"
|
||||||
:offset="50"
|
:offset="50"
|
||||||
auto-load
|
auto-load
|
||||||
>
|
>
|
||||||
|
|
|
@ -7,8 +7,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
|
||||||
import CardList from 'src/components/ui/CardList.vue';
|
import CardList from 'src/components/ui/CardList.vue';
|
||||||
import ItemTypeSummary from 'src/pages/ItemType/Card/ItemTypeSummary.vue';
|
import ItemTypeSummary from 'src/pages/ItemType/Card/ItemTypeSummary.vue';
|
||||||
import ItemTypeFilter from 'src/pages/ItemType/ItemTypeFilter.vue';
|
import ItemTypeFilter from 'src/pages/ItemType/ItemTypeFilter.vue';
|
||||||
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
|
import ItemTypeSearchbar from '../ItemType/ItemTypeSearchbar.vue';
|
||||||
|
|
||||||
import { useStateStore } from 'stores/useStateStore';
|
import { useStateStore } from 'stores/useStateStore';
|
||||||
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
|
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
|
||||||
|
|
||||||
|
@ -63,13 +62,7 @@ const exprBuilder = (param, value) => {
|
||||||
<template>
|
<template>
|
||||||
<template v-if="stateStore.isHeaderMounted()">
|
<template v-if="stateStore.isHeaderMounted()">
|
||||||
<Teleport to="#searchbar">
|
<Teleport to="#searchbar">
|
||||||
<VnSearchbar
|
<ItemTypeSearchbar />
|
||||||
data-key="ItemTypeList"
|
|
||||||
url="ItemTypes"
|
|
||||||
:label="t('Search item type')"
|
|
||||||
:info="t('Search itemType by id, name or code')"
|
|
||||||
:expr-builder="exprBuilder"
|
|
||||||
/>
|
|
||||||
</Teleport>
|
</Teleport>
|
||||||
<Teleport to="#actions-append">
|
<Teleport to="#actions-append">
|
||||||
<div class="row q-gutter-x-sm">
|
<div class="row q-gutter-x-sm">
|
||||||
|
@ -132,11 +125,3 @@ const exprBuilder = (param, value) => {
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
</QPageSticky>
|
</QPageSticky>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<i18n>
|
|
||||||
es:
|
|
||||||
New item type: Nueva familia
|
|
||||||
Name: Nombre
|
|
||||||
Search item type: Buscar familia
|
|
||||||
Search itemType by id, name or code: Buscar familia por id, nombre o código
|
|
||||||
</i18n>
|
|
||||||
|
|
|
@ -78,3 +78,6 @@ itemTags:
|
||||||
tag: Tag
|
tag: Tag
|
||||||
value: Value
|
value: Value
|
||||||
relevancy: Relevancy
|
relevancy: Relevancy
|
||||||
|
searchbar:
|
||||||
|
label: Search item
|
||||||
|
info: Search by item id
|
||||||
|
|
|
@ -78,3 +78,6 @@ itemTags:
|
||||||
tag: Etiqueta
|
tag: Etiqueta
|
||||||
value: Valor
|
value: Valor
|
||||||
relevancy: Relevancia
|
relevancy: Relevancia
|
||||||
|
searchbar:
|
||||||
|
label: Buscar artículo
|
||||||
|
info: Buscar por id de artículo
|
||||||
|
|
|
@ -1,12 +1,20 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import VnCard from 'components/common/VnCard.vue';
|
import VnCard from 'components/common/VnCard.vue';
|
||||||
|
|
||||||
import ItemTypeDescriptor from 'src/pages/ItemType/Card/ItemTypeDescriptor.vue';
|
import ItemTypeDescriptor from 'src/pages/ItemType/Card/ItemTypeDescriptor.vue';
|
||||||
|
import ItemTypeFilter from 'src/pages/ItemType/ItemTypeFilter.vue';
|
||||||
|
import ItemTypeSearchbar from '../ItemTypeSearchbar.vue';
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<VnCard
|
<VnCard
|
||||||
data-key="ItemTypeSummary"
|
data-key="ItemTypeSummary"
|
||||||
base-url="ItemTypes"
|
base-url="ItemTypes"
|
||||||
:descriptor="ItemTypeDescriptor"
|
:descriptor="ItemTypeDescriptor"
|
||||||
/>
|
:filter-panel="ItemTypeFilter"
|
||||||
|
search-data-key="ItemTypeList"
|
||||||
|
search-url="ItemTypes"
|
||||||
|
>
|
||||||
|
<template #searchbar>
|
||||||
|
<ItemTypeSearchbar />
|
||||||
|
</template>
|
||||||
|
</VnCard>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
<script setup>
|
||||||
|
import VnSearchbar from 'components/ui/VnSearchbar.vue';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
const { t } = useI18n();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<VnSearchbar
|
||||||
|
data-key="ItemTypeList"
|
||||||
|
url="ItemTypes"
|
||||||
|
:label="t('Search item type')"
|
||||||
|
:info="t('Search itemType by id, name or code')"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
<i18n>
|
||||||
|
es:
|
||||||
|
Search item type: Buscar familia
|
||||||
|
Search itemType by id, name or code: Buscar familia por id, nombre o código
|
||||||
|
</i18n>
|
|
@ -0,0 +1,88 @@
|
||||||
|
<script setup>
|
||||||
|
import { onMounted, onUnmounted, ref } from 'vue';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
|
import { useStateStore } from 'stores/useStateStore';
|
||||||
|
import SalesClientTable from './SalesClientsTable.vue';
|
||||||
|
import SalesOrdersTable from './SalesOrdersTable.vue';
|
||||||
|
import SalesTicketsTable from './SalesTicketsTable.vue';
|
||||||
|
import VnSearchbar from 'components/ui/VnSearchbar.vue';
|
||||||
|
|
||||||
|
const { t } = useI18n();
|
||||||
|
const stateStore = useStateStore();
|
||||||
|
|
||||||
|
const expanded = ref(true);
|
||||||
|
|
||||||
|
onMounted(async () => {
|
||||||
|
stateStore.rightDrawer = true;
|
||||||
|
});
|
||||||
|
|
||||||
|
onUnmounted(() => (stateStore.rightDrawer = false));
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<template v-if="stateStore.isHeaderMounted()">
|
||||||
|
<Teleport to="#searchbar">
|
||||||
|
<VnSearchbar
|
||||||
|
data-key="SalesMonitorTickets"
|
||||||
|
url="SalesMonitors/salesFilter"
|
||||||
|
:redirect="false"
|
||||||
|
:label="t('searchBar.label')"
|
||||||
|
:info="t('searchBar.info')"
|
||||||
|
/>
|
||||||
|
</Teleport>
|
||||||
|
</template>
|
||||||
|
<QPage class="column items-center q-pa-md">
|
||||||
|
<QCard class="full-width q-mb-lg">
|
||||||
|
<QExpansionItem v-model="expanded" dense :duration="150">
|
||||||
|
<template v-if="!expanded" #header>
|
||||||
|
<div class="row full-width">
|
||||||
|
<span class="flex col text-body1">
|
||||||
|
{{ t('salesMonitor.clientsOnWebsite') }}
|
||||||
|
</span>
|
||||||
|
<span class="flex col q-ml-xl text-body1">
|
||||||
|
{{ t('salesMonitor.recentOrderActions') }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<template #default>
|
||||||
|
<div class="expansion-tables-container">
|
||||||
|
<QCardSection class="col">
|
||||||
|
<span class="flex col q-mb-sm text-body1">
|
||||||
|
{{ t('salesMonitor.clientsOnWebsite') }}
|
||||||
|
</span>
|
||||||
|
<SalesClientTable />
|
||||||
|
</QCardSection>
|
||||||
|
<QCardSection class="col">
|
||||||
|
<span class="flex col q-mb-sm text-body1">
|
||||||
|
{{ t('salesMonitor.recentOrderActions') }}
|
||||||
|
</span>
|
||||||
|
<SalesOrdersTable />
|
||||||
|
</QCardSection>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</QExpansionItem>
|
||||||
|
</QCard>
|
||||||
|
<QCard class="full-width q-mb-lg">
|
||||||
|
<QItem class="justify-between">
|
||||||
|
<QItemLabel class="slider-container">
|
||||||
|
<span class="text-body1"
|
||||||
|
>{{ t('salesMonitor.ticketsMonitor') }}
|
||||||
|
</span>
|
||||||
|
<QCardSection class="col"><SalesTicketsTable /> </QCardSection>
|
||||||
|
</QItemLabel>
|
||||||
|
</QItem>
|
||||||
|
</QCard>
|
||||||
|
</QPage>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.expansion-tables-container {
|
||||||
|
display: flex;
|
||||||
|
border-top: 1px solid $color-spacer;
|
||||||
|
|
||||||
|
@media (max-width: $breakpoint-md-max) {
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
|
@ -0,0 +1,18 @@
|
||||||
|
<script setup>
|
||||||
|
import LeftMenu from 'src/components/LeftMenu.vue';
|
||||||
|
|
||||||
|
import { useStateStore } from 'stores/useStateStore';
|
||||||
|
|
||||||
|
const stateStore = useStateStore();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
|
||||||
|
<QScrollArea class="fit text-grey-8">
|
||||||
|
<LeftMenu />
|
||||||
|
</QScrollArea>
|
||||||
|
</QDrawer>
|
||||||
|
<QPageContainer>
|
||||||
|
<RouterView></RouterView>
|
||||||
|
</QPageContainer>
|
||||||
|
</template>
|
|
@ -0,0 +1,219 @@
|
||||||
|
<script setup>
|
||||||
|
import { ref, computed, reactive, watch } from 'vue';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
|
import FetchData from 'components/FetchData.vue';
|
||||||
|
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||||
|
import VnInputDate from 'src/components/common/VnInputDate.vue';
|
||||||
|
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
||||||
|
import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
|
||||||
|
import VnPaginate from 'components/ui/VnPaginate.vue';
|
||||||
|
|
||||||
|
import { toDateFormat } from 'src/filters/date.js';
|
||||||
|
import { dashIfEmpty } from 'src/filters';
|
||||||
|
|
||||||
|
const { t } = useI18n();
|
||||||
|
|
||||||
|
const paginateRef = ref(null);
|
||||||
|
const workersActiveOptions = ref([]);
|
||||||
|
const clientsOptions = ref([]);
|
||||||
|
|
||||||
|
const from = ref(Date.vnNew());
|
||||||
|
const to = ref(Date.vnNew());
|
||||||
|
|
||||||
|
const dateRange = computed(() => {
|
||||||
|
const minHour = new Date(from.value);
|
||||||
|
minHour.setHours(0, 0, 0, 0);
|
||||||
|
const maxHour = new Date(to.value);
|
||||||
|
maxHour.setHours(23, 59, 59, 59);
|
||||||
|
return [minHour, maxHour];
|
||||||
|
});
|
||||||
|
|
||||||
|
const filter = reactive({
|
||||||
|
where: {
|
||||||
|
'v.stamp': {
|
||||||
|
between: dateRange.value,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
watch(dateRange, (val) => {
|
||||||
|
filter.where['v.stamp'].between = val;
|
||||||
|
paginateRef.value.fetch();
|
||||||
|
});
|
||||||
|
|
||||||
|
function exprBuilder(param, value) {
|
||||||
|
switch (param) {
|
||||||
|
case 'clientFk':
|
||||||
|
return { [`c.id`]: value };
|
||||||
|
case 'salesPersonFk':
|
||||||
|
return { [`c.${param}`]: value };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const params = reactive({});
|
||||||
|
|
||||||
|
const applyColumnFilter = async (col) => {
|
||||||
|
try {
|
||||||
|
const paramKey = col.columnFilter?.filterParamKey || col.field;
|
||||||
|
params[paramKey] = col.columnFilter.filterValue;
|
||||||
|
await paginateRef.value.addFilter(null, params);
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Error applying column filter', err);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const columns = computed(() => [
|
||||||
|
{
|
||||||
|
label: t('salesClientsTable.date'),
|
||||||
|
name: 'date',
|
||||||
|
field: 'dated',
|
||||||
|
align: 'left',
|
||||||
|
columnFilter: null,
|
||||||
|
sortable: true,
|
||||||
|
format: (val) => toDateFormat(val),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: t('salesClientsTable.hour'),
|
||||||
|
name: 'hour',
|
||||||
|
field: 'hour',
|
||||||
|
align: 'left',
|
||||||
|
sortable: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: t('salesClientsTable.salesPerson'),
|
||||||
|
name: 'salesPerson',
|
||||||
|
field: 'salesPerson',
|
||||||
|
align: 'left',
|
||||||
|
sortable: true,
|
||||||
|
columnFilter: {
|
||||||
|
component: VnSelect,
|
||||||
|
filterParamKey: 'salesPersonFk',
|
||||||
|
type: 'select',
|
||||||
|
filterValue: null,
|
||||||
|
attrs: {
|
||||||
|
options: workersActiveOptions.value,
|
||||||
|
'option-value': 'id',
|
||||||
|
'option-label': 'name',
|
||||||
|
dense: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
format: (val) => dashIfEmpty(val),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: t('salesClientsTable.client'),
|
||||||
|
field: 'clientName',
|
||||||
|
name: 'client',
|
||||||
|
align: 'left',
|
||||||
|
sortable: true,
|
||||||
|
columnFilter: {
|
||||||
|
component: VnSelect,
|
||||||
|
filterParamKey: 'clientFk',
|
||||||
|
type: 'select',
|
||||||
|
filterValue: null,
|
||||||
|
attrs: {
|
||||||
|
options: clientsOptions.value,
|
||||||
|
'option-value': 'id',
|
||||||
|
'option-label': 'name',
|
||||||
|
dense: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
format: (val) => dashIfEmpty(val),
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<FetchData
|
||||||
|
url="Workers/activeWithInheritedRole"
|
||||||
|
:filter="{
|
||||||
|
fields: ['id', 'nickname'],
|
||||||
|
order: 'nickname ASC',
|
||||||
|
where: { role: 'salesPerson' },
|
||||||
|
}"
|
||||||
|
auto-load
|
||||||
|
@on-fetch="(data) => (workersActiveOptions = data)"
|
||||||
|
/>
|
||||||
|
<FetchData
|
||||||
|
url="Clients"
|
||||||
|
:filter="{
|
||||||
|
fields: ['id', 'name'],
|
||||||
|
order: 'name ASC',
|
||||||
|
}"
|
||||||
|
auto-load
|
||||||
|
@on-fetch="(data) => (clientsOptions = data)"
|
||||||
|
/>
|
||||||
|
<QCard style="max-height: 380px; overflow-y: scroll">
|
||||||
|
<VnPaginate
|
||||||
|
ref="paginateRef"
|
||||||
|
data-key="SalesMonitorClients"
|
||||||
|
url="SalesMonitors/clientsFilter"
|
||||||
|
:order="['dated DESC', 'hour DESC']"
|
||||||
|
:limit="6"
|
||||||
|
:expr-builder="exprBuilder"
|
||||||
|
:user-params="params"
|
||||||
|
:filter="filter"
|
||||||
|
:offset="50"
|
||||||
|
auto-load
|
||||||
|
>
|
||||||
|
<template #body="{ rows }">
|
||||||
|
<QTable
|
||||||
|
:rows="rows"
|
||||||
|
:columns="columns"
|
||||||
|
row-key="id"
|
||||||
|
:pagination="{ rowsPerPage: 0 }"
|
||||||
|
class="full-width"
|
||||||
|
:no-data-label="t('globals.noResults')"
|
||||||
|
>
|
||||||
|
<template #top>
|
||||||
|
<VnInputDate
|
||||||
|
:label="t('salesClientsTable.from')"
|
||||||
|
dense
|
||||||
|
emit-date-format
|
||||||
|
v-model="from"
|
||||||
|
class="q-mr-lg"
|
||||||
|
style="width: 150px"
|
||||||
|
/>
|
||||||
|
<VnInputDate
|
||||||
|
:label="t('salesClientsTable.to')"
|
||||||
|
dense
|
||||||
|
emit-date-format
|
||||||
|
v-model="to"
|
||||||
|
style="width: 150px"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
<template #top-row="{ cols }">
|
||||||
|
<QTr>
|
||||||
|
<QTd
|
||||||
|
v-for="(col, index) in cols"
|
||||||
|
:key="index"
|
||||||
|
style="max-width: 100px"
|
||||||
|
>
|
||||||
|
<VnSelect
|
||||||
|
:is="col.columnFilter.component"
|
||||||
|
v-if="col.columnFilter"
|
||||||
|
v-model="col.columnFilter.filterValue"
|
||||||
|
v-bind="col.columnFilter.attrs"
|
||||||
|
@update:model-value="applyColumnFilter(col)"
|
||||||
|
dense
|
||||||
|
/>
|
||||||
|
</QTd>
|
||||||
|
</QTr>
|
||||||
|
</template>
|
||||||
|
<template #body-cell-salesPerson="{ row }">
|
||||||
|
<QTd>
|
||||||
|
<span class="link">{{ row.salesPerson }}</span>
|
||||||
|
<WorkerDescriptorProxy :id="row.salesPersonFk" dense />
|
||||||
|
</QTd>
|
||||||
|
</template>
|
||||||
|
<template #body-cell-client="{ row }">
|
||||||
|
<QTd>
|
||||||
|
<span class="link">{{ row.clientName }}</span>
|
||||||
|
<CustomerDescriptorProxy :id="row.clientFk" />
|
||||||
|
</QTd>
|
||||||
|
</template>
|
||||||
|
</QTable>
|
||||||
|
</template>
|
||||||
|
</VnPaginate>
|
||||||
|
</QCard>
|
||||||
|
</template>
|
|
@ -0,0 +1,201 @@
|
||||||
|
<script setup>
|
||||||
|
import { ref, computed } from 'vue';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
|
import FetchData from 'components/FetchData.vue';
|
||||||
|
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
||||||
|
import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
|
||||||
|
import VnPaginate from 'components/ui/VnPaginate.vue';
|
||||||
|
|
||||||
|
import { toDateFormat, toDateTimeFormat } from 'src/filters/date.js';
|
||||||
|
import { toCurrency } from 'src/filters';
|
||||||
|
import { useVnConfirm } from 'composables/useVnConfirm';
|
||||||
|
import axios from 'axios';
|
||||||
|
|
||||||
|
const { t } = useI18n();
|
||||||
|
const { openConfirmationModal } = useVnConfirm();
|
||||||
|
|
||||||
|
const paginateRef = ref(null);
|
||||||
|
const workersActiveOptions = ref([]);
|
||||||
|
const clientsOptions = ref([]);
|
||||||
|
const selectedRows = ref([]);
|
||||||
|
|
||||||
|
const dateRange = (value) => {
|
||||||
|
const minHour = new Date(value);
|
||||||
|
minHour.setHours(0, 0, 0, 0);
|
||||||
|
const maxHour = new Date(value);
|
||||||
|
maxHour.setHours(23, 59, 59, 59);
|
||||||
|
|
||||||
|
return [minHour, maxHour];
|
||||||
|
};
|
||||||
|
|
||||||
|
function exprBuilder(param, value) {
|
||||||
|
switch (param) {
|
||||||
|
case 'date_send':
|
||||||
|
return {
|
||||||
|
[`o.date_send`]: {
|
||||||
|
between: dateRange(value),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
case 'clientFk':
|
||||||
|
return { [`c.id`]: value };
|
||||||
|
case 'salesPersonFk':
|
||||||
|
return { [`c.${param}`]: value };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const columns = computed(() => [
|
||||||
|
{
|
||||||
|
label: t('salesOrdersTable.date'),
|
||||||
|
name: 'date',
|
||||||
|
field: 'dated',
|
||||||
|
align: 'left',
|
||||||
|
columnFilter: null,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: t('salesOrdersTable.client'),
|
||||||
|
name: 'client',
|
||||||
|
align: 'left',
|
||||||
|
sortable: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: t('salesOrdersTable.salesPerson'),
|
||||||
|
name: 'salesPerson',
|
||||||
|
align: 'left',
|
||||||
|
sortable: true,
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
const getBadgeColor = (date) => {
|
||||||
|
const today = Date.vnNew();
|
||||||
|
today.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
|
const orderLanded = new Date(date);
|
||||||
|
orderLanded.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
|
const difference = today - orderLanded;
|
||||||
|
|
||||||
|
if (difference == 0) return 'warning';
|
||||||
|
if (difference < 0) return 'success';
|
||||||
|
if (difference > 0) return 'alert';
|
||||||
|
};
|
||||||
|
|
||||||
|
const removeOrders = async () => {
|
||||||
|
try {
|
||||||
|
const selectedIds = selectedRows.value.map((row) => row.id);
|
||||||
|
const params = { deletes: selectedIds };
|
||||||
|
await axios.post('SalesMonitors/deleteOrders', params);
|
||||||
|
selectedRows.value = [];
|
||||||
|
await paginateRef.value.fetch();
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Error deleting orders', err);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const redirectToOrderSummary = (orderId) => {
|
||||||
|
const url = `#/order/${orderId}/summary`;
|
||||||
|
window.open(url, '_blank');
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<FetchData
|
||||||
|
url="Workers/activeWithInheritedRole"
|
||||||
|
:filter="{
|
||||||
|
fields: ['id', 'nickname'],
|
||||||
|
order: 'nickname ASC',
|
||||||
|
where: { role: 'salesPerson' },
|
||||||
|
}"
|
||||||
|
auto-load
|
||||||
|
@on-fetch="(data) => (workersActiveOptions = data)"
|
||||||
|
/>
|
||||||
|
<FetchData
|
||||||
|
url="Clients"
|
||||||
|
:filter="{
|
||||||
|
fields: ['id', 'name'],
|
||||||
|
order: 'name ASC',
|
||||||
|
}"
|
||||||
|
auto-load
|
||||||
|
@on-fetch="(data) => (clientsOptions = data)"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<QCard style="max-height: 380px; overflow-y: scroll">
|
||||||
|
<VnPaginate
|
||||||
|
ref="paginateRef"
|
||||||
|
data-key="SalesMonitorOrders"
|
||||||
|
url="SalesMonitors/ordersFilter"
|
||||||
|
order="date_make DESC"
|
||||||
|
:limit="6"
|
||||||
|
:expr-builder="exprBuilder"
|
||||||
|
auto-load
|
||||||
|
>
|
||||||
|
<template #body="{ rows }">
|
||||||
|
<QTable
|
||||||
|
:rows="rows"
|
||||||
|
:columns="columns"
|
||||||
|
row-key="id"
|
||||||
|
selection="multiple"
|
||||||
|
v-model:selected="selectedRows"
|
||||||
|
:pagination="{ rowsPerPage: 0 }"
|
||||||
|
:no-data-label="t('globals.noResults')"
|
||||||
|
@row-click="(_, row) => redirectToOrderSummary(row.id)"
|
||||||
|
>
|
||||||
|
<template #top>
|
||||||
|
<QBtn
|
||||||
|
v-if="selectedRows.length > 0"
|
||||||
|
icon="delete"
|
||||||
|
size="md"
|
||||||
|
color="primary"
|
||||||
|
@click="
|
||||||
|
openConfirmationModal(
|
||||||
|
t('salesOrdersTable.deleteConfirmTitle'),
|
||||||
|
t('salesOrdersTable.deleteConfirmMessage'),
|
||||||
|
removeOrders
|
||||||
|
)
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<QTooltip>{{ t('salesOrdersTable.delete') }}</QTooltip>
|
||||||
|
</QBtn>
|
||||||
|
</template>
|
||||||
|
<template #body-cell-date="{ row }">
|
||||||
|
<QTd>
|
||||||
|
<QBadge
|
||||||
|
:color="getBadgeColor(row.date_send)"
|
||||||
|
text-color="black"
|
||||||
|
class="q-ma-none q-mb-md"
|
||||||
|
dense
|
||||||
|
style="font-size: 14px"
|
||||||
|
>
|
||||||
|
{{ toDateFormat(row.date_send) }}
|
||||||
|
</QBadge>
|
||||||
|
<div>{{ toDateTimeFormat(row.date_make) }}</div>
|
||||||
|
</QTd>
|
||||||
|
</template>
|
||||||
|
<template #body-cell-client="{ row }">
|
||||||
|
<QTd>
|
||||||
|
<div class="q-mb-md">
|
||||||
|
<span class="link">{{ row.clientName }}</span>
|
||||||
|
<CustomerDescriptorProxy :id="row.clientFk" />
|
||||||
|
</div>
|
||||||
|
<span> {{ row.agencyName }}</span>
|
||||||
|
</QTd>
|
||||||
|
</template>
|
||||||
|
<template #body-cell-salesPerson="{ row }">
|
||||||
|
<QTd>
|
||||||
|
<div class="q-mb-md">
|
||||||
|
<span class="link">{{ row.salesPerson }}</span>
|
||||||
|
<WorkerDescriptorProxy :id="row.salesPersonFk" dense />
|
||||||
|
</div>
|
||||||
|
<span>{{ toCurrency(row.import) }}</span>
|
||||||
|
</QTd>
|
||||||
|
</template>
|
||||||
|
</QTable>
|
||||||
|
</template>
|
||||||
|
</VnPaginate>
|
||||||
|
</QCard>
|
||||||
|
</template>
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.q-td {
|
||||||
|
color: gray;
|
||||||
|
}
|
||||||
|
</style>
|
|
@ -0,0 +1,623 @@
|
||||||
|
<script setup>
|
||||||
|
import { ref, computed, onMounted, reactive } from 'vue';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
import { useRouter } from 'vue-router';
|
||||||
|
|
||||||
|
import FetchData from 'components/FetchData.vue';
|
||||||
|
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
||||||
|
import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
|
||||||
|
import VnPaginate from 'components/ui/VnPaginate.vue';
|
||||||
|
import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
|
||||||
|
import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
|
||||||
|
import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
|
||||||
|
import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
|
||||||
|
import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
|
||||||
|
import VnInput from 'src/components/common/VnInput.vue';
|
||||||
|
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||||
|
import VnInputDate from 'src/components/common/VnInputDate.vue';
|
||||||
|
|
||||||
|
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
|
||||||
|
import { toDateFormat, toTimeFormat } from 'src/filters/date.js';
|
||||||
|
import { toCurrency, dateRange } from 'src/filters';
|
||||||
|
const DEFAULT_AUTO_REFRESH = 1000;
|
||||||
|
const { t } = useI18n();
|
||||||
|
const autoRefresh = ref(false);
|
||||||
|
const router = useRouter();
|
||||||
|
const paginateRef = ref(null);
|
||||||
|
const workersActiveOptions = ref([]);
|
||||||
|
const provincesOptions = ref([]);
|
||||||
|
const statesOptions = ref([]);
|
||||||
|
const zonesOptions = ref([]);
|
||||||
|
const visibleColumns = ref([]);
|
||||||
|
const allColumnNames = ref([]);
|
||||||
|
const { viewSummary } = useSummaryDialog();
|
||||||
|
|
||||||
|
function exprBuilder(param, value) {
|
||||||
|
switch (param) {
|
||||||
|
case 'stateFk':
|
||||||
|
return { 'ts.stateFk': value };
|
||||||
|
case 'salesPersonFk':
|
||||||
|
return { 'c.salesPersonFk': value };
|
||||||
|
case 'provinceFk':
|
||||||
|
return { 'a.provinceFk': value };
|
||||||
|
case 'theoreticalHour':
|
||||||
|
return { 'z.hour': value };
|
||||||
|
case 'practicalHour':
|
||||||
|
return { 'zed.etc': value };
|
||||||
|
case 'shippedDate':
|
||||||
|
return { 't.shipped': { between: dateRange(value) } };
|
||||||
|
case 'nickname':
|
||||||
|
return { [`t.nickname`]: { like: `%${value}%` } };
|
||||||
|
case 'zoneFk':
|
||||||
|
case 'totalWithVat':
|
||||||
|
return { [`t.${param}`]: value };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const filter = { order: ['totalProblems DESC'] };
|
||||||
|
let params = reactive({});
|
||||||
|
|
||||||
|
const applyColumnFilter = async (col) => {
|
||||||
|
try {
|
||||||
|
const paramKey = col.columnFilter?.filterParamKey || col.field;
|
||||||
|
params[paramKey] = col.columnFilter.filterValue;
|
||||||
|
await paginateRef.value.addFilter(null, params);
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Error applying column filter', err);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const getInputEvents = (col) => {
|
||||||
|
return col.columnFilter.type === 'select' || col.columnFilter.type === 'date'
|
||||||
|
? { 'update:modelValue': () => applyColumnFilter(col) }
|
||||||
|
: {
|
||||||
|
'keyup.enter': () => applyColumnFilter(col),
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
const fetchParams = ($params = {}) => {
|
||||||
|
const excludedParams = ['search', 'clientFk', 'orderFk', 'refFk', 'scopeDays'];
|
||||||
|
|
||||||
|
const hasExcludedParams = excludedParams.some((param) => {
|
||||||
|
return $params && $params[param] != undefined;
|
||||||
|
});
|
||||||
|
const hasParams = Object.entries($params).length;
|
||||||
|
if (!hasParams || !hasExcludedParams) $params.scopeDays = 1;
|
||||||
|
|
||||||
|
if (typeof $params.scopeDays === 'number') {
|
||||||
|
const from = Date.vnNew();
|
||||||
|
from.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
|
const to = new Date(from.getTime());
|
||||||
|
to.setDate(to.getDate() + $params.scopeDays);
|
||||||
|
to.setHours(23, 59, 59, 999);
|
||||||
|
|
||||||
|
Object.assign($params, { from, to });
|
||||||
|
}
|
||||||
|
return { tableOrder: 'totalProblems DESC', ...$params };
|
||||||
|
};
|
||||||
|
|
||||||
|
const columns = computed(() => [
|
||||||
|
{
|
||||||
|
label: t('salesTicketsTable.problems'),
|
||||||
|
name: 'problems',
|
||||||
|
align: 'left',
|
||||||
|
sortable: true,
|
||||||
|
columnFilter: null,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: t('salesTicketsTable.identifier'),
|
||||||
|
name: 'identifier',
|
||||||
|
field: 'id',
|
||||||
|
align: 'left',
|
||||||
|
sortable: true,
|
||||||
|
columnFilter: {
|
||||||
|
component: VnInput,
|
||||||
|
type: 'text',
|
||||||
|
filterValue: null,
|
||||||
|
event: getInputEvents,
|
||||||
|
attrs: {
|
||||||
|
dense: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: t('salesTicketsTable.client'),
|
||||||
|
name: 'client',
|
||||||
|
align: 'left',
|
||||||
|
field: 'nickname',
|
||||||
|
sortable: true,
|
||||||
|
columnFilter: {
|
||||||
|
component: VnInput,
|
||||||
|
type: 'text',
|
||||||
|
filterValue: null,
|
||||||
|
event: getInputEvents,
|
||||||
|
attrs: {
|
||||||
|
dense: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: t('salesTicketsTable.salesPerson'),
|
||||||
|
name: 'salesPerson',
|
||||||
|
field: 'userName',
|
||||||
|
align: 'left',
|
||||||
|
sortable: true,
|
||||||
|
columnFilter: {
|
||||||
|
component: VnSelect,
|
||||||
|
filterParamKey: 'salesPersonFk',
|
||||||
|
type: 'select',
|
||||||
|
filterValue: null,
|
||||||
|
event: getInputEvents,
|
||||||
|
attrs: {
|
||||||
|
options: workersActiveOptions.value,
|
||||||
|
'option-value': 'id',
|
||||||
|
'option-label': 'name',
|
||||||
|
dense: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: t('salesTicketsTable.date'),
|
||||||
|
name: 'date',
|
||||||
|
align: 'left',
|
||||||
|
sortable: true,
|
||||||
|
columnFilter: {
|
||||||
|
component: VnInputDate,
|
||||||
|
filterParamKey: 'shippedDate',
|
||||||
|
type: 'date',
|
||||||
|
filterValue: null,
|
||||||
|
event: getInputEvents,
|
||||||
|
attrs: {
|
||||||
|
dense: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: t('salesTicketsTable.theoretical'),
|
||||||
|
name: 'theoretical',
|
||||||
|
field: 'zoneLanding',
|
||||||
|
align: 'left',
|
||||||
|
sortable: true,
|
||||||
|
format: (val) => toTimeFormat(val),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: t('salesTicketsTable.practical'),
|
||||||
|
name: 'practical',
|
||||||
|
field: 'practicalHour',
|
||||||
|
align: 'left',
|
||||||
|
sortable: true,
|
||||||
|
columnFilter: {
|
||||||
|
component: VnInput,
|
||||||
|
type: 'text',
|
||||||
|
filterValue: null,
|
||||||
|
event: getInputEvents,
|
||||||
|
attrs: {
|
||||||
|
dense: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: t('salesTicketsTable.preparation'),
|
||||||
|
name: 'preparation',
|
||||||
|
field: 'shipped',
|
||||||
|
align: 'left',
|
||||||
|
sortable: true,
|
||||||
|
format: (val) => toTimeFormat(val),
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
label: t('salesTicketsTable.province'),
|
||||||
|
name: 'province',
|
||||||
|
field: 'province',
|
||||||
|
align: 'left',
|
||||||
|
sortable: true,
|
||||||
|
columnFilter: {
|
||||||
|
component: VnSelect,
|
||||||
|
filterParamKey: 'provinceFk',
|
||||||
|
type: 'select',
|
||||||
|
filterValue: null,
|
||||||
|
event: getInputEvents,
|
||||||
|
attrs: {
|
||||||
|
options: provincesOptions.value,
|
||||||
|
'option-value': 'id',
|
||||||
|
'option-label': 'name',
|
||||||
|
dense: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: t('salesTicketsTable.state'),
|
||||||
|
name: 'state',
|
||||||
|
align: 'left',
|
||||||
|
sortable: true,
|
||||||
|
columnFilter: {
|
||||||
|
component: VnSelect,
|
||||||
|
filterParamKey: 'stateFk',
|
||||||
|
type: 'select',
|
||||||
|
filterValue: null,
|
||||||
|
event: getInputEvents,
|
||||||
|
attrs: {
|
||||||
|
options: statesOptions.value,
|
||||||
|
'option-value': 'id',
|
||||||
|
'option-label': 'name',
|
||||||
|
dense: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: t('salesTicketsTable.isFragile'),
|
||||||
|
name: 'isFragile',
|
||||||
|
field: 'isFragile',
|
||||||
|
align: 'left',
|
||||||
|
sortable: true,
|
||||||
|
columnFilter: {
|
||||||
|
component: VnInput,
|
||||||
|
type: 'text',
|
||||||
|
filterValue: null,
|
||||||
|
event: getInputEvents,
|
||||||
|
attrs: {
|
||||||
|
dense: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: t('salesTicketsTable.zone'),
|
||||||
|
name: 'zone',
|
||||||
|
align: 'left',
|
||||||
|
sortable: true,
|
||||||
|
columnFilter: {
|
||||||
|
component: VnSelect,
|
||||||
|
filterParamKey: 'zoneFk',
|
||||||
|
type: 'select',
|
||||||
|
filterValue: null,
|
||||||
|
event: getInputEvents,
|
||||||
|
attrs: {
|
||||||
|
options: zonesOptions.value,
|
||||||
|
'option-value': 'id',
|
||||||
|
'option-label': 'name',
|
||||||
|
dense: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: t('salesTicketsTable.total'),
|
||||||
|
name: 'total',
|
||||||
|
field: 'totalWithVat',
|
||||||
|
align: 'left',
|
||||||
|
sortable: true,
|
||||||
|
columnFilter: {
|
||||||
|
component: VnInput,
|
||||||
|
type: 'text',
|
||||||
|
filterValue: null,
|
||||||
|
event: getInputEvents,
|
||||||
|
attrs: {
|
||||||
|
dense: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'rowActions',
|
||||||
|
align: 'left',
|
||||||
|
sortable: true,
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
const getBadgeAttrs = (date) => {
|
||||||
|
let today = Date.vnNew();
|
||||||
|
today.setHours(0, 0, 0, 0);
|
||||||
|
let timeTicket = new Date(date);
|
||||||
|
timeTicket.setHours(0, 0, 0, 0);
|
||||||
|
|
||||||
|
let comparation = today - timeTicket;
|
||||||
|
|
||||||
|
if (comparation == 0) return { color: 'warning', 'text-color': 'black' };
|
||||||
|
if (comparation < 0) return { color: 'success', 'text-color': 'black' };
|
||||||
|
return { color: 'transparent', 'text-color': 'white' };
|
||||||
|
};
|
||||||
|
let refreshTimer = null;
|
||||||
|
const autoRefreshHandler = (value) => {
|
||||||
|
if (value)
|
||||||
|
refreshTimer = setInterval(() => paginateRef.value.fetch(), DEFAULT_AUTO_REFRESH);
|
||||||
|
else {
|
||||||
|
clearInterval(refreshTimer);
|
||||||
|
refreshTimer = null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
const redirectToTicketSummary = (id) => {
|
||||||
|
router.push({ name: 'TicketSummary', params: { id } });
|
||||||
|
};
|
||||||
|
|
||||||
|
const stateColors = {
|
||||||
|
notice: 'info',
|
||||||
|
success: 'positive',
|
||||||
|
warning: 'warning',
|
||||||
|
alert: 'negative',
|
||||||
|
};
|
||||||
|
|
||||||
|
const totalPriceColor = (ticket) => {
|
||||||
|
const total = parseInt(ticket.totalWithVat);
|
||||||
|
if (total > 0 && total < 50) return 'warning';
|
||||||
|
};
|
||||||
|
|
||||||
|
const formatShippedDate = (date) => {
|
||||||
|
if (!date) return '-';
|
||||||
|
const split1 = date.split('T');
|
||||||
|
const [year, month, day] = split1[0].split('-');
|
||||||
|
const _date = new Date(year, month - 1, day);
|
||||||
|
return toDateFormat(_date);
|
||||||
|
};
|
||||||
|
|
||||||
|
onMounted(async () => {
|
||||||
|
const filteredColumns = columns.value.filter((col) => col.name !== 'rowActions');
|
||||||
|
allColumnNames.value = filteredColumns.map((col) => col.name);
|
||||||
|
params = fetchParams();
|
||||||
|
await paginateRef.value.addFilter(null, params);
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<FetchData
|
||||||
|
url="Workers/activeWithInheritedRole"
|
||||||
|
:filter="{
|
||||||
|
fields: ['id', 'nickname'],
|
||||||
|
order: 'nickname ASC',
|
||||||
|
where: { role: 'salesPerson' },
|
||||||
|
}"
|
||||||
|
auto-load
|
||||||
|
@on-fetch="(data) => (workersActiveOptions = data)"
|
||||||
|
/>
|
||||||
|
<FetchData
|
||||||
|
url="Provinces"
|
||||||
|
:filter="{
|
||||||
|
fields: ['id', 'name'],
|
||||||
|
order: 'name ASC',
|
||||||
|
}"
|
||||||
|
auto-load
|
||||||
|
@on-fetch="(data) => (provincesOptions = data)"
|
||||||
|
/>
|
||||||
|
<FetchData
|
||||||
|
url="States"
|
||||||
|
:filter="{
|
||||||
|
fields: ['id', 'name'],
|
||||||
|
order: 'name ASC',
|
||||||
|
}"
|
||||||
|
auto-load
|
||||||
|
@on-fetch="(data) => (statesOptions = data)"
|
||||||
|
/>
|
||||||
|
<FetchData
|
||||||
|
url="Zones"
|
||||||
|
:filter="{
|
||||||
|
fields: ['id', 'name'],
|
||||||
|
order: 'name ASC',
|
||||||
|
}"
|
||||||
|
auto-load
|
||||||
|
@on-fetch="(data) => (zonesOptions = data)"
|
||||||
|
/>
|
||||||
|
<VnPaginate
|
||||||
|
ref="paginateRef"
|
||||||
|
data-key="SalesMonitorTickets"
|
||||||
|
url="SalesMonitors/salesFilter"
|
||||||
|
:filter="filter"
|
||||||
|
:limit="20"
|
||||||
|
:expr-builder="exprBuilder"
|
||||||
|
:user-params="params"
|
||||||
|
:offset="50"
|
||||||
|
>
|
||||||
|
<template #body="{ rows }">
|
||||||
|
<QTable
|
||||||
|
:rows="rows"
|
||||||
|
:columns="columns"
|
||||||
|
row-key="id"
|
||||||
|
:pagination="{ rowsPerPage: 0 }"
|
||||||
|
:visible-columns="visibleColumns"
|
||||||
|
:no-data-label="t('globals.noResults')"
|
||||||
|
@row-click="(_, row) => redirectToTicketSummary(row.id)"
|
||||||
|
>
|
||||||
|
<template #top>
|
||||||
|
<TableVisibleColumns
|
||||||
|
:all-columns="allColumnNames"
|
||||||
|
table-code="ticketsMonitor"
|
||||||
|
labels-traductions-path="salesTicketsTable"
|
||||||
|
@on-config-saved="visibleColumns = [...$event, 'rowActions']"
|
||||||
|
/>
|
||||||
|
<QCheckbox
|
||||||
|
v-model="autoRefresh"
|
||||||
|
:label="t('salesTicketsTable.autoRefresh')"
|
||||||
|
@update:model-value="autoRefreshHandler"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
<template #top-row="{ cols }">
|
||||||
|
<QTr>
|
||||||
|
<QTd
|
||||||
|
v-for="(col, index) in cols"
|
||||||
|
:key="index"
|
||||||
|
style="max-width: 100px"
|
||||||
|
>
|
||||||
|
<component
|
||||||
|
:is="col.columnFilter.component"
|
||||||
|
v-if="col.columnFilter"
|
||||||
|
v-model="col.columnFilter.filterValue"
|
||||||
|
v-bind="col.columnFilter.attrs"
|
||||||
|
v-on="col.columnFilter.event(col)"
|
||||||
|
dense
|
||||||
|
style="padding-bottom: 0"
|
||||||
|
/>
|
||||||
|
</QTd>
|
||||||
|
</QTr>
|
||||||
|
</template>
|
||||||
|
<template #body-cell-problems="{ row }">
|
||||||
|
<QTd class="q-gutter-x-sm">
|
||||||
|
<QIcon
|
||||||
|
v-if="row.isTaxDataChecked === 0"
|
||||||
|
name="vn:no036"
|
||||||
|
color="primary"
|
||||||
|
size="xs"
|
||||||
|
>
|
||||||
|
<QTooltip>{{
|
||||||
|
t('salesTicketsTable.noVerifiedData')
|
||||||
|
}}</QTooltip>
|
||||||
|
</QIcon>
|
||||||
|
<QIcon
|
||||||
|
v-if="row.hasTicketRequest"
|
||||||
|
name="vn:buyrequest"
|
||||||
|
color="primary"
|
||||||
|
size="xs"
|
||||||
|
>
|
||||||
|
<QTooltip>{{
|
||||||
|
t('salesTicketsTable.purchaseRequest')
|
||||||
|
}}</QTooltip>
|
||||||
|
</QIcon>
|
||||||
|
<QIcon
|
||||||
|
v-if="row.itemShortage"
|
||||||
|
name="vn:unavailable"
|
||||||
|
color="primary"
|
||||||
|
size="xs"
|
||||||
|
>
|
||||||
|
<QTooltip>{{ t('salesTicketsTable.notVisible') }}</QTooltip>
|
||||||
|
</QIcon>
|
||||||
|
<QIcon
|
||||||
|
v-if="row.isFreezed"
|
||||||
|
name="vn:frozen"
|
||||||
|
color="primary"
|
||||||
|
size="xs"
|
||||||
|
>
|
||||||
|
<QTooltip>{{ t('salesTicketsTable.clientFrozen') }}</QTooltip>
|
||||||
|
</QIcon>
|
||||||
|
<QIcon
|
||||||
|
v-if="row.risk"
|
||||||
|
name="vn:risk"
|
||||||
|
:color="row.hasHighRisk ? 'negative' : 'primary'"
|
||||||
|
size="xs"
|
||||||
|
>
|
||||||
|
<QTooltip
|
||||||
|
>{{ t('salesTicketsTable.risk') }}:
|
||||||
|
{{ row.risk }}</QTooltip
|
||||||
|
>
|
||||||
|
</QIcon>
|
||||||
|
<QIcon
|
||||||
|
v-if="row.hasComponentLack"
|
||||||
|
name="vn:components"
|
||||||
|
color="primary"
|
||||||
|
size="xs"
|
||||||
|
>
|
||||||
|
<QTooltip>{{
|
||||||
|
t('salesTicketsTable.componentLack')
|
||||||
|
}}</QTooltip>
|
||||||
|
</QIcon>
|
||||||
|
<QIcon
|
||||||
|
v-if="row.isTooLittle"
|
||||||
|
name="vn:isTooLittle"
|
||||||
|
color="primary"
|
||||||
|
size="xs"
|
||||||
|
>
|
||||||
|
<QTooltip>{{ t('salesTicketsTable.tooLittle') }}</QTooltip>
|
||||||
|
</QIcon>
|
||||||
|
</QTd>
|
||||||
|
</template>
|
||||||
|
<template #body-cell-identifier="{ row }">
|
||||||
|
<QTd>
|
||||||
|
<span class="link" @click.stop.prevent>{{ row.id }}</span>
|
||||||
|
<TicketDescriptorProxy :id="row.id" />
|
||||||
|
</QTd>
|
||||||
|
</template>
|
||||||
|
<template #body-cell-client="{ row }">
|
||||||
|
<QTd @click.stop.prevent>
|
||||||
|
<span class="link">{{ row.nickname }}</span>
|
||||||
|
<CustomerDescriptorProxy :id="row.clientFk" />
|
||||||
|
</QTd>
|
||||||
|
</template>
|
||||||
|
<template #body-cell-salesPerson="{ row }">
|
||||||
|
<QTd @click.stop.prevent>
|
||||||
|
<span class="link">{{ row.userName }}</span>
|
||||||
|
<WorkerDescriptorProxy :id="row.salesPersonFk" />
|
||||||
|
</QTd>
|
||||||
|
</template>
|
||||||
|
<template #body-cell-date="{ row }">
|
||||||
|
<QTd>
|
||||||
|
<QBadge
|
||||||
|
v-bind="getBadgeAttrs(row.shippedDate)"
|
||||||
|
class="q-ma-none"
|
||||||
|
dense
|
||||||
|
style="font-size: 14px"
|
||||||
|
>
|
||||||
|
{{ formatShippedDate(row.shippedDate) }}
|
||||||
|
</QBadge>
|
||||||
|
</QTd>
|
||||||
|
</template>
|
||||||
|
<template #body-cell-state="{ row }">
|
||||||
|
<QTd @click.stop.prevent>
|
||||||
|
<div v-if="row.refFk">
|
||||||
|
<span class="link">{{ row.refFk }}</span>
|
||||||
|
<InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
|
||||||
|
</div>
|
||||||
|
<QBadge
|
||||||
|
v-else
|
||||||
|
:color="stateColors[row.classColor] || 'transparent'"
|
||||||
|
:text-color="stateColors[row.classColor] ? 'black' : 'white'"
|
||||||
|
dense
|
||||||
|
style="font-size: 14px"
|
||||||
|
>
|
||||||
|
{{ row.state }}
|
||||||
|
</QBadge>
|
||||||
|
</QTd>
|
||||||
|
</template>
|
||||||
|
<template #body-cell-isFragile="{ row }">
|
||||||
|
<QTd>
|
||||||
|
<QIcon
|
||||||
|
v-if="row.isFragile"
|
||||||
|
name="local_bar"
|
||||||
|
color="primary"
|
||||||
|
size="sm"
|
||||||
|
>
|
||||||
|
<QTooltip>{{ t('salesTicketsTable.isFragile') }}</QTooltip>
|
||||||
|
</QIcon>
|
||||||
|
</QTd>
|
||||||
|
</template>
|
||||||
|
<template #body-cell-zone="{ row }">
|
||||||
|
<QTd @click.stop.prevent>
|
||||||
|
<span class="link">{{ row.zoneName }}</span>
|
||||||
|
<ZoneDescriptorProxy :id="row.zoneFk" />
|
||||||
|
</QTd>
|
||||||
|
</template>
|
||||||
|
<template #body-cell-total="{ row }">
|
||||||
|
<QTd>
|
||||||
|
<QBadge
|
||||||
|
:color="totalPriceColor(row) || 'transparent'"
|
||||||
|
:text-color="totalPriceColor(row) ? 'black' : 'white'"
|
||||||
|
dense
|
||||||
|
style="font-size: 14px"
|
||||||
|
>
|
||||||
|
{{ toCurrency(row.totalWithVat) }}
|
||||||
|
</QBadge>
|
||||||
|
</QTd>
|
||||||
|
</template>
|
||||||
|
<template #body-cell-rowActions="{ row }">
|
||||||
|
<QTd @click.stop.prevent>
|
||||||
|
<QBtn
|
||||||
|
icon="vn:lines"
|
||||||
|
color="primary"
|
||||||
|
size="md"
|
||||||
|
class="q-mr-sm"
|
||||||
|
flat
|
||||||
|
dense
|
||||||
|
:to="{ name: 'TicketSale', params: { id: row.id } }"
|
||||||
|
>
|
||||||
|
<QTooltip>{{ t('salesTicketsTable.goToLines') }}</QTooltip>
|
||||||
|
</QBtn>
|
||||||
|
<QBtn
|
||||||
|
icon="preview"
|
||||||
|
color="primary"
|
||||||
|
size="md"
|
||||||
|
dense
|
||||||
|
flat
|
||||||
|
@click="viewSummary(row.id, TicketSummary)"
|
||||||
|
>
|
||||||
|
<QTooltip>{{ t('salesTicketsTable.preview') }}</QTooltip>
|
||||||
|
</QBtn>
|
||||||
|
</QTd>
|
||||||
|
</template>
|
||||||
|
</QTable>
|
||||||
|
</template>
|
||||||
|
</VnPaginate>
|
||||||
|
</template>
|
|
@ -0,0 +1,45 @@
|
||||||
|
salesMonitor:
|
||||||
|
clientsOnWebsite: Clients on website
|
||||||
|
recentOrderActions: Recent order actions
|
||||||
|
ticketsMonitor: Tickets monitor
|
||||||
|
salesClientsTable:
|
||||||
|
from: From
|
||||||
|
to: To
|
||||||
|
date: Date
|
||||||
|
hour: Hour
|
||||||
|
salesPerson: Salesperson
|
||||||
|
client: Client
|
||||||
|
salesOrdersTable:
|
||||||
|
delete: Delete
|
||||||
|
date: Date
|
||||||
|
client: Client
|
||||||
|
salesPerson: Salesperson
|
||||||
|
deleteConfirmTitle: Delete selected elements
|
||||||
|
deleteConfirmMessage: All the selected elements will be deleted. Are you sure you want to continue?
|
||||||
|
salesTicketsTable:
|
||||||
|
autoRefresh: Auto-refresh
|
||||||
|
problems: Problems
|
||||||
|
noVerifiedData: No verified data
|
||||||
|
notVisible: Not visible
|
||||||
|
purchaseRequest: Purchase request
|
||||||
|
clientFrozen: Client frozen
|
||||||
|
risk: Risk
|
||||||
|
componentLack: Component lack
|
||||||
|
tooLittle: Ticket too little
|
||||||
|
identifier: Identifier
|
||||||
|
client: Client
|
||||||
|
salesPerson: Salesperson
|
||||||
|
date: Date
|
||||||
|
theoretical: Theoretical
|
||||||
|
practical: Practical
|
||||||
|
province: Province
|
||||||
|
state: State
|
||||||
|
isFragile: Is fragile
|
||||||
|
zone: Zone
|
||||||
|
goToLines: Go to lines
|
||||||
|
preview: Preview
|
||||||
|
total: Total
|
||||||
|
preparation: Preparation
|
||||||
|
searchBar:
|
||||||
|
label: Search tickets
|
||||||
|
info: Search tickets by id or alias
|
|
@ -0,0 +1,45 @@
|
||||||
|
salesMonitor:
|
||||||
|
clientsOnWebsite: Clientes activos en la web
|
||||||
|
recentOrderActions: Acciones recientes en pedidos
|
||||||
|
ticketsMonitor: Monitor de tickets
|
||||||
|
salesClientsTable:
|
||||||
|
from: Desde
|
||||||
|
to: Hasta
|
||||||
|
date: Fecha
|
||||||
|
hour: Hora
|
||||||
|
salesPerson: Comercial
|
||||||
|
client: Cliente
|
||||||
|
salesOrdersTable:
|
||||||
|
delete: Eliminar
|
||||||
|
date: Fecha
|
||||||
|
client: Cliente
|
||||||
|
salesPerson: Comercial
|
||||||
|
deleteConfirmTitle: Eliminar los elementos seleccionados
|
||||||
|
deleteConfirmMessage: Todos los elementos seleccionados serán eliminados. ¿Seguro que quieres continuar?
|
||||||
|
salesTicketsTable:
|
||||||
|
autoRefresh: Auto-refresco
|
||||||
|
problems: Problemas
|
||||||
|
noVerifiedData: Sin datos comprobados
|
||||||
|
notVisible: No visible
|
||||||
|
purchaseRequest: Petición de compra
|
||||||
|
clientFrozen: Cliente congelado
|
||||||
|
risk: Riesgo
|
||||||
|
componentLack: Faltan componentes
|
||||||
|
tooLittle: Ticket demasiado pequeño
|
||||||
|
identifier: Identificador
|
||||||
|
client: Cliente
|
||||||
|
salesPerson: Comercial
|
||||||
|
date: Fecha
|
||||||
|
theoretical: Teórica
|
||||||
|
practical: Práctica
|
||||||
|
province: Provincia
|
||||||
|
state: Estado
|
||||||
|
isFragile: Es frágil
|
||||||
|
zone: Zona
|
||||||
|
goToLines: Ir a líneas
|
||||||
|
preview: Vista previa
|
||||||
|
total: Total
|
||||||
|
preparation: Preparación
|
||||||
|
searchBar:
|
||||||
|
label: Buscar tickets
|
||||||
|
info: Buscar tickets por identificador o alias
|
|
@ -1,7 +1,19 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import VnCard from 'components/common/VnCard.vue';
|
import VnCard from 'components/common/VnCard.vue';
|
||||||
import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
|
import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
|
||||||
|
import OrderFilter from './OrderFilter.vue';
|
||||||
|
import OrderSearchbar from './OrderSearchbar.vue';
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<VnCard data-key="Order" base-url="Orders" :descriptor="OrderDescriptor" />
|
<VnCard
|
||||||
|
data-key="Order"
|
||||||
|
base-url="Orders"
|
||||||
|
:descriptor="OrderDescriptor"
|
||||||
|
:filter-panel="OrderFilter"
|
||||||
|
search-data-key="OrderList"
|
||||||
|
>
|
||||||
|
<template #searchbar>
|
||||||
|
<OrderSearchbar />
|
||||||
|
</template>
|
||||||
|
</VnCard>
|
||||||
</template>
|
</template>
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue