Correccion de comentarios2
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
carlosfonseca 2024-02-08 20:24:48 -05:00
parent 7f1c4690e8
commit 11eb597fa3
15 changed files with 41 additions and 20 deletions

View File

@ -5,9 +5,10 @@ import { useRoute } from 'vue-router';
import { date, QCheckbox, QBtn, useQuasar } from 'quasar';
import { useState } from 'src/composables/useState';
import { toCurrency } from 'src/filters';
import { useState } from 'src/composables/useState';
import { useStateStore } from 'stores/useStateStore';
import { useValidator } from 'src/composables/useValidator';
import FetchData from 'components/FetchData.vue';
import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
@ -15,10 +16,11 @@ import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
const { t } = useI18n();
const route = useRoute();
const { validate } = useValidator();
const quasar = useQuasar();
const stateStore = useStateStore();
const route = useRoute();
const state = useState();
const stateStore = useStateStore();
const user = state.getUser();
const clientRisks = ref(null);
@ -225,7 +227,7 @@ const updateCompanyId = (id) => {
{{ props.value }}
</template>
<WorkerDescriptorProxy
:id="props.row.clientFk"
:id="props.row.workerFk"
v-if="props.col.name === 'userName'"
/>
</component>
@ -244,6 +246,7 @@ const updateCompanyId = (id) => {
option-label="code"
option-value="id"
v-model="companyId"
:rules="validate('entry.companyFk')"
/>
</div>

View File

@ -69,13 +69,7 @@ const getBankEntities = () => {
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<VnInput :label="t('IBAN')" clearable v-model="data.iban">
<template #append>
<QIcon name="info" class="cursor-info">
<QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
</QIcon>
</template>
</VnInput>
<VnInput :label="t('IBAN')" clearable v-model="data.iban" />
</div>
<div class="col">
<VnSelectCreate

View File

@ -55,7 +55,7 @@ const columns = computed(() => [
field: 'created',
label: t('Since'),
name: 'created',
format: (value) => date.formatDate(value, 'DD/MM/YYYY hh:mm:ss'),
format: (value) => date.formatDate(value, 'DD/MM/YYYY hh:mm'),
},
{
align: 'left',
@ -105,7 +105,7 @@ const toCustomerCreditCreate = () => {
>
{{ props.value }}
<WorkerDescriptorProxy
:id="props.row.clientFk"
:id="props.row.workerFk"
v-if="props.col.name === 'employee'"
/>
</component>

View File

@ -215,7 +215,7 @@ const toCustomerFileManagementCreate = () => {
{{ props.value }}
</template>
<WorkerDescriptorProxy
:id="props.row.clientFk"
:id="props.row.dms.workerFk"
v-if="props.col.name === 'employee'"
/>
</component>

View File

@ -160,6 +160,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
<VnSelectFilter
:label="t('City')"
:options="citiesLocationOptions"
:rules="validate('postcode.city')"
hide-selected
option-label="name"
option-value="name"
@ -186,6 +187,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
<VnSelectFilter
:label="t('Province')"
:options="provincesLocationOptions"
:rules="validate('city.provinceFk')"
hide-selected
option-label="name"
option-value="id"
@ -206,6 +208,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
<VnSelectFilter
:label="t('Country')"
:options="countriesOptions"
:rules="validate('bankEntity.countryFk')"
hide-selected
option-label="country"
option-value="id"

View File

@ -73,7 +73,7 @@ const columns = computed(() => [
field: 'shipped',
label: t('Date'),
name: 'date',
format: (value) => date.formatDate(value, 'DD/MM/YYYY hh:mm:ss'),
format: (value) => date.formatDate(value, 'DD/MM/YYYY hh:mm'),
},
{
align: 'left',
@ -144,7 +144,7 @@ const toCustomerGreugeCreate = () => {
>
{{ props.value }}
<WorkerDescriptorProxy
:id="props.row.clientFk"
:id="props.row.userFk"
v-if="props.col.name === 'createdBy'"
/>
</component>

View File

@ -109,7 +109,7 @@ const toCustomerSamplesCreate = () => {
>
{{ props.value }}
<WorkerDescriptorProxy
:id="props.row.clientFk"
:id="props.row.userFk"
v-if="props.col.name === 'worker'"
/>
</component>

View File

@ -20,7 +20,7 @@ const filter = { where: { id: `${route.params.id}` } };
:url="'VnUsers/preview'"
model="client"
>
<template #form="{ data }">
<template #form="{ data, validate }">
<div v-if="data?.length">
<div
v-for="(item, index) in data"
@ -45,7 +45,9 @@ const filter = { where: { id: `${route.params.id}` } };
<div class="col">
<VnInput
:label="t('Recovery email')"
:rules="validate('client.email')"
clearable
type="email"
v-model="item.email"
>
<template #append>

View File

@ -110,8 +110,10 @@ const clients = ref();
<QItemSection>
<VnInput
:label="t('Email')"
:rules="validate('client.email')"
clearable
is-outlined
type="email"
v-model="params.email"
/>
</QItemSection>

View File

@ -152,6 +152,7 @@ const toCustomerConsignees = () => {
<VnSelectFilter
:label="t('City')"
:options="citiesLocationOptions"
:rules="validate('postcode.city')"
hide-selected
option-label="name"
option-value="name"
@ -178,6 +179,7 @@ const toCustomerConsignees = () => {
<VnSelectFilter
:label="t('Province')"
:options="provincesLocationOptions"
:rules="validate('city.provinceFk')"
hide-selected
option-label="name"
option-value="id"
@ -198,6 +200,7 @@ const toCustomerConsignees = () => {
<VnSelectFilter
:label="t('Agency')"
:options="agencyModes"
:rules="validate('route.agencyFk')"
hide-selected
option-label="name"
option-value="id"

View File

@ -207,6 +207,7 @@ const onDataSaved = () => {
<VnSelectFilter
:label="t('City')"
:options="citiesLocationOptions"
:rules="validate('postcode.city')"
hide-selected
option-label="name"
option-value="name"
@ -233,6 +234,7 @@ const onDataSaved = () => {
<VnSelectFilter
:label="t('Province')"
:options="provincesLocationOptions"
:rules="validate('city.provinceFk')"
hide-selected
option-label="name"
option-value="id"
@ -253,6 +255,7 @@ const onDataSaved = () => {
<VnSelectFilter
:label="t('Agency')"
:options="agencyModes"
:rules="validate('route.agencyFk')"
hide-selected
option-label="name"
option-value="id"
@ -316,6 +319,7 @@ const onDataSaved = () => {
<div class="col">
<VnInput
:label="t('Description')"
:rules="validate('route.description')"
clearable
v-model="note.description"
/>

View File

@ -6,6 +6,7 @@ import { useRoute, useRouter } from 'vue-router';
import axios from 'axios';
import { useState } from 'src/composables/useState';
import { useValidator } from 'src/composables/useValidator';
import useNotify from 'src/composables/useNotify';
import FetchData from 'components/FetchData.vue';
@ -15,6 +16,7 @@ import VnInput from 'src/components/common/VnInput.vue';
const { notify } = useNotify();
const { t } = useI18n();
const { validate } = useValidator();
const route = useRoute();
const router = useRouter();
const state = useState();
@ -125,6 +127,7 @@ const inputFileRef = ref();
<VnSelectFilter
:label="t('Company')"
:options="optionsCompanies"
:rules="validate('entry.companyFk')"
option-label="code"
option-value="id"
v-model="dms.companyId"
@ -157,6 +160,7 @@ const inputFileRef = ref();
<div class="col">
<VnInput
:label="t('Description')"
:rules="validate('route.description')"
clearable
type="textarea"
v-model="dms.description"

View File

@ -5,6 +5,7 @@ import { useRoute, useRouter } from 'vue-router';
import axios from 'axios';
import { useValidator } from 'src/composables/useValidator';
import useNotify from 'src/composables/useNotify';
import FetchData from 'components/FetchData.vue';
@ -14,6 +15,7 @@ import VnInput from 'src/components/common/VnInput.vue';
const { notify } = useNotify();
const { t } = useI18n();
const { validate } = useValidator();
const route = useRoute();
const router = useRouter();
@ -103,6 +105,7 @@ const inputFileRef = ref();
<VnSelectFilter
:label="t('Company')"
:options="optionsCompanies"
:rules="validate('entry.companyFk')"
option-label="code"
option-value="id"
v-model="dms.companyId"
@ -135,6 +138,7 @@ const inputFileRef = ref();
<div class="col">
<VnInput
:label="t('Description')"
:rules="validate('route.description')"
clearable
type="textarea"
v-model="dms.description"

View File

@ -131,7 +131,7 @@ const onDataSaved = async () => {
:url-create="urlCreate"
@on-data-saved="onDataSaved()"
>
<template #form="{ data }">
<template #form="{ data, validate }">
<span ref="closeButton" class="row justify-end close-icon" v-close-popup>
<QIcon name="close" size="sm" />
</span>
@ -153,6 +153,7 @@ const onDataSaved = async () => {
:label="t('Company')"
:options="companyOptions"
:required="true"
:rules="validate('entry.companyFk')"
hide-selected
option-label="code"
option-value="id"

View File

@ -123,7 +123,7 @@ const onDataSaved = async ({
model="client"
url-create="ClientSamples"
>
<template #form="{ data }">
<template #form="{ data, validate }">
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<VnSelectFilter
@ -182,6 +182,7 @@ const onDataSaved = async ({
<VnSelectFilter
:label="t('Company')"
:options="optionsCompanies"
:rules="validate('entry.companyFk')"
hide-selected
option-label="code"
option-value="id"