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

Merge branch 'dev' into 7717_fixOrderCatalog

This commit is contained in:
Jon Elias 2024-07-26 12:11:18 +00:00
parent 4cad7cbced 7b13250a16
commit 356e7768b7
99 changed files with 415 additions and 370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/boot/qformMixin.js
View File

@ -1,28 +1,11 @@
import { getCurrentInstance } from 'vue';
const filterAvailableInput = (element) => {
return element.classList.contains('q-field__native') && !element.disabled;
};
const filterAvailableText = (element) => {
return (
element.__vueParentComponent.type.name === 'QInput' &&
element.__vueParentComponent?.attrs?.class !== 'vn-input-date'
);
};
export default {
mounted: function () {
const vm = getCurrentInstance();
if (vm.type.name === 'QForm') {
if (!['searchbarForm', 'filterPanelForm'].includes(this.$el?.id)) {
// AUTOFOCUS
const elementsArray = Array.from(this.$el.elements);
const availableInputs = elementsArray.filter(filterAvailableInput);
const firstInputElement = availableInputs.find(filterAvailableText);
if (firstInputElement) {
firstInputElement.focus();
}
// TODO: AUTOFOCUS IS NOT FOCUSING
const that = this;
this.$el.addEventListener('keyup', function (evt) {
if (evt.key === 'Enter') {

4
src/components/CreateBankEntityForm.vue
View File

@ -52,7 +52,7 @@ onMounted(async () => {
@on-data-saved="onDataSaved"
>
<template #form-inputs="{ data, validate }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('name')"
v-model="data.name"
@ -67,7 +67,7 @@ onMounted(async () => {
:rules="validate('bankEntity.bic')"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnSelect
:label="t('country')"

6
src/components/CreateManualInvoiceForm.vue
View File

@ -59,7 +59,7 @@ const onDataSaved = async (formData, requestResponse) => {
<QIcon name="warning" class="fill-icon q-mr-sm" size="md" />
{{ t('Invoicing in progress...') }}
</span>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('Ticket')"
:options="ticketsOptions"
@ -99,7 +99,7 @@ const onDataSaved = async (formData, requestResponse) => {
/>
<VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('Serial')"
:options="invoiceOutSerialsOptions"
@ -117,7 +117,7 @@ const onDataSaved = async (formData, requestResponse) => {
v-model="data.taxArea"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('Reference')"
type="textarea"

2
src/components/CreateNewCityForm.vue
View File

@ -39,7 +39,7 @@ const onDataSaved = (dataSaved) => {
@on-data-saved="onDataSaved($event)"
>
<template #form-inputs="{ data, validate }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('Name')"
v-model="data.name"

2
src/components/CreateNewPostcodeForm.vue
View File

@ -91,7 +91,7 @@ const onProvinceCreated = async ({ name }, formData) => {
@on-data-saved="onDataSaved"
>
<template #form-inputs="{ data, validate }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('Postcode')"
v-model="data.code"

2
src/components/CreateNewProvinceForm.vue
View File

@ -39,7 +39,7 @@ const onDataSaved = (dataSaved) => {
@on-data-saved="onDataSaved($event)"
>
<template #form-inputs="{ data, validate }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('Name')"
v-model="data.name"

2
src/components/CreateThermographForm.vue
View File

@ -53,7 +53,7 @@ const onDataSaved = (dataSaved) => {
@on-data-saved="onDataSaved($event)"
>
<template #form-inputs="{ data, validate }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('Identifier')"
v-model="data.thermographId"

6
src/components/EditPictureForm.vue
View File

@ -245,14 +245,14 @@ const makeRequest = async () => {
</div>
<div class="column">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QOptionGroup
:options="uploadMethodsOptions"
type="radio"
v-model="uploadMethodSelected"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QFile
v-if="uploadMethodSelected === 'computer'"
ref="inputFileRef"
@ -287,7 +287,7 @@ const makeRequest = async () => {
placeholder="https://"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('Orientation')"
:options="viewportTypes"

2
src/components/EditTableCellValueForm.vue
View File

@ -82,7 +82,7 @@ const closeForm = () => {
<span class="title">{{ t('Edit') }}</span>
<span class="countLines">{{ ` ${rows.length} ` }}</span>
<span class="title">{{ t('buy(s)') }}</span>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('Field to edit')"
:options="fieldsOptions"

2
src/components/FilterItemForm.vue
View File

@ -151,7 +151,7 @@ const selectItem = ({ id }) => {
<QIcon name="close" size="sm" />
</span>
<h1 class="title">{{ t('Filter item') }}</h1>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput :label="t('entry.buys.name')" v-model="itemFilterParams.name" />
<VnInput :label="t('entry.buys.size')" v-model="itemFilterParams.size" />
<VnSelect

2
src/components/FilterTravelForm.vue
View File

@ -144,7 +144,7 @@ const selectTravel = ({ id }) => {
<QIcon name="close" size="sm" />
</span>
<h1 class="title">{{ t('Filter travels') }}</h1>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('entry.basicData.agency')"
:options="agenciesOptions"

11
src/components/RegularizeStockForm.vue
View File

@ -15,7 +15,7 @@ const props = defineProps({
default: null,
},
warehouseFk: {
type: Boolean,
type: Number,
default: null,
},
});
@ -23,7 +23,7 @@ const props = defineProps({
const { t } = useI18n();
const regularizeFormData = reactive({
itemFk: props.itemFk,
itemFk: Number(props.itemFk),
warehouseFk: props.warehouseFk,
quantity: null,
});
@ -49,18 +49,19 @@ const onDataSaved = (data) => {
@on-data-saved="onDataSaved($event)"
>
<template #form-inputs="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QInput
:label="t('Type the visible quantity')"
v-model.number="data.quantity"
type="number"
autofocus
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnSelect
:label="t('Warehouse')"
v-model="data.warehouseFk"
v-model.number="data.warehouseFk"
:options="warehousesOptions"
option-value="id"
option-label="name"

21
src/components/TransferInvoiceForm.vue
View File

@ -118,13 +118,13 @@ const makeInvoice = async () => {
/>
<QDialog ref="dialogRef">
<FormPopup
@on-submit="makeInvoice()"
:title="t('Transfer invoice')"
:custom-submit-button-label="t('Transfer client')"
:default-cancel-button="false"
@on-submit="makeInvoice()"
:title="t('Transfer invoice')"
:custom-submit-button-label="t('Transfer client')"
:default-cancel-button="false"
>
<template #form-inputs>
<VnRow class="row q-gutter-md q-mb-md">
<template #form-inputs>
<VnRow>
<VnSelect
:label="t('Client')"
:options="clientsOptions"
@ -160,7 +160,7 @@ const makeInvoice = async () => {
:required="true"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('Class')"
:options="siiTypeInvoiceOutsOptions"
@ -191,9 +191,12 @@ const makeInvoice = async () => {
:required="true"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div>
<QCheckbox :label="t('Bill destination client')" v-model="checked" />
<QCheckbox
:label="t('Bill destination client')"
v-model="checked"
/>
<QIcon name="info" class="cursor-info q-ml-sm" size="sm">
<QTooltip>{{ t('transferInvoiceInfo') }}</QTooltip>
</QIcon>

2
src/components/VnTable/VnFilter.vue
View File

@ -45,7 +45,7 @@ const defaultAttrs = {
};
const forceAttrs = {
label: $props.showTitle ? '' : $props.column.label,
label: $props.showTitle ? '' : columnFilter.value?.label ?? $props.column.label,
};
const selectComponent = {

5
src/components/VnTable/VnTable.vue
View File

@ -313,11 +313,6 @@ defineExpose({
:params="params"
:columns="splittedColumns.columns"
/>
<slot
name="moreFilterPanel"
:params="params"
:columns="splittedColumns.columns"
/>
</template>
</VnFilterPanel>
</QScrollArea>

2
src/components/VnTable/VnVisibleColumn.vue
View File

@ -81,7 +81,7 @@ async function fetchViewConfigData() {
return;
}
} catch (err) {
console.err('Error fetching config view data', err);
console.error('Error fetching config view data', err);
}
}

2
src/components/common/TableVisibleColumns.vue
View File

@ -84,7 +84,7 @@ const fetchViewConfigData = async () => {
setUserConfigViewData(defaultColumns);
}
} catch (err) {
console.err('Error fetching config view data', err);
console.error('Error fetching config view data', err);
}
};

17
src/components/ui/VnRow.vue
View File

@ -3,26 +3,19 @@ defineProps({ wrap: { type: Boolean, default: false } });
</script>
<template>
<div class="vn-row q-gutter-md q-mb-md" :class="{ wrap }">
<slot />
<slot></slot>
</div>
</template>
<style lang="scss" scoped>
<style lang="scss" scopped>
.vn-row {
display: flex;
&.wrap {
flex-wrap: wrap;
}
&:not(.wrap) {
> :slotted(*) {
flex: 1;
}
> * {
flex: 1;
}
}
@media screen and (max-width: 800px) {
.vn-row {
&:not(.wrap) {
flex-direction: column;
}
flex-direction: column;
}
}
</style>

36
src/css/app.scss
View File

@ -209,27 +209,29 @@ input::-webkit-inner-spin-button {
max-width: 100%;
}
/* ===== Scrollbar CSS ===== /
/ Firefox */
.q-table__container {
/* ===== Scrollbar CSS ===== /
/ Firefox */
* {
scrollbar-width: auto;
scrollbar-color: var(--vn-label-color) transparent;
}
* {
scrollbar-width: auto;
scrollbar-color: var(--vn-label-color) transparent;
}
/* Chrome, Edge, and Safari */
*::-webkit-scrollbar {
width: 10px;
height: 10px;
}
/* Chrome, Edge, and Safari */
*::-webkit-scrollbar {
width: 10px;
height: 10px;
}
*::-webkit-scrollbar-thumb {
background-color: var(--vn-label-color);
border-radius: 10px;
}
*::-webkit-scrollbar-thumb {
background-color: var(--vn-label-color);
border-radius: 10px;
}
*::-webkit-scrollbar-track {
background: transparent;
*::-webkit-scrollbar-track {
background: transparent;
}
}
.q-table {

4
src/pages/Account/Alias/AliasCreateForm.vue
View File

@ -34,12 +34,12 @@ const onDataSaved = ({ id }) => {
@on-data-saved="onDataSaved"
>
<template #form-inputs="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnInput v-model="data.alias" :label="t('mailAlias.name')" />
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnInput
v-model="data.description"

2
src/pages/Account/Card/AccountMailAliasCreateForm.vue
View File

@ -33,7 +33,7 @@ const aliasOptions = ref([]);
@on-submit="emit('onSubmitCreateAlias', aliasFormData)"
>
<template #form-inputs>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnSelect
:label="t('account.card.alias')"

6
src/pages/Account/Role/Card/RoleBasicData.vue
View File

@ -10,12 +10,12 @@ const { t } = useI18n();
<template>
<FormModel :url="`VnRoles/${route.params.id}`" model="VnRole" auto-load>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnInput v-model="data.name" :label="t('role.card.name')" />
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnInput
v-model="data.description"
@ -23,7 +23,7 @@ const { t } = useI18n();
/>
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
</div>

4
src/pages/Account/Role/Card/RoleForm.vue
View File

@ -21,12 +21,12 @@ const { t } = useI18n();
"
>
<template #form-inputs="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnInput v-model="data.name" :label="t('role.card.name')" />
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnInput
v-model="data.description"

2
src/pages/Account/Role/Card/SubRoleCreateForm.vue
View File

@ -33,7 +33,7 @@ const rolesOptions = ref([]);
@on-submit="emit('onSubmitCreateSubrole', subRoleFormData)"
>
<template #form-inputs>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnSelect
:label="t('account.card.role')"

6
src/pages/Claim/Card/ClaimBasicData.vue
View File

@ -74,7 +74,7 @@ const statesFilter = {
:reload="true"
>
<template #form="{ data, validate, filter }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.client.name"
:label="t('claim.customer')"
@ -82,7 +82,7 @@ const statesFilter = {
/>
<VnInputDate v-model="data.created" :label="t('claim.created')" />
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('claim.assignedTo')"
v-model="data.workerFk"
@ -120,7 +120,7 @@ const statesFilter = {
>
</QSelect>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QInput
v-model.number="data.packages"
:label="t('globals.packages')"

10
src/pages/Customer/Card/CustomerBasicData.vue
View File

@ -67,7 +67,7 @@ const filterOptions = {
<FormModel :url="`Clients/${route.params.id}`" auto-load model="customer">
<template #form="{ data, validate, filter }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('globals.name')"
:rules="validate('client.socialName')"
@ -88,7 +88,7 @@ const filterOptions = {
v-model="data.businessTypeFk"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('customer.basicData.contact')"
:rules="validate('client.contact')"
@ -111,7 +111,7 @@ const filterOptions = {
</template>
</VnInput>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('customer.basicData.phone')"
:rules="validate('client.phone')"
@ -125,7 +125,7 @@ const filterOptions = {
v-model="data.mobile"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QSelect
:input-debounce="0"
:label="t('customer.basicData.salesPerson')"
@ -162,7 +162,7 @@ const filterOptions = {
:input-debounce="0"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QSelect
:input-debounce="0"
:label="t('customer.basicData.previousClient')"

6
src/pages/Customer/Card/CustomerBillingData.vue
View File

@ -47,7 +47,7 @@ const getBankEntities = (data, formData) => {
model="customer"
>
<template #form="{ data, validate }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('Billing data')"
:options="payMethods"
@ -59,7 +59,7 @@ const getBankEntities = (data, formData) => {
<VnInput :label="t('Due day')" clearable v-model="data.dueDay" />
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput :label="t('IBAN')" clearable v-model="data.iban">
<template #append>
<QIcon name="info" class="cursor-info">
@ -94,7 +94,7 @@ const getBankEntities = (data, formData) => {
</VnSelectDialog>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QCheckbox :label="t('Received LCR')" v-model="data.hasLcr" />
<QCheckbox :label="t('VNL core received')" v-model="data.hasCoreVnl" />
<QCheckbox :label="t('VNL B2B received')" v-model="data.hasSepaVnl" />

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

@ -88,7 +88,7 @@ watch(
:url-create="`Clients/${route.params.id}/setRating`"
>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnInput
:label="t('Rating')"

8
src/pages/Customer/Card/CustomerFiscalData.vue
View File

@ -40,7 +40,7 @@ function handleLocation(data, location) {
model="customer"
>
<template #form="{ data, validate }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('Social name')"
:required="true"
@ -57,11 +57,11 @@ function handleLocation(data, location) {
<VnInput :label="t('Tax number')" clearable v-model="data.fi" />
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput :label="t('Street')" clearable v-model="data.street" />
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('Sage tax type')"
:options="typesTaxes"
@ -91,7 +91,7 @@ function handleLocation(data, location) {
</VnSelect>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnLocation
:rules="validate('Worker.postcode')"
:roles-allowed-to-create="['deliveryAssistant']"

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

@ -134,7 +134,7 @@ watch(
<div class="full-width flex justify-center">
<QCard class="card-width q-pa-lg">
<QForm>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<QCheckbox :label="t('Unpaid client')" v-model="unpaidClient" />
</div>

12
src/pages/Customer/CustomerCreate.vue
View File

@ -48,7 +48,7 @@ function handleLocation(data, location) {
url-create="Clients/createWithUser"
>
<template #form="{ data, validate }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QInput :label="t('Comercial name')" v-model="data.name" />
<VnSelect
:label="t('Salesperson')"
@ -59,7 +59,7 @@ function handleLocation(data, location) {
v-model="data.salesPersonFk"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('Business type')"
:options="businessTypesOptions"
@ -70,21 +70,21 @@ function handleLocation(data, location) {
/>
<QInput v-model="data.fi" :label="t('Tax number')" />
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QInput
:label="t('Business name')"
:rules="validate('client.socialName')"
v-model="data.socialName"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QInput
:label="t('Street')"
:rules="validate('client.street')"
v-model="data.street"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnLocation
:rules="validate('Worker.postcode')"
:roles-allowed-to-create="['deliveryAssistant']"
@ -95,7 +95,7 @@ function handleLocation(data, location) {
</VnLocation>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QInput v-model="data.userName" :label="t('Web user')" />
<QInput
:label="t('Email')"

2
src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
View File

@ -60,7 +60,7 @@ const onSubmit = async () => {
})
}}
</div>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QInput
:label="t('Message')"
type="textarea"

4
src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
View File

@ -99,7 +99,7 @@ onMounted(async () => {
<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">
<VnRow>
<VnSelect
:options="moreFields"
option-value="code"
@ -109,7 +109,7 @@ onMounted(async () => {
@update:model-value="campaignChange"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInputDate v-model="campaignParams.from" :label="t('From')" />
<VnInputDate v-model="campaignParams.to" :label="t('To')" />
</VnRow>

4
src/pages/Customer/components/CustomerAddressCreate.vue
View File

@ -85,7 +85,7 @@ function handleLocation(data, location) {
<template #form="{ data, validate }">
<QCheckbox :label="t('Default')" v-model="data.isDefaultAddress" />
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput :label="t('Consignee')" clearable v-model="data.nickname" />
<VnInput :label="t('Street address')" clearable v-model="data.street" />
@ -119,7 +119,7 @@ function handleLocation(data, location) {
/>
</div>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('Incoterms')"
:options="incoterms"

10
src/pages/Customer/components/CustomerAddressEdit.vue
View File

@ -146,7 +146,7 @@ function handleLocation(data, location) {
</template>
<template #form="{ data, validate }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<QCheckbox :label="t('Enabled')" v-model="data.isActive" />
</div>
@ -164,7 +164,7 @@ function handleLocation(data, location) {
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnInput :label="t('Consignee')" clearable v-model="data.nickname" />
</div>
@ -173,7 +173,7 @@ function handleLocation(data, location) {
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnLocation
:rules="validate('Worker.postcode')"
@ -185,7 +185,7 @@ function handleLocation(data, location) {
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnSelect
:label="t('Agency')"
@ -204,7 +204,7 @@ function handleLocation(data, location) {
<VnInput :label="t('Mobile')" clearable v-model="data.mobile" />
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnSelect
:label="t('Incoterms')"

2
src/pages/Customer/components/CustomerCreditContractsCreate.vue
View File

@ -39,7 +39,7 @@ const toCustomerCreditContracts = () => {
</template>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnInput
:label="t('Credit')"

8
src/pages/Customer/components/CustomerFileManagementCreate.vue
View File

@ -143,7 +143,7 @@ const toCustomerFileManagement = () => {
<QCard class="q-pa-lg">
<QCardSection>
<QForm>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnInput
:label="t('Reference')"
@ -163,7 +163,7 @@ const toCustomerFileManagement = () => {
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnSelect
:label="t('Warehouse')"
@ -184,7 +184,7 @@ const toCustomerFileManagement = () => {
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnInput
:label="t('Description')"
@ -196,7 +196,7 @@ const toCustomerFileManagement = () => {
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<QFile
ref="inputFileRef"

8
src/pages/Customer/components/CustomerFileManagementEdit.vue
View File

@ -119,7 +119,7 @@ const toCustomerFileManagement = () => {
<QCard class="q-pa-lg">
<QCardSection>
<QForm>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnInput
:label="t('Reference')"
@ -139,7 +139,7 @@ const toCustomerFileManagement = () => {
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnSelect
:label="t('Warehouse')"
@ -160,7 +160,7 @@ const toCustomerFileManagement = () => {
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnInput
:label="t('Description')"
@ -172,7 +172,7 @@ const toCustomerFileManagement = () => {
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<QFile
ref="inputFileRef"

4
src/pages/Customer/components/CustomerGreugeCreate.vue
View File

@ -55,7 +55,7 @@ const toCustomerGreuges = () => {
</template>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('Amount')"
clearable
@ -65,7 +65,7 @@ const toCustomerGreuges = () => {
<VnInputDate :label="t('Date')" v-model="data.shipped" />
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput :label="t('Comment')" clearable v-model="data.description" />
<VnSelect
:label="t('Type')"

4
src/pages/Customer/components/CustomerNewCustomsAgent.vue
View File

@ -22,7 +22,7 @@ const onDataSaved = (dataSaved) => {
url-create="CustomsAgents"
>
<template #form-inputs="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('NIF')"
:required="true"
@ -36,7 +36,7 @@ const onDataSaved = (dataSaved) => {
v-model="data.fiscalName"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput :label="t('Street')" clearable v-model="data.street" />
<VnInput :label="t('Phone')" clearable v-model="data.phone" />
</VnRow>

10
src/pages/Customer/components/CustomerNewPayment.vue
View File

@ -136,7 +136,7 @@ const onDataSaved = async () => {
<h5 class="q-mt-none">{{ t('New payment') }}</h5>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInputDate
:label="t('Date')"
:required="true"
@ -154,7 +154,7 @@ const onDataSaved = async () => {
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('Bank')"
:options="bankOptions"
@ -189,7 +189,7 @@ const onDataSaved = async () => {
{{ t('Compensation') }}
</div>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col" v-if="data.bankFk === 3 || data.bankFk === 3117">
<VnInput
:label="t('Compensation account')"
@ -208,7 +208,7 @@ const onDataSaved = async () => {
<div class="q-mt-lg" v-if="data.bankFk === 2">
<div class="text-h6">{{ t('Cash') }}</div>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('Delivered amount')"
@update:model-value="calculateFromDeliveredAmount($event)"
@ -225,7 +225,7 @@ const onDataSaved = async () => {
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QCheckbox v-model="viewRecipt" />
<QCheckbox v-model="sendEmail" />
</VnRow>

2
src/pages/Customer/components/CustomerNoteCreate.vue
View File

@ -44,7 +44,7 @@ const toCustomerNotes = () => {
</template>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QInput :label="t('Note')" type="textarea" v-model="data.text" />
</VnRow>
</template>

4
src/pages/Customer/components/CustomerRecoverieCreate.vue
View File

@ -49,12 +49,12 @@ const toCustomerRecoveries = () => {
</template>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInputDate :label="t('Since')" v-model="data.started" />
<VnInputDate :label="t('To')" v-model="data.finished" />
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('Amount')"
clearable

2
src/pages/Customer/components/CustomerSamplesCreate.vue
View File

@ -264,7 +264,7 @@ const toCustomerSamples = () => {
/>
</div>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnInput
:label="t('Recipient')"

12
src/pages/Department/Card/DepartmentBasicData.vue
View File

@ -29,7 +29,7 @@ const clientsOptions = ref([]);
class="full-width"
>
<template #form="{ data, validate }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('department.name')"
v-model="data.name"
@ -44,7 +44,7 @@ const clientsOptions = ref([]);
clearable
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('department.chat')"
v-model="data.chatName"
@ -58,7 +58,7 @@ const clientsOptions = ref([]);
clearable
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('department.bossDepartment')"
v-model="data.workerFk"
@ -80,7 +80,7 @@ const clientsOptions = ref([]);
:rules="validate('department.clientFk')"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QCheckbox
:label="t('department.telework')"
v-model="data.isTeleworking"
@ -92,7 +92,7 @@ const clientsOptions = ref([]);
:true-value="1"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QCheckbox
:label="t('department.worksInProduction')"
v-model="data.isProduction"
@ -102,7 +102,7 @@ const clientsOptions = ref([]);
v-model="data.hasToRefill"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QCheckbox
:label="t('department.hasToSendMail')"
v-model="data.hasToSendMail"

12
src/pages/Entry/Card/EntryBasicData.vue
View File

@ -67,7 +67,7 @@ const onFilterTravelSelected = (formData, id) => {
:clear-store-on-unmount="false"
>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('entry.basicData.supplier')"
v-model="data.supplierFk"
@ -121,13 +121,13 @@ const onFilterTravelSelected = (formData, id) => {
</template>
</VnSelectDialog>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.reference"
:label="t('entry.basicData.reference')"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.invoiceNumber"
:label="t('entry.basicData.invoiceNumber')"
@ -143,7 +143,7 @@ const onFilterTravelSelected = (formData, id) => {
:required="true"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('entry.basicData.currency')"
v-model="data.currencyFk"
@ -159,7 +159,7 @@ const onFilterTravelSelected = (formData, id) => {
min="0"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QInput
:label="t('entry.basicData.observation')"
type="textarea"
@ -169,7 +169,7 @@ const onFilterTravelSelected = (formData, id) => {
fill-input
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QCheckbox
v-model="data.isOrdered"
:label="t('entry.basicData.ordered')"

6
src/pages/Entry/Card/EntryBuysImport.vue
View File

@ -197,7 +197,7 @@ const redirectToBuysView = () => {
</div>
</Teleport>
<QCard class="q-pa-lg">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QFile
ref="inputFileRef"
:label="t('entry.buys.file')"
@ -219,13 +219,13 @@ const redirectToBuysView = () => {
</QFile>
</VnRow>
<div v-if="importData.file">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('entry.buys.reference')"
v-model="importData.ref"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('entry.buys.observations')"
v-model="importData.observation"

6
src/pages/Entry/EntryCreate.vue
View File

@ -78,7 +78,7 @@ const redirectToEntryBasicData = (_, { id }) => {
@on-data-saved="redirectToEntryBasicData"
>
<template #form="{ data, validate }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('Supplier')"
class="full-width"
@ -102,7 +102,7 @@ const redirectToEntryBasicData = (_, { id }) => {
</template>
</VnSelect>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('Travel')"
class="full-width"
@ -131,7 +131,7 @@ const redirectToEntryBasicData = (_, { id }) => {
</template>
</VnSelect>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('Company')"
class="full-width"

120
src/pages/Entry/MyEntries.vue
View File

@ -1,71 +1,89 @@
<script setup>
import { computed, onMounted } from 'vue';
import { computed } from 'vue';
import { useI18n } from 'vue-i18n';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
import { useStateStore } from 'stores/useStateStore';
import { toDate } from 'src/filters/index';
import { useQuasar } from 'quasar';
import EntryBuysTableDialog from './EntryBuysTableDialog.vue';
import VnTable from 'components/VnTable/VnTable.vue';
import VnInput from 'src/components/common/VnInput.vue';
const stateStore = useStateStore();
const { t } = useI18n();
const quasar = useQuasar();
onMounted(async () => {
stateStore.rightDrawer = true;
});
const columns = computed(() => [
{
align: 'left',
name: 'id',
label: t('customer.extendedList.tableVisibleColumns.id'),
chip: {
condition: () => true,
},
isId: true,
isTitle: false,
columnFilter: false,
isTitle: true,
},
{
align: 'left',
visible: false,
align: 'right',
label: t('shipped'),
name: 'shipped',
isTitle: false,
create: true,
cardVisible: true,
component: 'date',
columnField: {
component: null,
columnFilter: {
name: 'fromShipped',
label: t('fromShipped'),
component: 'date',
},
format: ({ shipped }) => toDate(shipped),
},
{
visible: false,
align: 'left',
label: t('shipped'),
name: 'shipped',
columnFilter: {
name: 'toShipped',
label: t('toShipped'),
component: 'date',
},
format: ({ shipped }) => toDate(shipped),
cardVisible: true,
},
{
align: 'right',
label: t('shipped'),
name: 'shipped',
columnFilter: false,
format: ({ shipped }) => toDate(shipped),
},
{
align: 'right',
label: t('landed'),
name: 'landed',
isTitle: false,
create: true,
cardVisible: false,
component: 'date',
columnField: {
component: null,
},
columnFilter: false,
format: ({ landed }) => toDate(landed),
},
{
align: 'right',
label: t('globals.wareHouseIn'),
name: 'warehouseInFk',
format: (row) => row.warehouseInName,
cardVisible: true,
columnFilter: {
component: 'select',
attrs: {
url: 'warehouses',
fields: ['id', 'name'],
optionLabel: 'name',
optionValue: 'id',
},
alias: 't',
inWhere: true,
},
},
{
align: 'left',
label: t('globals.wareHouseIn'),
name: 'warehouseInName',
isTitle: false,
cardVisible: true,
create: false,
label: t('globals.daysOnward'),
name: 'days',
visible: false,
},
{
align: 'right',
name: 'tableActions',
computed,
actions: [
{
title: t('printBuys'),
@ -87,35 +105,19 @@ const printBuys = (rowId) => {
</script>
<template>
<VnSearchbar
data-key="EntryList"
data-key="myEntriesList"
url="Entries/filter"
:label="t('Search entries')"
:info="t('You can search by entry reference')"
/>
<QPage class="column items-center q-pa-md">
<div class="vn-card-list">
<VnTable
ref="myEntriesRef"
data-key="myEntriesList"
url="Entries/filter"
:columns="columns"
default-mode="card"
auto-load
:right-search="true"
>
<template #moreFilterPanel="{ params }">
<VnInput
:label="t('globals.daysOnward')"
v-model="params.days"
class="q-px-xs row"
dense
filled
outlined
></VnInput>
</template>
</VnTable>
</div>
</QPage>
<VnTable
data-key="myEntriesList"
url="Entries/filter"
:columns="columns"
default-mode="card"
order="shipped DESC"
auto-load
/>
</template>
<i18n>

2
src/pages/Entry/locale/en.yml
View File

@ -8,4 +8,6 @@ entryFilter:
reference: Reference
landed: Landed
shipped: Shipped
fromShipped: Shipped(from)
toShipped: Shipped(to)
printBuys: Print buys

2
src/pages/Entry/locale/es.yml
View File

@ -12,4 +12,6 @@ entryFilter:
landed: F. llegada
shipped: F. salida
fromShipped: F. salida(desde)
toShipped: F. salida(hasta)
Print buys: Imprimir etiquetas

10
src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
View File

@ -207,8 +207,14 @@ async function cloneInvoice() {
const isAdministrative = () => hasAny(['administrative']);
const isAgricultural = () =>
invoiceIn.value?.supplier?.sageWithholdingFk === config.value[0]?.sageWithholdingFk;
const isAgricultural = () => {
console.error(config);
if (!config.value) return false;
return (
invoiceIn.value?.supplier?.sageFarmerWithholdingFk ===
config?.value[0]?.sageWithholdingFk
);
};
function showPdfInvoice() {
if (isAgricultural()) openReport(`InvoiceIns/${entityId.value}/invoice-in-pdf`);

2
src/pages/Item/Card/CreateGenusForm.vue
View File

@ -31,7 +31,7 @@ onMounted(async () => {
@on-data-saved="onDataSaved"
>
<template #form-inputs="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
ref="genusInputRef"
:label="t('Latin genus name')"

2
src/pages/Item/Card/CreateIntrastatForm.vue
View File

@ -33,7 +33,7 @@ onMounted(async () => {
@on-data-saved="onDataSaved"
>
<template #form-inputs="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
ref="identifierInputRef"
:label="t('createIntrastatForm.identifier')"

2
src/pages/Item/Card/CreateSpecieForm.vue
View File

@ -31,7 +31,7 @@ onMounted(async () => {
@on-data-saved="onDataSaved"
>
<template #form-inputs="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
ref="specieInputRef"
:label="t('Latin species name')"

10
src/pages/Item/Card/ItemBasicData.vue
View File

@ -71,7 +71,7 @@ const onIntrastatCreated = (response, formData) => {
:clear-store-on-unmount="false"
>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('basicData.type')"
v-model="data.typeFk"
@ -95,7 +95,7 @@ const onIntrastatCreated = (response, formData) => {
<VnInput :label="t('basicData.reference')" v-model="data.comment" />
<VnInput :label="t('basicData.relevancy')" v-model="data.relevancy" />
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput :label="t('basicData.stems')" v-model="data.stems" />
<VnInput
:label="t('basicData.multiplier')"
@ -127,7 +127,7 @@ const onIntrastatCreated = (response, formData) => {
</template>
</VnSelectDialog>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelectDialog
:label="t('basicData.intrastat')"
v-model="data.intrastatFk"
@ -166,7 +166,7 @@ const onIntrastatCreated = (response, formData) => {
/>
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('basicData.weightByPiece')"
v-model.number="data.weightByPiece"
@ -192,7 +192,7 @@ const onIntrastatCreated = (response, formData) => {
type="number"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QCheckbox v-model="data.isActive" :label="t('basicData.isActive')" />
<QCheckbox v-model="data.hasKgPrice" :label="t('basicData.hasKgPrice')" />
<div>

2
src/pages/Item/Card/ItemBotanical.vue
View File

@ -67,7 +67,7 @@ onMounted(async () => {
:clear-store-on-unmount="false"
>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelectDialog
:label="t('Genus')"
v-model="data.genusFk"

34
src/pages/Item/Card/ItemDiary.vue
View File

@ -1,5 +1,5 @@
<script setup>
import { onMounted, computed, onUnmounted, reactive, ref } from 'vue';
import { onMounted, computed, onUnmounted, reactive, ref, nextTick } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
@ -113,18 +113,36 @@ const getBadgeAttrs = (_date) => {
return attrs;
};
const scrollToToday = async () => {
await nextTick();
const today = Date.vnNew();
today.setHours(0, 0, 0, 0);
const todayCell = document.querySelector(`td[data-date="${today.toISOString()}"]`);
if (todayCell) {
todayCell.scrollIntoView({ behavior: 'smooth', block: 'center' });
}
};
const formatDateForAttribute = (dateValue) => {
if (dateValue instanceof Date) return date.formatDate(dateValue, 'YYYY-MM-DD');
return dateValue;
};
const originTypeMap = {
entry: {
descriptor: EntryDescriptorProxy,
icon: 'vn:entry',
color: 'green',
},
ticket: {
descriptor: TicketDescriptorProxy,
icon: 'vn:ticket',
color: 'red',
},
order: {
descriptor: OrderDescriptorProxy,
icon: 'vn:basket',
color: 'yellow',
},
};
@ -143,6 +161,7 @@ onMounted(async () => {
else if (user.value) warehouseFk.value = user.value.warehouseFk;
itemsBalanceFilter.where.warehouseFk = warehouseFk.value;
await fetchItemBalances();
await scrollToToday();
});
onUnmounted(() => (stateStore.rightDrawer = false));
@ -215,7 +234,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
</QTd>
</template>
<template #body-cell-date="{ row }">
<QTd @click.stop>
<QTd @click.stop :data-date="formatDateForAttribute(row.shipped)">
<QBadge
v-bind="getBadgeAttrs(row.shipped)"
class="q-ma-none"
@ -237,12 +256,13 @@ onUnmounted(() => (stateStore.rightDrawer = false));
>
{{ row.originId }}
</component>
<QIcon
:name="originTypeMap[row.originType]?.icon"
class="fill-icon q-mr-sm"
size="sm"
:color="originTypeMap[row.originType]?.color"
/>
<span class="link">
<QIcon
:name="originTypeMap[row.originType]?.icon"
class="fill-icon q-mr-sm"
size="xs"
/>
{{ row.originId }}
</span>
</QTd>

6
src/pages/Item/ItemCreate.vue
View File

@ -85,7 +85,7 @@ onBeforeMount(async () => {
@on-data-saved="redirectToItemBasicData"
>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.provisionalName"
:label="t('item.create.name')"
@ -107,7 +107,7 @@ onBeforeMount(async () => {
hide-selected
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('item.create.type')"
v-model="data.typeFk"
@ -154,7 +154,7 @@ onBeforeMount(async () => {
</template>
</VnSelect>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('item.create.origin')"
v-model="data.originFk"

2
src/pages/Item/ItemRequestDenyForm.vue
View File

@ -36,7 +36,7 @@ onMounted(async () => {
@on-data-saved="onDataSaved"
>
<template #form-inputs="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnInput
ref="textAreaRef"

6
src/pages/Item/ItemTypeCreate.vue
View File

@ -53,11 +53,11 @@ const redirectToItemTypeBasicData = (_, { id }) => {
@on-data-saved="redirectToItemTypeBasicData"
>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput v-model="data.code" :label="t('itemType.shared.code')" />
<VnInput v-model="data.name" :label="t('itemType.shared.name')" />
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
v-model="data.workerFk"
:label="t('itemType.shared.worker')"
@ -75,7 +75,7 @@ const redirectToItemTypeBasicData = (_, { id }) => {
hide-selected
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
v-model="data.temperatureFk"
:label="t('itemType.shared.temperature')"

6
src/pages/ItemType/Card/ItemTypeBasicData.vue
View File

@ -42,11 +42,11 @@ const temperaturesOptions = ref([]);
auto-load
>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput v-model="data.code" :label="t('shared.code')" />
<VnInput v-model="data.name" :label="t('shared.name')" />
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
v-model="data.workerFk"
:label="t('shared.worker')"
@ -64,7 +64,7 @@ const temperaturesOptions = ref([]);
hide-selected
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
v-model="data.temperatureFk"
:label="t('shared.temperature')"

6
src/pages/Order/Card/OrderForm.vue
View File

@ -125,7 +125,7 @@ async function onDataSaved({ id }) {
auto-load
>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
url="Clients"
:label="t('order.form.clientFk')"
@ -171,7 +171,7 @@ async function onDataSaved({ id }) {
</template>
</VnSelect>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInputDate
placeholder="dd-mm-aaa"
:label="t('order.form.landed')"
@ -181,7 +181,7 @@ async function onDataSaved({ id }) {
"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('order.form.agencyModeFk')"
v-model="data.agencyModeFk"

2
src/pages/Route/Agency/Card/AgencyWorkcenter.vue
View File

@ -98,7 +98,7 @@ async function deleteWorCenter(id) {
@on-data-saved="paginate.fetch()"
>
<template #form-inputs="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
v-model="data.workCenterFk"
option-value="id"

61
src/pages/Route/Card/RouteDescriptorMenu.vue
View File

@ -3,6 +3,7 @@ import axios from 'axios';
import { useQuasar } from 'quasar';
import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router';
import { useSession } from 'src/composables/useSession';
import VnConfirm from 'components/ui/VnConfirm.vue';
const props = defineProps({
@ -11,10 +12,20 @@ const props = defineProps({
required: true,
},
});
const router = useRouter();
const quasar = useQuasar();
const { t } = useI18n();
const routeId = props.route.id;
async function openRouteReport() {
const url = new URL(window.location).origin;
const { getTokenMultimedia } = useSession();
const token = getTokenMultimedia();
window.open(
`${url}/api/Routes/${routeId}/driver-route-pdf?access_token=${token}`,
'_blank'
);
}
function confirmRemove() {
quasar
@ -29,20 +40,50 @@ function confirmRemove() {
.onOk(async () => await router.push({ name: 'RouteList' }));
}
async function sendMail() {
const params = {
id: routeId,
recipient: props?.route?.worker?.user?.emailUser?.email,
};
await axios.post(`Routes/${routeId}/driver-route-email`, params);
}
async function actualizeVolume() {
const params = { isOk: true };
await axios.post(`Routes/${routeId}/updateVolume`, params);
quasar.notify({
message: t('globals.dataUpdated'),
type: 'positive',
});
}
async function remove() {
if (!props.route.id) {
return;
}
await axios.delete(`Routes/${props.route.id}`);
await axios.delete(`Routes/${routeId}`);
quasar.notify({
message: t('globals.dataDeleted'),
type: 'positive',
});
}
// TODO: Add reports
</script>
<template>
<QItem @click="openRouteReport" v-ripple clickable>
<QItemSection avatar>
<QIcon name="description" />
</QItemSection>
<QItemSection>{{ t('seeReport') }}</QItemSection>
</QItem>
<QItem @click="sendMail" v-ripple clickable>
<QItemSection avatar>
<QIcon name="outgoing_mail" />
</QItemSection>
<QItemSection>{{ t('sendMail') }}</QItemSection>
</QItem>
<QItem @click="actualizeVolume" v-ripple clickable>
<QItemSection avatar>
<QIcon name="package_2" />
</QItemSection>
<QItemSection>{{ t('actualizeVolume') }}</QItemSection>
</QItem>
<QItem @click="confirmRemove" v-ripple clickable>
<QItemSection avatar>
<QIcon name="delete" />
@ -56,8 +97,14 @@ en:
confirmDeletion: Confirm deletion
confirmDeletionMessage: Are you sure you want to delete this route?
deleteRoute: Delete route
seeReport: See route report
sendMail: Send route report
actualizeVolume: Actualize volume
es:
confirmDeletion: Confirmar eliminación,
confirmDeletionMessage: Seguro que quieres eliminar esta ruta?
deleteRoute: Eliminar ruta
seeReport: Ver informe de ruta
sendMail: Enviar informe de ruta
actualizeVolume: Actualizar volumen
</i18n>

24
src/pages/Route/Card/RouteForm.vue
View File

@ -120,7 +120,7 @@ const onSave = (data, response) => {
@on-data-saved="onSave"
>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('Worker')"
v-model="data.workerFk"
@ -155,7 +155,7 @@ const onSave = (data, response) => {
:input-debounce="0"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('Agency')"
v-model="data.agencyModeFk"
@ -170,7 +170,7 @@ const onSave = (data, response) => {
<VnInputDate v-model="data.created" :label="t('Created')" />
</VnRow>
<template v-if="!isNew">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput v-model="data.kmStart" :label="t('Km Start')" clearable />
<QInput
v-model.number="data.kmEnd"
@ -184,7 +184,7 @@ const onSave = (data, response) => {
type="number"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInputTime
v-model="data.started"
:label="t('Hour started')"
@ -205,15 +205,13 @@ const onSave = (data, response) => {
</div>
</VnRow>
</template>
<VnRow class="row q-gutter-md q-mb-md">
<VnInput
v-model="data.description"
:label="t('Description')"
type="textarea"
:rows="3"
clearable
/>
</VnRow>
<VnInput
v-model="data.description"
:label="t('Description')"
type="textarea"
:rows="3"
clearable
/>
</template>
</FormModel>
</template>

2
src/pages/Route/Cmr/CmrList.vue
View File

@ -3,7 +3,7 @@ import { onBeforeMount, onMounted, computed, ref } from 'vue';
import { useI18n } from 'vue-i18n';
import { Notify } from 'quasar';
import { useSession } from 'src/composables/useSession';
import { toDate, toDateHourMin } from 'filters/index';
import { toDateHourMin } from 'filters/index';
import { useStateStore } from 'src/stores/useStateStore';
import axios from 'axios';

10
src/pages/Route/Roadmap/RoadmapBasicData.vue
View File

@ -38,12 +38,12 @@ const onSave = (data, response) => {
@on-data-saved="onSave"
>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput v-model="data.name" :label="t('Roadmap')" clearable />
<VnInputDate v-model="data.etd" :label="t('ETD date')" />
<VnInputTime v-model="data.etd" :label="t('ETD hour')" />
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.tractorPlate"
:label="t('Tractor plate')"
@ -55,7 +55,7 @@ const onSave = (data, response) => {
clearable
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('Carrier')"
v-model="data.supplierFk"
@ -84,11 +84,11 @@ const onSave = (data, response) => {
clearable
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput v-model="data.driverName" :label="t('Driver name')" clearable />
<VnInput v-model="data.phone" :label="t('Phone')" clearable />
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.observations"
:label="t('Observations')"

4
src/pages/Shelving/Card/ShelvingForm.vue
View File

@ -85,7 +85,7 @@ const onSave = (shelving, newShelving) => {
@on-data-saved="onSave"
>
<template #form="{ data, validate, filter }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.code"
:label="t('shelving.basicData.code')"
@ -107,7 +107,7 @@ const onSave = (shelving, newShelving) => {
:input-debounce="0"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.priority"
type="number"

6
src/pages/Supplier/Card/SupplierAddressesCreate.vue
View File

@ -71,7 +71,7 @@ function handleLocation(data, location) {
@on-data-saved="onDataSaved()"
>
<template #form="{ data, validate }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.nickname"
:label="t('supplier.addresses.name')"
@ -81,7 +81,7 @@ function handleLocation(data, location) {
:label="t('supplier.addresses.street')"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnLocation
:rules="validate('Worker.postcode')"
:roles-allowed-to-create="['deliveryAssistant']"
@ -91,7 +91,7 @@ function handleLocation(data, location) {
>
</VnLocation>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.phone"
:label="t('supplier.addresses.phone')"

6
src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
View File

@ -45,7 +45,7 @@ const onDataSaved = () => {
@on-data-saved="onDataSaved()"
>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('supplier.agencyTerms.agencyFk')"
v-model="data.agencyFk"
@ -61,7 +61,7 @@ const onDataSaved = () => {
type="number"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QInput
:label="t('supplier.agencyTerms.packagePrice')"
v-model.number="data.packagePrice"
@ -78,7 +78,7 @@ const onDataSaved = () => {
type="number"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QInput
:label="t('supplier.agencyTerms.routePrice')"
v-model.number="data.routePrice"

16
src/pages/Supplier/Card/SupplierBasicData.vue
View File

@ -2,8 +2,6 @@
import { ref } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import FetchData from 'components/FetchData.vue';
import FormModel from 'components/FormModel.vue';
import VnRow from 'components/ui/VnRow.vue';
import VnInput from 'src/components/common/VnInput.vue';
@ -15,12 +13,6 @@ const { t } = useI18n();
const workersOptions = ref([]);
</script>
<template>
<FetchData
url="Workers/search"
:filter="{ fields: ['id', 'nickname'], order: 'nickname ASC', limit: 30 }"
@on-fetch="(data) => (workersOptions = data)"
auto-load
/>
<FormModel
:url="`Suppliers/${route.params.id}`"
:url-update="`Suppliers/${route.params.id}`"
@ -29,7 +21,7 @@ const workersOptions = ref([]);
:clear-store-on-unmount="false"
>
<template #form="{ data, validate }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.nickname"
:label="t('supplier.basicData.alias')"
@ -44,6 +36,8 @@ const workersOptions = ref([]);
option-label="name"
hide-selected
map-options
url="Workers/search"
sort-by="nickname ASC"
:rules="validate('supplier.workerFk')"
>
<template #append>
@ -65,7 +59,7 @@ const workersOptions = ref([]);
</template>
</VnSelect>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QCheckbox
v-model="data.isSerious"
:label="t('supplier.basicData.isSerious')"
@ -79,7 +73,7 @@ const workersOptions = ref([]);
:label="t('supplier.basicData.isPayMethodChecked')"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QInput
:label="t('supplier.basicData.note')"
type="textarea"

4
src/pages/Supplier/Card/SupplierBillingData.vue
View File

@ -36,7 +36,7 @@ const formatPayDems = (data) => {
:clear-store-on-unmount="false"
>
<template #form="{ data, validate }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('supplier.billingData.payMethodFk')"
v-model="data.payMethodFk"
@ -56,7 +56,7 @@ const formatPayDems = (data) => {
:rules="validate('supplier.payDemFk')"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QInput
:label="t('supplier.billingData.payDay')"
type="number"

14
src/pages/Supplier/Card/SupplierFiscalData.vue
View File

@ -56,7 +56,7 @@ function handleLocation(data, location) {
:clear-store-on-unmount="false"
>
<template #form="{ data, validate }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.name"
:label="t('supplier.fiscalData.name')"
@ -68,7 +68,7 @@ function handleLocation(data, location) {
clearable
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.account"
:label="t('supplier.fiscalData.account')"
@ -84,7 +84,7 @@ function handleLocation(data, location) {
map-options
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('supplier.fiscalData.sageWithholdingFk')"
v-model="data.sageWithholdingFk"
@ -104,7 +104,7 @@ function handleLocation(data, location) {
map-options
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('supplier.fiscalData.supplierActivityFk')"
v-model="data.supplierActivityFk"
@ -120,14 +120,14 @@ function handleLocation(data, location) {
clearable
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.street"
:label="t('supplier.fiscalData.street')"
clearable
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnLocation
:rules="validate('Worker.postcode')"
:roles-allowed-to-create="['deliveryAssistant']"
@ -137,7 +137,7 @@ function handleLocation(data, location) {
>
</VnLocation>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col flex justify-around">
<QCheckbox
v-model="data.isTrucker"

6
src/pages/Supplier/SupplierCreate.vue
View File

@ -44,13 +44,11 @@ const redirectToSupplierFiscalData = (_, responseData) => {
@on-data-saved="redirectToSupplierFiscalData"
>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.name"
:label="t('supplier.create.supplierName')"
@keyup="
newSupplierForm.name = newSupplierForm.name.toUpperCase()
"
@keyup="newSupplierForm.name = newSupplierForm.name.toUpperCase()"
/>
</VnRow>
</template>

6
src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
View File

@ -311,7 +311,7 @@ onMounted(() => onFormModelInit());
auto-load
/>
<QForm>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('basicData.client')"
v-model="clientId"
@ -343,7 +343,7 @@ onMounted(() => onFormModelInit());
:required="true"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('basicData.address')"
v-model="addressId"
@ -447,7 +447,7 @@ onMounted(() => onFormModelInit());
</template>
</VnSelect>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInputDate
:label="t('basicData.shipped')"
v-model="formData.shipped"

4
src/pages/Ticket/Card/ExpeditionNewTicket.vue
View File

@ -63,10 +63,10 @@ const createTicket = async () => {
:save-fn="createTicket"
>
<template #form-inputs="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInputDate :label="t('expedition.landed')" v-model="data.landed" />
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-if="withRoute"
:label="t('expedition.routeId')"

4
src/pages/Ticket/Card/TicketCreateRequest.vue
View File

@ -31,7 +31,7 @@ const attendersOptions = ref([]);
@on-data-saved="() => emit('onRequestCreated')"
>
<template #form-inputs="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.description"
:label="t('purchaseRequest.description')"
@ -45,7 +45,7 @@ const attendersOptions = ref([]);
option-value="id"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.quantity"
:label="t('purchaseRequest.quantity')"

2
src/pages/Ticket/Card/TicketCreateServiceType.vue
View File

@ -31,7 +31,7 @@ onMounted(async () => {
@on-data-saved="onDataSaved"
>
<template #form-inputs="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
ref="nameInputRef"
:label="t('service.description')"

2
src/pages/Ticket/Card/TicketCreateTracking.vue
View File

@ -44,7 +44,7 @@ const onStateFkChange = (formData) => (formData.userFk = user.value.id);
@on-data-saved="() => emit('onRequestCreated')"
>
<template #form-inputs="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
v-model="data.stateFk"
:label="t('tracking.state')"

2
src/pages/Ticket/Card/TicketDmsImportForm.vue
View File

@ -54,7 +54,7 @@ const importDms = async () => {
:save-fn="importDms"
>
<template #form-inputs>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('Document')"
:options="dmsOptions"

4
src/pages/Ticket/Card/TicketExpedition.vue
View File

@ -65,7 +65,7 @@ const ticketData = computed(() => ticketStore.data);
const refetchExpeditions = async () => {
await expeditionsArrayData.applyFilter({
params: { filter: JSON.stringify(expeditionsFilter.value) },
filter: expeditionsFilter.value,
});
};
@ -81,7 +81,7 @@ const applyColumnFilter = async (col) => {
try {
const paramKey = col.columnFilter?.filterParamKey || col.field;
params[paramKey] = col.columnFilter.filterValue;
await expeditionsArrayData.addFilter({ params });
await expeditionsArrayData.addFilter({ filter: expeditionsFilter.value, params });
} catch (err) {
console.error('Error applying column filter', err);
}

10
src/pages/Ticket/TicketCreate.vue
View File

@ -131,7 +131,7 @@ const redirectToTicketList = (_, { id }) => {
@on-data-saved="redirectToTicketList"
>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnSelect
:label="t('ticket.create.client')"
@ -157,7 +157,7 @@ const redirectToTicketList = (_, { id }) => {
</VnSelect>
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnSelect
:label="t('ticket.create.address')"
@ -184,7 +184,7 @@ const redirectToTicketList = (_, { id }) => {
</VnSelect>
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnInputDate
placeholder="dd-mm-aaa"
@ -194,7 +194,7 @@ const redirectToTicketList = (_, { id }) => {
/>
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnSelect
:label="t('ticket.create.warehouse')"
@ -207,7 +207,7 @@ const redirectToTicketList = (_, { id }) => {
/>
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnSelect
:label="t('ticket.create.agency')"

6
src/pages/Ticket/TicketList.vue
View File

@ -262,7 +262,7 @@ const getColor = (row) => {
</template>
</VnSelect>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnInputDate
placeholder="dd-mm-aaa"
@ -272,7 +272,7 @@ const getColor = (row) => {
/>
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnSelect
url="Warehouses"
@ -286,7 +286,7 @@ const getColor = (row) => {
/>
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnSelect
:label="t('ticket.create.agency')"

8
src/pages/Travel/Card/TravelBasicData.vue
View File

@ -28,7 +28,7 @@ const agenciesOptions = ref([]);
auto-load
>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput v-model="data.ref" :label="t('travel.basicData.reference')" />
<VnSelect
:label="t('travel.basicData.agency')"
@ -40,7 +40,7 @@ const agenciesOptions = ref([]);
hide-selected
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInputDate
v-model="data.shipped"
:label="t('travel.basicData.shipped')"
@ -50,7 +50,7 @@ const agenciesOptions = ref([]);
:label="t('travel.basicData.landed')"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('travel.basicData.warehouseOut')"
v-model="data.warehouseOutFk"
@ -70,7 +70,7 @@ const agenciesOptions = ref([]);
hide-selected
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QCheckbox
:label="t('travel.basicData.delivered')"
v-model="data.isDelivered"

2
src/pages/Travel/Card/TravelDescriptorMenuItems.vue
View File

@ -38,7 +38,7 @@ const cloneTravelWithEntries = async () => {
notify('globals.dataSaved', 'positive');
router.push({ name: 'TravelBasicData', params: { id: data.id } });
} catch (err) {
console.err('Error cloning travel with entries');
console.error('Error cloning travel with entries');
}
};

8
src/pages/Travel/Card/TravelThermographsForm.vue
View File

@ -235,7 +235,7 @@ const onThermographCreated = async (data) => {
</div>
</Teleport>
<QCard class="q-pa-lg">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelectDialog
:label="t('travel.thermographs.thermograph')"
v-model="thermographForm.thermographId"
@ -256,7 +256,7 @@ const onThermographCreated = async (data) => {
:label="t('travel.thermographs.state')"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="thermographForm.reference"
:label="t('travel.thermographs.reference')"
@ -269,7 +269,7 @@ const onThermographCreated = async (data) => {
option-label="name"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('travel.thermographs.company')"
v-model="thermographForm.companyId"
@ -293,7 +293,7 @@ const onThermographCreated = async (data) => {
fill-input
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QFile
ref="inputFileRef"
:label="t('travel.thermographs.file')"

6
src/pages/Travel/TravelCreate.vue
View File

@ -57,7 +57,7 @@ const redirectToTravelBasicData = (_, { id }) => {
@on-data-saved="redirectToTravelBasicData"
>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput v-model="data.ref" :label="t('globals.reference')" />
<VnSelect
:label="t('globals.agency')"
@ -68,11 +68,11 @@ const redirectToTravelBasicData = (_, { id }) => {
hide-selected
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInputDate v-model="data.shipped" :label="t('globals.shipped')" />
<VnInputDate :label="t('globals.landed')" v-model="data.landed" />
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('globals.wareHouseOut')"
v-model="data.warehouseOutFk"

4
src/pages/Worker/Card/WorkerChangePasswordForm.vue
View File

@ -61,7 +61,7 @@ onMounted(async () => await getPassRequirements());
<template>
<FormPopup :title="t('Reset password')" @on-submit="setPassword()">
<template #form-inputs>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('New password')"
v-model="formData.newPassword"
@ -78,7 +78,7 @@ onMounted(async () => await getPassRequirements());
"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('Repeat password')"
v-model="formData.repeatPassword"

2
src/pages/Worker/Card/WorkerDescriptor.vue
View File

@ -147,7 +147,7 @@ const refetch = async () => await cardDescriptorRef.value.getData();
<VnImg
:id="parseInt(entityId)"
collection="user"
size="160x160"
size="520x520"
class="photo"
>
<template #error>

2
src/pages/Worker/Card/WorkerPBX.vue
View File

@ -56,7 +56,7 @@ const updateModelValue = (data) => {
@on-fetch="onFetch"
>
<template #form="{}">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
:label="t('worker.summary.sipExtension')"
v-model="extension"

2
src/pages/Worker/Card/WorkerPda.vue
View File

@ -126,7 +126,7 @@ function reloadData() {
@on-data-saved="reloadData()"
>
<template #form-inputs="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('worker.pda.newPDA')"
v-model="data.deviceProductionFk"

10
src/pages/Zone/Card/ZoneBasicData.vue
View File

@ -31,11 +31,11 @@ const agencyOptions = ref([]);
<FormModel :url="`Zones/${route.params.id}`" auto-load model="zone">
<template #form="{ data, validate }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput :label="t('Name')" clearable v-model="data.name" />
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
option-label="name"
option-value="id"
@ -66,7 +66,7 @@ const agencyOptions = ref([]);
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.travelingDays"
:label="t('Traveling days')"
@ -77,7 +77,7 @@ const agencyOptions = ref([]);
<VnInputTime v-model="data.hour" :label="t('Closing')" />
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.price"
:label="t('Price')"
@ -94,7 +94,7 @@ const agencyOptions = ref([]);
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput v-model="data.inflation" :label="t('Inflation')" clearable />
<QCheckbox
v-model="data.isVolumetric"

2
src/pages/Zone/Card/ZoneCreateWarehouse.vue
View File

@ -29,7 +29,7 @@ const warehousesOptions = ref([]);
@on-submit="emit('onSubmitCreateWarehouse', ZoneWarehouseFormData)"
>
<template #form-inputs>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col">
<VnSelect
:label="t('warehouses.warehouse')"

8
src/pages/Zone/Card/ZoneEventInclusionForm.vue
View File

@ -149,7 +149,7 @@ onMounted(() => {
class="q-mb-sm"
/>
</div>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<div class="col flex justify-center">
<VnInputDate
v-if="inclusionType === 'day'"
@ -173,7 +173,7 @@ onMounted(() => {
v-model="eventInclusionFormData.ended"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInputTime
v-model="eventInclusionFormData.hour"
:label="t('eventsInclusionForm.closing')"
@ -185,7 +185,7 @@ onMounted(() => {
min="0"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="eventInclusionFormData.price"
:label="t('eventsInclusionForm.price')"
@ -199,7 +199,7 @@ onMounted(() => {
min="0"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="eventInclusionFormData.m3Max"
:label="t('eventsInclusionForm.m3Max')"

10
src/pages/Zone/ZoneCreate.vue
View File

@ -51,14 +51,14 @@ const redirectToZoneLocations = (_, { id }) => {
@on-data-saved="redirectToZoneLocations"
>
<template #form="{ data }">
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.name"
:label="t('create.name')"
:required="true"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnSelect
:label="t('create.warehouse')"
:options="warehousesOptions"
@ -77,7 +77,7 @@ const redirectToZoneLocations = (_, { id }) => {
:required="true"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.travelingDays"
:label="t('create.travelingDays')"
@ -87,7 +87,7 @@ const redirectToZoneLocations = (_, { id }) => {
<VnInputTime v-model="data.hour" :label="t('create.closingHour')" />
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<VnInput
v-model="data.price"
:label="t('create.price')"
@ -101,7 +101,7 @@ const redirectToZoneLocations = (_, { id }) => {
min="0"
/>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<VnRow>
<QCheckbox
:label="t('create.volumetric')"
v-model="data.isVolumetric"

1
test/cypress/integration/entry/myEntry.spec.js
View File

@ -7,7 +7,6 @@ describe('EntryMy when is supplier', () => {
cy.stub(win, 'open');
},
});
cy.waitForElement('.q-page', 6000);
});
it('should open buyLabel when is supplier', () => {

2
test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
View File

@ -1,7 +1,7 @@
/// <reference types="cypress" />
describe('InvoiceInCorrective', () => {
const createRectificative = '.q-menu > .q-list > :nth-child(4) > .q-item__section';
const createRectificative = '.q-menu > .q-list > :nth-child(6) > .q-item__section';
const rectificativeSection = '.q-drawer-container .q-list > a:nth-child(6)';
const saveDialog = '.q-card > .q-card__actions > .q-btn--standard ';

2
test/cypress/integration/route/routeList.spec.js
View File

@ -26,6 +26,6 @@ describe('Route', () => {
cy.get(getRowColumn(1, 4) + getVnSelect).type('{downArrow}{enter}');
cy.get(getRowColumn(1, 5) + getVnSelect).type('{downArrow}{enter}');
cy.get('button[title="Save"]').click();
cy.get('.q-notification__message').should('have.text', 'Data created');
cy.get('.q-notification__message').should('have.text', 'Data saved');
});
});