Correccion de comentarios2
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
This commit is contained in:
parent
7f1c4690e8
commit
11eb597fa3
|
@ -5,9 +5,10 @@ import { useRoute } from 'vue-router';
|
||||||
|
|
||||||
import { date, QCheckbox, QBtn, useQuasar } from 'quasar';
|
import { date, QCheckbox, QBtn, useQuasar } from 'quasar';
|
||||||
|
|
||||||
import { useState } from 'src/composables/useState';
|
|
||||||
import { toCurrency } from 'src/filters';
|
import { toCurrency } from 'src/filters';
|
||||||
|
import { useState } from 'src/composables/useState';
|
||||||
import { useStateStore } from 'stores/useStateStore';
|
import { useStateStore } from 'stores/useStateStore';
|
||||||
|
import { useValidator } from 'src/composables/useValidator';
|
||||||
|
|
||||||
import FetchData from 'components/FetchData.vue';
|
import FetchData from 'components/FetchData.vue';
|
||||||
import VnSelectFilter from 'src/components/common/VnSelectFilter.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';
|
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const route = useRoute();
|
const { validate } = useValidator();
|
||||||
const quasar = useQuasar();
|
const quasar = useQuasar();
|
||||||
const stateStore = useStateStore();
|
const route = useRoute();
|
||||||
const state = useState();
|
const state = useState();
|
||||||
|
const stateStore = useStateStore();
|
||||||
const user = state.getUser();
|
const user = state.getUser();
|
||||||
|
|
||||||
const clientRisks = ref(null);
|
const clientRisks = ref(null);
|
||||||
|
@ -225,7 +227,7 @@ const updateCompanyId = (id) => {
|
||||||
{{ props.value }}
|
{{ props.value }}
|
||||||
</template>
|
</template>
|
||||||
<WorkerDescriptorProxy
|
<WorkerDescriptorProxy
|
||||||
:id="props.row.clientFk"
|
:id="props.row.workerFk"
|
||||||
v-if="props.col.name === 'userName'"
|
v-if="props.col.name === 'userName'"
|
||||||
/>
|
/>
|
||||||
</component>
|
</component>
|
||||||
|
@ -244,6 +246,7 @@ const updateCompanyId = (id) => {
|
||||||
option-label="code"
|
option-label="code"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="companyId"
|
v-model="companyId"
|
||||||
|
:rules="validate('entry.companyFk')"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -69,13 +69,7 @@ const getBankEntities = () => {
|
||||||
|
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<VnInput :label="t('IBAN')" clearable v-model="data.iban">
|
<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>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<VnSelectCreate
|
<VnSelectCreate
|
||||||
|
|
|
@ -55,7 +55,7 @@ const columns = computed(() => [
|
||||||
field: 'created',
|
field: 'created',
|
||||||
label: t('Since'),
|
label: t('Since'),
|
||||||
name: 'created',
|
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',
|
align: 'left',
|
||||||
|
@ -105,7 +105,7 @@ const toCustomerCreditCreate = () => {
|
||||||
>
|
>
|
||||||
{{ props.value }}
|
{{ props.value }}
|
||||||
<WorkerDescriptorProxy
|
<WorkerDescriptorProxy
|
||||||
:id="props.row.clientFk"
|
:id="props.row.workerFk"
|
||||||
v-if="props.col.name === 'employee'"
|
v-if="props.col.name === 'employee'"
|
||||||
/>
|
/>
|
||||||
</component>
|
</component>
|
||||||
|
|
|
@ -215,7 +215,7 @@ const toCustomerFileManagementCreate = () => {
|
||||||
{{ props.value }}
|
{{ props.value }}
|
||||||
</template>
|
</template>
|
||||||
<WorkerDescriptorProxy
|
<WorkerDescriptorProxy
|
||||||
:id="props.row.clientFk"
|
:id="props.row.dms.workerFk"
|
||||||
v-if="props.col.name === 'employee'"
|
v-if="props.col.name === 'employee'"
|
||||||
/>
|
/>
|
||||||
</component>
|
</component>
|
||||||
|
|
|
@ -160,6 +160,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
|
||||||
<VnSelectFilter
|
<VnSelectFilter
|
||||||
:label="t('City')"
|
:label="t('City')"
|
||||||
:options="citiesLocationOptions"
|
:options="citiesLocationOptions"
|
||||||
|
:rules="validate('postcode.city')"
|
||||||
hide-selected
|
hide-selected
|
||||||
option-label="name"
|
option-label="name"
|
||||||
option-value="name"
|
option-value="name"
|
||||||
|
@ -186,6 +187,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
|
||||||
<VnSelectFilter
|
<VnSelectFilter
|
||||||
:label="t('Province')"
|
:label="t('Province')"
|
||||||
:options="provincesLocationOptions"
|
:options="provincesLocationOptions"
|
||||||
|
:rules="validate('city.provinceFk')"
|
||||||
hide-selected
|
hide-selected
|
||||||
option-label="name"
|
option-label="name"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
|
@ -206,6 +208,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
|
||||||
<VnSelectFilter
|
<VnSelectFilter
|
||||||
:label="t('Country')"
|
:label="t('Country')"
|
||||||
:options="countriesOptions"
|
:options="countriesOptions"
|
||||||
|
:rules="validate('bankEntity.countryFk')"
|
||||||
hide-selected
|
hide-selected
|
||||||
option-label="country"
|
option-label="country"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
|
|
|
@ -73,7 +73,7 @@ const columns = computed(() => [
|
||||||
field: 'shipped',
|
field: 'shipped',
|
||||||
label: t('Date'),
|
label: t('Date'),
|
||||||
name: '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',
|
align: 'left',
|
||||||
|
@ -144,7 +144,7 @@ const toCustomerGreugeCreate = () => {
|
||||||
>
|
>
|
||||||
{{ props.value }}
|
{{ props.value }}
|
||||||
<WorkerDescriptorProxy
|
<WorkerDescriptorProxy
|
||||||
:id="props.row.clientFk"
|
:id="props.row.userFk"
|
||||||
v-if="props.col.name === 'createdBy'"
|
v-if="props.col.name === 'createdBy'"
|
||||||
/>
|
/>
|
||||||
</component>
|
</component>
|
||||||
|
|
|
@ -109,7 +109,7 @@ const toCustomerSamplesCreate = () => {
|
||||||
>
|
>
|
||||||
{{ props.value }}
|
{{ props.value }}
|
||||||
<WorkerDescriptorProxy
|
<WorkerDescriptorProxy
|
||||||
:id="props.row.clientFk"
|
:id="props.row.userFk"
|
||||||
v-if="props.col.name === 'worker'"
|
v-if="props.col.name === 'worker'"
|
||||||
/>
|
/>
|
||||||
</component>
|
</component>
|
||||||
|
|
|
@ -20,7 +20,7 @@ const filter = { where: { id: `${route.params.id}` } };
|
||||||
:url="'VnUsers/preview'"
|
:url="'VnUsers/preview'"
|
||||||
model="client"
|
model="client"
|
||||||
>
|
>
|
||||||
<template #form="{ data }">
|
<template #form="{ data, validate }">
|
||||||
<div v-if="data?.length">
|
<div v-if="data?.length">
|
||||||
<div
|
<div
|
||||||
v-for="(item, index) in data"
|
v-for="(item, index) in data"
|
||||||
|
@ -45,7 +45,9 @@ const filter = { where: { id: `${route.params.id}` } };
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('Recovery email')"
|
:label="t('Recovery email')"
|
||||||
|
:rules="validate('client.email')"
|
||||||
clearable
|
clearable
|
||||||
|
type="email"
|
||||||
v-model="item.email"
|
v-model="item.email"
|
||||||
>
|
>
|
||||||
<template #append>
|
<template #append>
|
||||||
|
|
|
@ -110,8 +110,10 @@ const clients = ref();
|
||||||
<QItemSection>
|
<QItemSection>
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('Email')"
|
:label="t('Email')"
|
||||||
|
:rules="validate('client.email')"
|
||||||
clearable
|
clearable
|
||||||
is-outlined
|
is-outlined
|
||||||
|
type="email"
|
||||||
v-model="params.email"
|
v-model="params.email"
|
||||||
/>
|
/>
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
|
|
|
@ -152,6 +152,7 @@ const toCustomerConsignees = () => {
|
||||||
<VnSelectFilter
|
<VnSelectFilter
|
||||||
:label="t('City')"
|
:label="t('City')"
|
||||||
:options="citiesLocationOptions"
|
:options="citiesLocationOptions"
|
||||||
|
:rules="validate('postcode.city')"
|
||||||
hide-selected
|
hide-selected
|
||||||
option-label="name"
|
option-label="name"
|
||||||
option-value="name"
|
option-value="name"
|
||||||
|
@ -178,6 +179,7 @@ const toCustomerConsignees = () => {
|
||||||
<VnSelectFilter
|
<VnSelectFilter
|
||||||
:label="t('Province')"
|
:label="t('Province')"
|
||||||
:options="provincesLocationOptions"
|
:options="provincesLocationOptions"
|
||||||
|
:rules="validate('city.provinceFk')"
|
||||||
hide-selected
|
hide-selected
|
||||||
option-label="name"
|
option-label="name"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
|
@ -198,6 +200,7 @@ const toCustomerConsignees = () => {
|
||||||
<VnSelectFilter
|
<VnSelectFilter
|
||||||
:label="t('Agency')"
|
:label="t('Agency')"
|
||||||
:options="agencyModes"
|
:options="agencyModes"
|
||||||
|
:rules="validate('route.agencyFk')"
|
||||||
hide-selected
|
hide-selected
|
||||||
option-label="name"
|
option-label="name"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
|
|
|
@ -207,6 +207,7 @@ const onDataSaved = () => {
|
||||||
<VnSelectFilter
|
<VnSelectFilter
|
||||||
:label="t('City')"
|
:label="t('City')"
|
||||||
:options="citiesLocationOptions"
|
:options="citiesLocationOptions"
|
||||||
|
:rules="validate('postcode.city')"
|
||||||
hide-selected
|
hide-selected
|
||||||
option-label="name"
|
option-label="name"
|
||||||
option-value="name"
|
option-value="name"
|
||||||
|
@ -233,6 +234,7 @@ const onDataSaved = () => {
|
||||||
<VnSelectFilter
|
<VnSelectFilter
|
||||||
:label="t('Province')"
|
:label="t('Province')"
|
||||||
:options="provincesLocationOptions"
|
:options="provincesLocationOptions"
|
||||||
|
:rules="validate('city.provinceFk')"
|
||||||
hide-selected
|
hide-selected
|
||||||
option-label="name"
|
option-label="name"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
|
@ -253,6 +255,7 @@ const onDataSaved = () => {
|
||||||
<VnSelectFilter
|
<VnSelectFilter
|
||||||
:label="t('Agency')"
|
:label="t('Agency')"
|
||||||
:options="agencyModes"
|
:options="agencyModes"
|
||||||
|
:rules="validate('route.agencyFk')"
|
||||||
hide-selected
|
hide-selected
|
||||||
option-label="name"
|
option-label="name"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
|
@ -316,6 +319,7 @@ const onDataSaved = () => {
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('Description')"
|
:label="t('Description')"
|
||||||
|
:rules="validate('route.description')"
|
||||||
clearable
|
clearable
|
||||||
v-model="note.description"
|
v-model="note.description"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -6,6 +6,7 @@ import { useRoute, useRouter } from 'vue-router';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
|
|
||||||
import { useState } from 'src/composables/useState';
|
import { useState } from 'src/composables/useState';
|
||||||
|
import { useValidator } from 'src/composables/useValidator';
|
||||||
import useNotify from 'src/composables/useNotify';
|
import useNotify from 'src/composables/useNotify';
|
||||||
|
|
||||||
import FetchData from 'components/FetchData.vue';
|
import FetchData from 'components/FetchData.vue';
|
||||||
|
@ -15,6 +16,7 @@ import VnInput from 'src/components/common/VnInput.vue';
|
||||||
|
|
||||||
const { notify } = useNotify();
|
const { notify } = useNotify();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
const { validate } = useValidator();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const state = useState();
|
const state = useState();
|
||||||
|
@ -125,6 +127,7 @@ const inputFileRef = ref();
|
||||||
<VnSelectFilter
|
<VnSelectFilter
|
||||||
:label="t('Company')"
|
:label="t('Company')"
|
||||||
:options="optionsCompanies"
|
:options="optionsCompanies"
|
||||||
|
:rules="validate('entry.companyFk')"
|
||||||
option-label="code"
|
option-label="code"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="dms.companyId"
|
v-model="dms.companyId"
|
||||||
|
@ -157,6 +160,7 @@ const inputFileRef = ref();
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('Description')"
|
:label="t('Description')"
|
||||||
|
:rules="validate('route.description')"
|
||||||
clearable
|
clearable
|
||||||
type="textarea"
|
type="textarea"
|
||||||
v-model="dms.description"
|
v-model="dms.description"
|
||||||
|
|
|
@ -5,6 +5,7 @@ import { useRoute, useRouter } from 'vue-router';
|
||||||
|
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
|
|
||||||
|
import { useValidator } from 'src/composables/useValidator';
|
||||||
import useNotify from 'src/composables/useNotify';
|
import useNotify from 'src/composables/useNotify';
|
||||||
|
|
||||||
import FetchData from 'components/FetchData.vue';
|
import FetchData from 'components/FetchData.vue';
|
||||||
|
@ -14,6 +15,7 @@ import VnInput from 'src/components/common/VnInput.vue';
|
||||||
|
|
||||||
const { notify } = useNotify();
|
const { notify } = useNotify();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
const { validate } = useValidator();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
|
||||||
|
@ -103,6 +105,7 @@ const inputFileRef = ref();
|
||||||
<VnSelectFilter
|
<VnSelectFilter
|
||||||
:label="t('Company')"
|
:label="t('Company')"
|
||||||
:options="optionsCompanies"
|
:options="optionsCompanies"
|
||||||
|
:rules="validate('entry.companyFk')"
|
||||||
option-label="code"
|
option-label="code"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="dms.companyId"
|
v-model="dms.companyId"
|
||||||
|
@ -135,6 +138,7 @@ const inputFileRef = ref();
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<VnInput
|
<VnInput
|
||||||
:label="t('Description')"
|
:label="t('Description')"
|
||||||
|
:rules="validate('route.description')"
|
||||||
clearable
|
clearable
|
||||||
type="textarea"
|
type="textarea"
|
||||||
v-model="dms.description"
|
v-model="dms.description"
|
||||||
|
|
|
@ -131,7 +131,7 @@ const onDataSaved = async () => {
|
||||||
:url-create="urlCreate"
|
:url-create="urlCreate"
|
||||||
@on-data-saved="onDataSaved()"
|
@on-data-saved="onDataSaved()"
|
||||||
>
|
>
|
||||||
<template #form="{ data }">
|
<template #form="{ data, validate }">
|
||||||
<span ref="closeButton" class="row justify-end close-icon" v-close-popup>
|
<span ref="closeButton" class="row justify-end close-icon" v-close-popup>
|
||||||
<QIcon name="close" size="sm" />
|
<QIcon name="close" size="sm" />
|
||||||
</span>
|
</span>
|
||||||
|
@ -153,6 +153,7 @@ const onDataSaved = async () => {
|
||||||
:label="t('Company')"
|
:label="t('Company')"
|
||||||
:options="companyOptions"
|
:options="companyOptions"
|
||||||
:required="true"
|
:required="true"
|
||||||
|
:rules="validate('entry.companyFk')"
|
||||||
hide-selected
|
hide-selected
|
||||||
option-label="code"
|
option-label="code"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
|
|
|
@ -123,7 +123,7 @@ const onDataSaved = async ({
|
||||||
model="client"
|
model="client"
|
||||||
url-create="ClientSamples"
|
url-create="ClientSamples"
|
||||||
>
|
>
|
||||||
<template #form="{ data }">
|
<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">
|
<div class="col">
|
||||||
<VnSelectFilter
|
<VnSelectFilter
|
||||||
|
@ -182,6 +182,7 @@ const onDataSaved = async ({
|
||||||
<VnSelectFilter
|
<VnSelectFilter
|
||||||
:label="t('Company')"
|
:label="t('Company')"
|
||||||
:options="optionsCompanies"
|
:options="optionsCompanies"
|
||||||
|
:rules="validate('entry.companyFk')"
|
||||||
hide-selected
|
hide-selected
|
||||||
option-label="code"
|
option-label="code"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
|
|
Loading…
Reference in New Issue