8231_testToMaster_2448 #997
|
@ -272,6 +272,7 @@ defineExpose({
|
||||||
hasChanges,
|
hasChanges,
|
||||||
reset,
|
reset,
|
||||||
fetch,
|
fetch,
|
||||||
|
formData,
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
|
|
|
@ -62,7 +62,7 @@ const $props = defineProps({
|
||||||
default: 'flex-one',
|
default: 'flex-one',
|
||||||
},
|
},
|
||||||
searchUrl: {
|
searchUrl: {
|
||||||
type: String,
|
type: [String, Boolean],
|
||||||
default: 'table',
|
default: 'table',
|
||||||
},
|
},
|
||||||
isEditable: {
|
isEditable: {
|
||||||
|
@ -331,6 +331,20 @@ function handleScroll() {
|
||||||
const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
|
const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
|
||||||
if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
|
if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function handleSelection({ evt, added, rows: selectedRows }, rows) {
|
||||||
|
if (evt?.shiftKey && added) {
|
||||||
|
const rowIndex = selectedRows[0].$index;
|
||||||
|
const selectedIndexes = new Set(selected.value.map((row) => row.$index));
|
||||||
|
for (const row of rows) {
|
||||||
|
if (row.$index == rowIndex) break;
|
||||||
|
if (!selectedIndexes.has(row.$index)) {
|
||||||
|
selected.value.push(row);
|
||||||
|
selectedIndexes.add(row.$index);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<QDrawer
|
<QDrawer
|
||||||
|
@ -431,6 +445,7 @@ function handleScroll() {
|
||||||
@virtual-scroll="handleScroll"
|
@virtual-scroll="handleScroll"
|
||||||
@row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
|
@row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
|
||||||
@update:selected="emit('update:selected', $event)"
|
@update:selected="emit('update:selected', $event)"
|
||||||
|
@selection="(details) => handleSelection(details, rows)"
|
||||||
>
|
>
|
||||||
<template #top-left v-if="!$props.withoutHeader">
|
<template #top-left v-if="!$props.withoutHeader">
|
||||||
<slot name="top-left"></slot>
|
<slot name="top-left"></slot>
|
||||||
|
|
|
@ -31,6 +31,10 @@ const $props = defineProps({
|
||||||
type: String,
|
type: String,
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
|
description: {
|
||||||
|
type: String,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const warehouses = ref();
|
const warehouses = ref();
|
||||||
|
@ -43,7 +47,8 @@ const dms = ref({});
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
defaultData();
|
defaultData();
|
||||||
if (!$props.formInitialData)
|
if (!$props.formInitialData)
|
||||||
dms.value.description = t($props.model + 'Description', dms.value);
|
dms.value.description =
|
||||||
|
$props.description ?? t($props.model + 'Description', dms.value);
|
||||||
});
|
});
|
||||||
function onFileChange(files) {
|
function onFileChange(files) {
|
||||||
dms.value.hasFileAttached = !!files;
|
dms.value.hasFileAttached = !!files;
|
||||||
|
@ -54,7 +59,6 @@ function mapperDms(data) {
|
||||||
const formData = new FormData();
|
const formData = new FormData();
|
||||||
const { files } = data;
|
const { files } = data;
|
||||||
if (files) formData.append(files?.name, files);
|
if (files) formData.append(files?.name, files);
|
||||||
delete data.files;
|
|
||||||
|
|
||||||
const dms = {
|
const dms = {
|
||||||
hasFile: !!data.hasFile,
|
hasFile: !!data.hasFile,
|
||||||
|
@ -78,6 +82,7 @@ async function save() {
|
||||||
const body = mapperDms(dms.value);
|
const body = mapperDms(dms.value);
|
||||||
const response = await axios.post(getUrl(), body[0], body[1]);
|
const response = await axios.post(getUrl(), body[0], body[1]);
|
||||||
emit('onDataSaved', body[1].params, response);
|
emit('onDataSaved', body[1].params, response);
|
||||||
|
delete dms.value.files;
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -165,6 +170,7 @@ function addDefaultData(data) {
|
||||||
@update:model-value="onFileChange(dms.files)"
|
@update:model-value="onFileChange(dms.files)"
|
||||||
class="required"
|
class="required"
|
||||||
:display-value="dms.file"
|
:display-value="dms.file"
|
||||||
|
data-cy="VnDms_inputFile"
|
||||||
>
|
>
|
||||||
<template #append>
|
<template #append>
|
||||||
<QIcon
|
<QIcon
|
||||||
|
|
|
@ -27,6 +27,10 @@ const $props = defineProps({
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: true,
|
default: true,
|
||||||
},
|
},
|
||||||
|
emptyToNull: {
|
||||||
|
type: Boolean,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
const { validations } = useValidator();
|
const { validations } = useValidator();
|
||||||
|
|
||||||
|
@ -39,6 +43,7 @@ const value = computed({
|
||||||
return $props.modelValue;
|
return $props.modelValue;
|
||||||
},
|
},
|
||||||
set(value) {
|
set(value) {
|
||||||
|
if ($props.emptyToNull && value === '') value = null;
|
||||||
emit('update:modelValue', value);
|
emit('update:modelValue', value);
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
@ -8,7 +8,7 @@ defineProps({
|
||||||
<template>
|
<template>
|
||||||
<div :class="$q.screen.gt.md ? 'q-pb-lg' : 'q-pb-md'">
|
<div :class="$q.screen.gt.md ? 'q-pb-lg' : 'q-pb-md'">
|
||||||
<div class="header-link" :style="{ cursor: url ? 'pointer' : 'default' }">
|
<div class="header-link" :style="{ cursor: url ? 'pointer' : 'default' }">
|
||||||
<a :href="url" :class="url ? 'link' : 'color-vn-text'">
|
<a :href="url" :class="url ? 'link' : 'color-vn-text'" v-bind="$attrs">
|
||||||
{{ text }}
|
{{ text }}
|
||||||
<QIcon v-if="url" :name="icon" />
|
<QIcon v-if="url" :name="icon" />
|
||||||
</a>
|
</a>
|
||||||
|
|
|
@ -167,6 +167,7 @@ const toModule = computed(() =>
|
||||||
icon="more_vert"
|
icon="more_vert"
|
||||||
round
|
round
|
||||||
size="md"
|
size="md"
|
||||||
|
data-cy="descriptor-more-opts"
|
||||||
>
|
>
|
||||||
<QTooltip>
|
<QTooltip>
|
||||||
{{ t('components.cardDescriptor.moreOptions') }}
|
{{ t('components.cardDescriptor.moreOptions') }}
|
||||||
|
|
|
@ -4,6 +4,7 @@ import { useRoute } from 'vue-router';
|
||||||
import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
|
import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
|
||||||
import VnLv from 'src/components/ui/VnLv.vue';
|
import VnLv from 'src/components/ui/VnLv.vue';
|
||||||
import { useArrayData } from 'src/composables/useArrayData';
|
import { useArrayData } from 'src/composables/useArrayData';
|
||||||
|
import { isDialogOpened } from 'src/filters';
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
url: {
|
url: {
|
||||||
|
@ -58,22 +59,6 @@ async function fetch() {
|
||||||
emit('onFetch', Array.isArray(data) ? data[0] : data);
|
emit('onFetch', Array.isArray(data) ? data[0] : data);
|
||||||
isLoading.value = false;
|
isLoading.value = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
const showRedirectToSummaryIcon = computed(() => {
|
|
||||||
const exist = existSummary(route.matched);
|
|
||||||
return !isSummary.value && route.meta.moduleName && exist;
|
|
||||||
});
|
|
||||||
|
|
||||||
function existSummary(routes) {
|
|
||||||
const hasSummary = routes.some((r) => r.name === `${route.meta.moduleName}Summary`);
|
|
||||||
if (hasSummary) return hasSummary;
|
|
||||||
for (const current of routes) {
|
|
||||||
if (current.path != '/' && current.children) {
|
|
||||||
const exist = existSummary(current.children);
|
|
||||||
if (exist) return exist;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
@ -84,7 +69,7 @@ function existSummary(routes) {
|
||||||
<div class="summaryHeader bg-primary q-pa-sm text-weight-bolder">
|
<div class="summaryHeader bg-primary q-pa-sm text-weight-bolder">
|
||||||
<slot name="header-left">
|
<slot name="header-left">
|
||||||
<router-link
|
<router-link
|
||||||
v-if="showRedirectToSummaryIcon"
|
v-if="isDialogOpened()"
|
||||||
class="header link"
|
class="header link"
|
||||||
:to="{
|
:to="{
|
||||||
name: `${moduleName ?? route.meta.moduleName}Summary`,
|
name: `${moduleName ?? route.meta.moduleName}Summary`,
|
||||||
|
@ -118,6 +103,7 @@ function existSummary(routes) {
|
||||||
|
|
||||||
.cardSummary {
|
.cardSummary {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
max-height: 70vh;
|
||||||
.summaryHeader {
|
.summaryHeader {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
|
|
|
@ -103,6 +103,7 @@ function cancel() {
|
||||||
@click="confirm()"
|
@click="confirm()"
|
||||||
unelevated
|
unelevated
|
||||||
autofocus
|
autofocus
|
||||||
|
data-cy="VnConfirm_confirm"
|
||||||
/>
|
/>
|
||||||
</QCardActions>
|
</QCardActions>
|
||||||
</QCard>
|
</QCard>
|
||||||
|
|
|
@ -0,0 +1,16 @@
|
||||||
|
<script setup>
|
||||||
|
defineProps({ email: { type: [String], default: null } });
|
||||||
|
</script>
|
||||||
|
<template>
|
||||||
|
<QBtn
|
||||||
|
v-if="email"
|
||||||
|
flat
|
||||||
|
round
|
||||||
|
icon="email"
|
||||||
|
size="sm"
|
||||||
|
color="primary"
|
||||||
|
padding="none"
|
||||||
|
:href="`mailto:${email}`"
|
||||||
|
@click.stop
|
||||||
|
/>
|
||||||
|
</template>
|
|
@ -3,6 +3,7 @@ import { useRouter, useRoute } from 'vue-router';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { useArrayDataStore } from 'stores/useArrayDataStore';
|
import { useArrayDataStore } from 'stores/useArrayDataStore';
|
||||||
import { buildFilter } from 'filters/filterPanel';
|
import { buildFilter } from 'filters/filterPanel';
|
||||||
|
import { isDialogOpened } from 'src/filters';
|
||||||
|
|
||||||
const arrayDataStore = useArrayDataStore();
|
const arrayDataStore = useArrayDataStore();
|
||||||
|
|
||||||
|
@ -114,8 +115,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
|
||||||
for (const row of response.data) store.data.push(row);
|
for (const row of response.data) store.data.push(row);
|
||||||
} else {
|
} else {
|
||||||
store.data = response.data;
|
store.data = response.data;
|
||||||
if (!document.querySelectorAll('[role="dialog"][aria-modal="true"]').length)
|
if (!isDialogOpened()) updateRouter && updateStateParams();
|
||||||
updateRouter && updateStateParams();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
store.isLoading = false;
|
store.isLoading = false;
|
||||||
|
@ -247,9 +247,9 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateStateParams() {
|
function updateStateParams() {
|
||||||
if (!route) return;
|
|
||||||
const newUrl = { path: route.path, query: { ...(route.query ?? {}) } };
|
const newUrl = { path: route.path, query: { ...(route.query ?? {}) } };
|
||||||
newUrl.query[store.searchUrl] = JSON.stringify(store.currentFilter);
|
if (store?.searchUrl)
|
||||||
|
newUrl.query[store.searchUrl] = JSON.stringify(store.currentFilter);
|
||||||
|
|
||||||
if (store.navigate) {
|
if (store.navigate) {
|
||||||
const { customRouteRedirectName, searchText } = store.navigate;
|
const { customRouteRedirectName, searchText } = store.navigate;
|
||||||
|
|
|
@ -12,8 +12,10 @@ import dateRange from './dateRange';
|
||||||
import toHour from './toHour';
|
import toHour from './toHour';
|
||||||
import dashOrCurrency from './dashOrCurrency';
|
import dashOrCurrency from './dashOrCurrency';
|
||||||
import getParamWhere from './getParamWhere';
|
import getParamWhere from './getParamWhere';
|
||||||
|
import isDialogOpened from './isDialogOpened';
|
||||||
|
|
||||||
export {
|
export {
|
||||||
|
isDialogOpened,
|
||||||
toLowerCase,
|
toLowerCase,
|
||||||
toLowerCamel,
|
toLowerCamel,
|
||||||
toDate,
|
toDate,
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
export default function isDialogOpened(query = '[role="dialog"]') {
|
||||||
|
return document.querySelectorAll(query).length > 0;
|
||||||
|
}
|
|
@ -27,7 +27,7 @@ const addressFilter = {
|
||||||
'isLogifloraAllowed',
|
'isLogifloraAllowed',
|
||||||
'postalCode',
|
'postalCode',
|
||||||
],
|
],
|
||||||
order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
|
order: ['isDefaultAddress DESC', 'isActive DESC', 'id DESC', 'nickname ASC'],
|
||||||
include: [
|
include: [
|
||||||
{
|
{
|
||||||
relation: 'observations',
|
relation: 'observations',
|
||||||
|
|
|
@ -5,7 +5,7 @@ import { useRoute } from 'vue-router';
|
||||||
import { useAcl } from 'src/composables/useAcl';
|
import { useAcl } from 'src/composables/useAcl';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { useQuasar } from 'quasar';
|
import { useQuasar } from 'quasar';
|
||||||
import FetchData from 'components/FetchData.vue';
|
import { getClientRisk } from '../composables/getClientRisk';
|
||||||
|
|
||||||
import { toCurrency, toDate, toDateHourMin } from 'src/filters';
|
import { toCurrency, toDate, toDateHourMin } from 'src/filters';
|
||||||
import { useState } from 'composables/useState';
|
import { useState } from 'composables/useState';
|
||||||
|
@ -16,7 +16,7 @@ import { useVnConfirm } from 'composables/useVnConfirm';
|
||||||
import VnTable from 'components/VnTable/VnTable.vue';
|
import VnTable from 'components/VnTable/VnTable.vue';
|
||||||
import VnInput from 'components/common/VnInput.vue';
|
import VnInput from 'components/common/VnInput.vue';
|
||||||
import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
|
import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
|
||||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
import VnFilter from 'components/VnTable/VnFilter.vue';
|
||||||
|
|
||||||
import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
|
import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
|
||||||
import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
|
import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
|
||||||
|
@ -25,7 +25,7 @@ const { openConfirmationModal } = useVnConfirm();
|
||||||
const { sendEmail, openReport } = usePrintService();
|
const { sendEmail, openReport } = usePrintService();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const { hasAny } = useAcl();
|
const { hasAny } = useAcl();
|
||||||
const currentBalance = ref({});
|
|
||||||
const quasar = useQuasar();
|
const quasar = useQuasar();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const state = useState();
|
const state = useState();
|
||||||
|
@ -33,28 +33,53 @@ const stateStore = useStateStore();
|
||||||
const user = state.getUser();
|
const user = state.getUser();
|
||||||
|
|
||||||
const clientRisk = ref([]);
|
const clientRisk = ref([]);
|
||||||
const companies = ref([]);
|
|
||||||
const tableRef = ref();
|
const tableRef = ref();
|
||||||
const companyId = ref(user.value.companyFk);
|
const companyId = ref();
|
||||||
|
const companyUser = ref(user.value.companyFk);
|
||||||
const balances = ref([]);
|
const balances = ref([]);
|
||||||
const vnFilterRef = ref({});
|
const vnFilterRef = ref({});
|
||||||
const filter = computed(() => {
|
const filter = computed(() => {
|
||||||
return {
|
return {
|
||||||
clientId: route.params.id,
|
clientId: route.params.id,
|
||||||
companyId: companyId.value ?? user.value.companyFk,
|
companyId: companyId.value ?? companyUser.value,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const companyFilterColumn = {
|
||||||
|
align: 'left',
|
||||||
|
name: 'companyId',
|
||||||
|
label: t('Company'),
|
||||||
|
component: 'select',
|
||||||
|
attrs: {
|
||||||
|
url: 'Companies',
|
||||||
|
optionLabel: 'code',
|
||||||
|
optionValue: 'id',
|
||||||
|
sortBy: 'code',
|
||||||
|
},
|
||||||
|
columnFilter: {
|
||||||
|
event: {
|
||||||
|
remove: () => (companyId.value = null),
|
||||||
|
'update:modelValue': (newCompanyFk) => {
|
||||||
|
if (!newCompanyFk) return;
|
||||||
|
vnFilterRef.value.addFilter(newCompanyFk);
|
||||||
|
companyUser.value = newCompanyFk;
|
||||||
|
},
|
||||||
|
blur: () => !companyId.value && (companyId.value = companyUser.value),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
visible: false,
|
||||||
|
};
|
||||||
|
|
||||||
const columns = computed(() => [
|
const columns = computed(() => [
|
||||||
{
|
{
|
||||||
align: 'right',
|
align: 'left',
|
||||||
name: 'payed',
|
name: 'payed',
|
||||||
label: t('Date'),
|
label: t('Date'),
|
||||||
format: ({ payed }) => toDate(payed),
|
format: ({ payed }) => toDate(payed),
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'right',
|
align: 'left',
|
||||||
name: 'created',
|
name: 'created',
|
||||||
label: t('Creation date'),
|
label: t('Creation date'),
|
||||||
format: ({ created }) => toDateHourMin(created),
|
format: ({ created }) => toDateHourMin(created),
|
||||||
|
@ -65,7 +90,12 @@ const columns = computed(() => [
|
||||||
label: t('Employee'),
|
label: t('Employee'),
|
||||||
columnField: {
|
columnField: {
|
||||||
component: 'userLink',
|
component: 'userLink',
|
||||||
attrs: ({ row }) => ({ workerId: row.workerFk, name: row.userName }),
|
attrs: ({ row }) => {
|
||||||
|
return {
|
||||||
|
workerId: row.workerFk,
|
||||||
|
name: row.userName,
|
||||||
|
};
|
||||||
|
},
|
||||||
},
|
},
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
},
|
},
|
||||||
|
@ -77,13 +107,13 @@ const columns = computed(() => [
|
||||||
class: 'extend',
|
class: 'extend',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'right',
|
align: 'left',
|
||||||
name: 'bankFk',
|
name: 'bankFk',
|
||||||
label: t('Bank'),
|
label: t('Bank'),
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'right',
|
align: 'left',
|
||||||
name: 'debit',
|
name: 'debit',
|
||||||
label: t('Debit'),
|
label: t('Debit'),
|
||||||
format: ({ debit }) => debit && toCurrency(debit),
|
format: ({ debit }) => debit && toCurrency(debit),
|
||||||
|
@ -136,20 +166,37 @@ const columns = computed(() => [
|
||||||
|
|
||||||
onBeforeMount(() => {
|
onBeforeMount(() => {
|
||||||
stateStore.rightDrawer = true;
|
stateStore.rightDrawer = true;
|
||||||
|
companyId.value = companyUser.value;
|
||||||
});
|
});
|
||||||
|
|
||||||
async function getCurrentBalance(data) {
|
async function getClientRisks() {
|
||||||
currentBalance.value[companyId.value] = {
|
const filter = {
|
||||||
amount: 0,
|
where: { clientFk: route.params.id, companyFk: companyUser.value },
|
||||||
code: companies.value.find((c) => c.id === companyId.value)?.code,
|
|
||||||
};
|
};
|
||||||
|
const { data } = await getClientRisk(filter);
|
||||||
|
clientRisk.value = data;
|
||||||
|
return clientRisk.value;
|
||||||
|
}
|
||||||
|
|
||||||
for (const balance of data) {
|
async function getCurrentBalance() {
|
||||||
currentBalance.value[balance.companyFk] = {
|
const currentBalance = (await getClientRisks()).find((balance) => {
|
||||||
code: balance.company.code,
|
return balance.companyFk === companyId.value;
|
||||||
amount: balance.amount,
|
});
|
||||||
};
|
return currentBalance && currentBalance.amount;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function onFetch(data) {
|
||||||
|
balances.value = [];
|
||||||
|
for (const [index, balance] of data.entries()) {
|
||||||
|
if (index === 0) {
|
||||||
|
balance.balance = await getCurrentBalance();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const previousBalance = data[index - 1];
|
||||||
|
balance.balance =
|
||||||
|
previousBalance?.balance - (previousBalance?.debit - previousBalance?.credit);
|
||||||
}
|
}
|
||||||
|
balances.value = data;
|
||||||
}
|
}
|
||||||
|
|
||||||
const showNewPaymentDialog = () => {
|
const showNewPaymentDialog = () => {
|
||||||
|
@ -169,43 +216,25 @@ const showBalancePdf = ({ id }) => {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<FetchData
|
|
||||||
url="Companies"
|
|
||||||
auto-load
|
|
||||||
@on-fetch="(data) => (companies = data)"
|
|
||||||
></FetchData>
|
|
||||||
<FetchData
|
|
||||||
v-if="companies.length > 0"
|
|
||||||
url="clientRisks"
|
|
||||||
:filter="{
|
|
||||||
include: { relation: 'company', scope: { fields: ['code'] } },
|
|
||||||
where: { clientFk: route.params.id },
|
|
||||||
}"
|
|
||||||
auto-load
|
|
||||||
@on-fetch="getCurrentBalance"
|
|
||||||
></FetchData>
|
|
||||||
|
|
||||||
<VnSubToolbar class="q-mb-md">
|
<VnSubToolbar class="q-mb-md">
|
||||||
<template #st-data>
|
<template #st-data>
|
||||||
<div class="column justify-center q-px-md q-py-sm">
|
<div class="column justify-center q-px-md q-py-sm">
|
||||||
<span class="text-bold">{{ t('Total by company') }}</span>
|
<span class="text-bold">{{ t('Total by company') }}</span>
|
||||||
<div class="row justify-center">
|
<div class="row justify-center" v-if="clientRisk?.length">
|
||||||
{{ currentBalance[companyId]?.code }}:
|
{{ clientRisk[0].company.code }}:
|
||||||
{{ toCurrency(currentBalance[companyId]?.amount) }}
|
{{ toCurrency(clientRisk[0].amount) }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #st-actions>
|
<template #st-actions>
|
||||||
<div>
|
<div>
|
||||||
<VnSelect
|
<VnFilter
|
||||||
:label="t('Company')"
|
|
||||||
ref="vnFilterRef"
|
ref="vnFilterRef"
|
||||||
v-model="companyId"
|
v-model="companyId"
|
||||||
data-key="CustomerBalance"
|
data-key="CustomerBalance"
|
||||||
:options="companies"
|
:column="companyFilterColumn"
|
||||||
option-label="code"
|
search-url="balance"
|
||||||
option-value="id"
|
/>
|
||||||
></VnSelect>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</VnSubToolbar>
|
</VnSubToolbar>
|
||||||
|
@ -219,6 +248,7 @@ const showBalancePdf = ({ id }) => {
|
||||||
:right-search="false"
|
:right-search="false"
|
||||||
:is-editable="false"
|
:is-editable="false"
|
||||||
:column-search="false"
|
:column-search="false"
|
||||||
|
@on-fetch="onFetch"
|
||||||
:disable-option="{ card: true }"
|
:disable-option="{ card: true }"
|
||||||
auto-load
|
auto-load
|
||||||
>
|
>
|
||||||
|
|
|
@ -49,7 +49,9 @@ const columns = computed(() => [
|
||||||
name: 'credit',
|
name: 'credit',
|
||||||
create: true,
|
create: true,
|
||||||
visible: false,
|
visible: false,
|
||||||
attrs: {
|
columnCreate: {
|
||||||
|
component: 'number',
|
||||||
|
required: true,
|
||||||
autofocus: true,
|
autofocus: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -150,7 +150,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
|
||||||
</QCardActions>
|
</QCardActions>
|
||||||
</template>
|
</template>
|
||||||
<template #actions="{ entity }">
|
<template #actions="{ entity }">
|
||||||
<QCardActions class="flex justify-center">
|
<QCardActions class="flex justify-center" style="padding-inline: 0">
|
||||||
<QBtn
|
<QBtn
|
||||||
:to="{
|
:to="{
|
||||||
name: 'TicketList',
|
name: 'TicketList',
|
||||||
|
@ -168,6 +168,23 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
|
||||||
>
|
>
|
||||||
<QTooltip>{{ t('Customer ticket list') }}</QTooltip>
|
<QTooltip>{{ t('Customer ticket list') }}</QTooltip>
|
||||||
</QBtn>
|
</QBtn>
|
||||||
|
<QBtn
|
||||||
|
:to="{
|
||||||
|
name: 'TicketList',
|
||||||
|
query: {
|
||||||
|
table: JSON.stringify({
|
||||||
|
clientFk: entity.id,
|
||||||
|
}),
|
||||||
|
createForm: JSON.stringify({ clientId: entity.id }),
|
||||||
|
},
|
||||||
|
}"
|
||||||
|
size="md"
|
||||||
|
color="primary"
|
||||||
|
target="_blank"
|
||||||
|
icon="vn:ticketAdd"
|
||||||
|
>
|
||||||
|
<QTooltip>{{ t('New ticket') }}</QTooltip>
|
||||||
|
</QBtn>
|
||||||
<QBtn
|
<QBtn
|
||||||
:to="{
|
:to="{
|
||||||
name: 'InvoiceOutList',
|
name: 'InvoiceOutList',
|
||||||
|
@ -179,6 +196,23 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
|
||||||
>
|
>
|
||||||
<QTooltip>{{ t('Customer invoice out list') }}</QTooltip>
|
<QTooltip>{{ t('Customer invoice out list') }}</QTooltip>
|
||||||
</QBtn>
|
</QBtn>
|
||||||
|
<QBtn
|
||||||
|
:to="{
|
||||||
|
name: 'OrderList',
|
||||||
|
query: {
|
||||||
|
table: JSON.stringify({
|
||||||
|
clientFk: entity.id,
|
||||||
|
}),
|
||||||
|
createForm: JSON.stringify({ clientFk: entity.id }),
|
||||||
|
},
|
||||||
|
}"
|
||||||
|
size="md"
|
||||||
|
target="_blank"
|
||||||
|
icon="vn:basketadd"
|
||||||
|
color="primary"
|
||||||
|
>
|
||||||
|
<QTooltip>{{ t('New order') }}</QTooltip>
|
||||||
|
</QBtn>
|
||||||
<QBtn
|
<QBtn
|
||||||
:to="{
|
:to="{
|
||||||
name: 'AccountSummary',
|
name: 'AccountSummary',
|
||||||
|
@ -215,6 +249,8 @@ es:
|
||||||
Go to module index: Ir al índice del módulo
|
Go to module index: Ir al índice del módulo
|
||||||
Customer ticket list: Listado de tickets del cliente
|
Customer ticket list: Listado de tickets del cliente
|
||||||
Customer invoice out list: Listado de facturas del cliente
|
Customer invoice out list: Listado de facturas del cliente
|
||||||
|
New order: Nuevo pedido
|
||||||
|
New ticket: Nuevo ticket
|
||||||
Go to user: Ir al usuario
|
Go to user: Ir al usuario
|
||||||
Go to supplier: Ir al proveedor
|
Go to supplier: Ir al proveedor
|
||||||
Customer unpaid: Cliente impago
|
Customer unpaid: Cliente impago
|
||||||
|
|
|
@ -8,9 +8,6 @@ import { useQuasar } from 'quasar';
|
||||||
import useNotify from 'src/composables/useNotify';
|
import useNotify from 'src/composables/useNotify';
|
||||||
|
|
||||||
import VnSmsDialog from 'src/components/common/VnSmsDialog.vue';
|
import VnSmsDialog from 'src/components/common/VnSmsDialog.vue';
|
||||||
import TicketCreateDialog from 'src/pages/Ticket/TicketCreateDialog.vue';
|
|
||||||
import OrderCreateDialog from 'src/pages/Order/Card/OrderCreateDialog.vue';
|
|
||||||
import { ref } from 'vue';
|
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
customer: {
|
customer: {
|
||||||
|
@ -43,34 +40,9 @@ const sendSms = async (payload) => {
|
||||||
notify(error.message, 'positive');
|
notify(error.message, 'positive');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const ticketCreateFormDialog = ref(null);
|
|
||||||
const openTicketCreateForm = () => {
|
|
||||||
ticketCreateFormDialog.value.show();
|
|
||||||
};
|
|
||||||
const orderCreateFormDialog = ref(null);
|
|
||||||
const openOrderCreateForm = () => {
|
|
||||||
orderCreateFormDialog.value.show();
|
|
||||||
};
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<QItem v-ripple clickable @click="openTicketCreateForm()">
|
|
||||||
<QItemSection>
|
|
||||||
{{ t('globals.pageTitles.createTicket') }}
|
|
||||||
<QDialog ref="ticketCreateFormDialog">
|
|
||||||
<TicketCreateDialog />
|
|
||||||
</QDialog>
|
|
||||||
</QItemSection>
|
|
||||||
</QItem>
|
|
||||||
<QItem v-ripple clickable @click="openOrderCreateForm()">
|
|
||||||
<QItemSection>
|
|
||||||
{{ t('globals.pageTitles.createOrder') }}
|
|
||||||
<QDialog ref="orderCreateFormDialog">
|
|
||||||
<OrderCreateDialog :client-fk="customer.id" />
|
|
||||||
</QDialog>
|
|
||||||
</QItemSection>
|
|
||||||
</QItem>
|
|
||||||
<QItem v-ripple clickable>
|
<QItem v-ripple clickable>
|
||||||
<QItemSection @click="showSmsDialog()">{{ t('Send SMS') }}</QItemSection>
|
<QItemSection @click="showSmsDialog()">{{ t('Send SMS') }}</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
|
|
|
@ -53,11 +53,11 @@ function handleLocation(data, location) {
|
||||||
</QIcon>
|
</QIcon>
|
||||||
</template>
|
</template>
|
||||||
</VnInput>
|
</VnInput>
|
||||||
<VnInput :label="t('Tax number')" clearable v-model="data.fi" />
|
<VnInput :label="t('Tax number')" clearable v-model="data.fi" required />
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
||||||
<VnRow>
|
<VnRow>
|
||||||
<VnInput :label="t('Street')" clearable v-model="data.street" />
|
<VnInput :label="t('Street')" clearable v-model="data.street" required />
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
||||||
<VnRow>
|
<VnRow>
|
||||||
|
@ -68,6 +68,7 @@ function handleLocation(data, location) {
|
||||||
option-label="vat"
|
option-label="vat"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="data.sageTaxTypeFk"
|
v-model="data.sageTaxTypeFk"
|
||||||
|
:required="data.isTaxDataChecked"
|
||||||
/>
|
/>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Sage transaction type')"
|
:label="t('Sage transaction type')"
|
||||||
|
@ -76,6 +77,7 @@ function handleLocation(data, location) {
|
||||||
option-label="transaction"
|
option-label="transaction"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="data.sageTransactionTypeFk"
|
v-model="data.sageTransactionTypeFk"
|
||||||
|
:required="data.isTaxDataChecked"
|
||||||
>
|
>
|
||||||
<template #option="scope">
|
<template #option="scope">
|
||||||
<QItem v-bind="scope.itemProps">
|
<QItem v-bind="scope.itemProps">
|
||||||
|
@ -96,6 +98,7 @@ function handleLocation(data, location) {
|
||||||
:roles-allowed-to-create="['deliveryAssistant', 'administrative']"
|
:roles-allowed-to-create="['deliveryAssistant', 'administrative']"
|
||||||
:acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
|
:acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
|
||||||
:location="data"
|
:location="data"
|
||||||
|
:required="true"
|
||||||
@update:model-value="(location) => handleLocation(data, location)"
|
@update:model-value="(location) => handleLocation(data, location)"
|
||||||
/>
|
/>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
|
@ -80,6 +80,11 @@ const columns = computed(() => [
|
||||||
align: 'left',
|
align: 'left',
|
||||||
name: 'amount',
|
name: 'amount',
|
||||||
label: t('Amount'),
|
label: t('Amount'),
|
||||||
|
columnCreate: {
|
||||||
|
component: 'number',
|
||||||
|
autofocus: true,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
format: ({ amount }) => toCurrency(amount),
|
format: ({ amount }) => toCurrency(amount),
|
||||||
create: true,
|
create: true,
|
||||||
},
|
},
|
||||||
|
|
|
@ -56,6 +56,7 @@ const columns = computed(() => [
|
||||||
label: t('Period'),
|
label: t('Period'),
|
||||||
create: true,
|
create: true,
|
||||||
...componentColumn('number'),
|
...componentColumn('number'),
|
||||||
|
required: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
|
|
|
@ -1,13 +1,15 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { computed, ref } from 'vue';
|
import { computed, ref, onMounted } from 'vue';
|
||||||
import { useRoute } from 'vue-router';
|
import { useRoute } from 'vue-router';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import VnUserLink from 'src/components/ui/VnUserLink.vue';
|
import VnUserLink from 'src/components/ui/VnUserLink.vue';
|
||||||
|
|
||||||
import { toCurrency, toPercentage, toDate } from 'src/filters';
|
import { toCurrency, toPercentage, toDate } from 'src/filters';
|
||||||
import CardSummary from 'components/ui/CardSummary.vue';
|
import CardSummary from 'components/ui/CardSummary.vue';
|
||||||
|
import { getUrl } from 'src/composables/getUrl';
|
||||||
import VnLv from 'src/components/ui/VnLv.vue';
|
import VnLv from 'src/components/ui/VnLv.vue';
|
||||||
import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
|
import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
|
||||||
|
import VnLinkMail from 'src/components/ui/VnLinkMail.vue';
|
||||||
import CustomerSummaryTable from 'src/pages/Customer/components/CustomerSummaryTable.vue';
|
import CustomerSummaryTable from 'src/pages/Customer/components/CustomerSummaryTable.vue';
|
||||||
import VnTitle from 'src/components/common/VnTitle.vue';
|
import VnTitle from 'src/components/common/VnTitle.vue';
|
||||||
import VnRow from 'src/components/ui/VnRow.vue';
|
import VnRow from 'src/components/ui/VnRow.vue';
|
||||||
|
@ -25,6 +27,11 @@ const $props = defineProps({
|
||||||
const entityId = computed(() => $props.id || route.params.id);
|
const entityId = computed(() => $props.id || route.params.id);
|
||||||
const customer = computed(() => summary.value.entity);
|
const customer = computed(() => summary.value.entity);
|
||||||
const summary = ref();
|
const summary = ref();
|
||||||
|
const clientUrl = ref();
|
||||||
|
|
||||||
|
onMounted(async () => {
|
||||||
|
clientUrl.value = (await getUrl('client/')) + entityId.value + '/';
|
||||||
|
});
|
||||||
|
|
||||||
const balanceDue = computed(() => {
|
const balanceDue = computed(() => {
|
||||||
return (
|
return (
|
||||||
|
@ -67,6 +74,7 @@ const sumRisk = ({ clientRisks }) => {
|
||||||
ref="summary"
|
ref="summary"
|
||||||
:url="`Clients/${entityId}/summary`"
|
:url="`Clients/${entityId}/summary`"
|
||||||
data-key="CustomerSummary"
|
data-key="CustomerSummary"
|
||||||
|
module-name="Customer"
|
||||||
>
|
>
|
||||||
<template #body="{ entity }">
|
<template #body="{ entity }">
|
||||||
<QCard class="vn-one">
|
<QCard class="vn-one">
|
||||||
|
@ -89,7 +97,11 @@ const sumRisk = ({ clientRisks }) => {
|
||||||
<VnLinkPhone :phone-number="entity.mobile" />
|
<VnLinkPhone :phone-number="entity.mobile" />
|
||||||
</template>
|
</template>
|
||||||
</VnLv>
|
</VnLv>
|
||||||
<VnLv :label="t('customer.summary.email')" :value="entity.email" copy />
|
<VnLv :value="entity.email" copy
|
||||||
|
><template #label>
|
||||||
|
{{ t('customer.summary.email') }}
|
||||||
|
<VnLinkMail email="entity.email"></VnLinkMail> </template
|
||||||
|
></VnLv>
|
||||||
<VnLv
|
<VnLv
|
||||||
:label="t('customer.summary.salesPerson')"
|
:label="t('customer.summary.salesPerson')"
|
||||||
:value="entity?.salesPersonUser?.name"
|
:value="entity?.salesPersonUser?.name"
|
||||||
|
@ -166,7 +178,7 @@ const sumRisk = ({ clientRisks }) => {
|
||||||
<QCard class="vn-one">
|
<QCard class="vn-one">
|
||||||
<VnTitle
|
<VnTitle
|
||||||
:url="`#/customer/${entityId}/billing-data`"
|
:url="`#/customer/${entityId}/billing-data`"
|
||||||
:text="t('customer.summary.payMethodFk')"
|
:text="t('customer.summary.billingData')"
|
||||||
/>
|
/>
|
||||||
<VnLv
|
<VnLv
|
||||||
:label="t('customer.summary.payMethod')"
|
:label="t('customer.summary.payMethod')"
|
||||||
|
@ -222,6 +234,7 @@ const sumRisk = ({ clientRisks }) => {
|
||||||
</QCard>
|
</QCard>
|
||||||
<QCard class="vn-one" v-if="entity.account">
|
<QCard class="vn-one" v-if="entity.account">
|
||||||
<VnTitle
|
<VnTitle
|
||||||
|
target="_blank"
|
||||||
:url="`${grafanaUrl}/d/adjlxzv5yjt34d/analisis-de-clientes-7c-crm?orgId=1&var-clientFk=${entityId}`"
|
:url="`${grafanaUrl}/d/adjlxzv5yjt34d/analisis-de-clientes-7c-crm?orgId=1&var-clientFk=${entityId}`"
|
||||||
:text="t('customer.summary.businessData')"
|
:text="t('customer.summary.businessData')"
|
||||||
icon="vn:grafana"
|
icon="vn:grafana"
|
||||||
|
@ -235,6 +248,7 @@ const sumRisk = ({ clientRisks }) => {
|
||||||
:value="toCurrency(entity?.mana?.mana)"
|
:value="toCurrency(entity?.mana?.mana)"
|
||||||
/>
|
/>
|
||||||
<VnLv
|
<VnLv
|
||||||
|
v-if="entity.claimsRatio"
|
||||||
:label="t('customer.summary.priceIncreasingRate')"
|
:label="t('customer.summary.priceIncreasingRate')"
|
||||||
:value="toPercentage(priceIncreasingRate)"
|
:value="toPercentage(priceIncreasingRate)"
|
||||||
/>
|
/>
|
||||||
|
@ -243,12 +257,14 @@ const sumRisk = ({ clientRisks }) => {
|
||||||
:value="toCurrency(entity?.averageInvoiced?.invoiced)"
|
:value="toCurrency(entity?.averageInvoiced?.invoiced)"
|
||||||
/>
|
/>
|
||||||
<VnLv
|
<VnLv
|
||||||
|
v-if="entity.claimsRatio"
|
||||||
:label="t('customer.summary.claimRate')"
|
:label="t('customer.summary.claimRate')"
|
||||||
:value="toPercentage(claimRate)"
|
:value="toPercentage(claimRate)"
|
||||||
/>
|
/>
|
||||||
</QCard>
|
</QCard>
|
||||||
<QCard class="vn-one" v-if="entity.account">
|
<QCard class="vn-one" v-if="entity.account">
|
||||||
<VnTitle
|
<VnTitle
|
||||||
|
target="_blank"
|
||||||
:url="`${grafanaUrl}/d/40buzE4Vk/comportamiento-pagos-clientes?orgId=1&var-clientFk=${entityId}`"
|
:url="`${grafanaUrl}/d/40buzE4Vk/comportamiento-pagos-clientes?orgId=1&var-clientFk=${entityId}`"
|
||||||
:text="t('customer.summary.payMethodFk')"
|
:text="t('customer.summary.payMethodFk')"
|
||||||
icon="vn:grafana"
|
icon="vn:grafana"
|
||||||
|
@ -268,10 +284,12 @@ const sumRisk = ({ clientRisks }) => {
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<VnLv
|
<VnLv
|
||||||
|
v-if="entity.creditInsurance"
|
||||||
:label="t('customer.summary.securedCredit')"
|
:label="t('customer.summary.securedCredit')"
|
||||||
:value="toCurrency(entity.creditInsurance)"
|
:value="toCurrency(entity.creditInsurance)"
|
||||||
:info="t('customer.summary.securedCreditInfo')"
|
:info="t('customer.summary.securedCreditInfo')"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<VnLv
|
<VnLv
|
||||||
:label="t('customer.summary.balance')"
|
:label="t('customer.summary.balance')"
|
||||||
:value="toCurrency(sumRisk(entity)) || toCurrency(0)"
|
:value="toCurrency(sumRisk(entity)) || toCurrency(0)"
|
||||||
|
@ -301,7 +319,7 @@ const sumRisk = ({ clientRisks }) => {
|
||||||
:value="entity.recommendedCredit"
|
:value="entity.recommendedCredit"
|
||||||
/>
|
/>
|
||||||
</QCard>
|
</QCard>
|
||||||
<QCard>
|
<QCard class="vn-one">
|
||||||
<VnTitle :text="t('Latest tickets')" />
|
<VnTitle :text="t('Latest tickets')" />
|
||||||
<CustomerSummaryTable />
|
<CustomerSummaryTable />
|
||||||
</QCard>
|
</QCard>
|
||||||
|
|
|
@ -68,7 +68,6 @@ const columns = computed(() => [
|
||||||
fields: ['id', 'name'],
|
fields: ['id', 'name'],
|
||||||
where: { role: 'salesPerson' },
|
where: { role: 'salesPerson' },
|
||||||
optionFilter: 'firstName',
|
optionFilter: 'firstName',
|
||||||
useLike: false,
|
|
||||||
},
|
},
|
||||||
create: false,
|
create: false,
|
||||||
columnField: {
|
columnField: {
|
||||||
|
@ -429,9 +428,10 @@ function handleLocation(data, location) {
|
||||||
:params="{
|
:params="{
|
||||||
departmentCodes: ['VT', 'shopping'],
|
departmentCodes: ['VT', 'shopping'],
|
||||||
}"
|
}"
|
||||||
:fields="['id', 'nickname']"
|
:fields="['id', 'nickname', 'code']"
|
||||||
sort-by="nickname ASC"
|
sort-by="nickname ASC"
|
||||||
:use-like="false"
|
option-label="nickname"
|
||||||
|
option-value="id"
|
||||||
emit-value
|
emit-value
|
||||||
auto-load
|
auto-load
|
||||||
>
|
>
|
||||||
|
|
|
@ -85,15 +85,26 @@ function handleLocation(data, location) {
|
||||||
<QCheckbox :label="t('Default')" v-model="data.isDefaultAddress" />
|
<QCheckbox :label="t('Default')" v-model="data.isDefaultAddress" />
|
||||||
|
|
||||||
<VnRow>
|
<VnRow>
|
||||||
<VnInput :label="t('Consignee')" clearable v-model="data.nickname" />
|
<VnInput
|
||||||
|
:label="t('Consignee')"
|
||||||
|
required
|
||||||
|
clearable
|
||||||
|
v-model="data.nickname"
|
||||||
|
/>
|
||||||
|
|
||||||
<VnInput :label="t('Street address')" clearable v-model="data.street" />
|
<VnInput
|
||||||
|
:label="t('Street address')"
|
||||||
|
clearable
|
||||||
|
v-model="data.street"
|
||||||
|
required
|
||||||
|
/>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
|
||||||
<VnLocation
|
<VnLocation
|
||||||
:rules="validate('Worker.postcode')"
|
:rules="validate('Worker.postcode')"
|
||||||
:acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
|
:acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
|
||||||
v-model="data.location"
|
v-model="data.location"
|
||||||
|
:required="true"
|
||||||
@update:model-value="(location) => handleLocation(data, location)"
|
@update:model-value="(location) => handleLocation(data, location)"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ import { onBeforeMount, reactive, ref } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useRoute } from 'vue-router';
|
import { useRoute } from 'vue-router';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
|
import { getClientRisk } from '../composables/getClientRisk';
|
||||||
import { useDialogPluginComponent } from 'quasar';
|
import { useDialogPluginComponent } from 'quasar';
|
||||||
|
|
||||||
import { usePrintService } from 'composables/usePrintService';
|
import { usePrintService } from 'composables/usePrintService';
|
||||||
|
@ -158,9 +158,7 @@ async function getAmountPaid() {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
const { data } = await axios(`ClientRisks`, {
|
const { data } = await getClientRisk(filter);
|
||||||
params: { filter: JSON.stringify(filter) },
|
|
||||||
});
|
|
||||||
initialData.amountPaid = (data?.length && data[0].amount) || undefined;
|
initialData.amountPaid = (data?.length && data[0].amount) || undefined;
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
@ -241,7 +239,7 @@ async function getAmountPaid() {
|
||||||
</QItem>
|
</QItem>
|
||||||
</template>
|
</template>
|
||||||
</VnSelect>
|
</VnSelect>
|
||||||
<VnInput
|
<VnInputNumber
|
||||||
:label="t('Amount')"
|
:label="t('Amount')"
|
||||||
:required="true"
|
:required="true"
|
||||||
@update:model-value="calculateFromAmount($event)"
|
@update:model-value="calculateFromAmount($event)"
|
||||||
|
@ -254,7 +252,7 @@ async function getAmountPaid() {
|
||||||
{{ t('Compensation') }}
|
{{ t('Compensation') }}
|
||||||
</div>
|
</div>
|
||||||
<VnRow>
|
<VnRow>
|
||||||
<VnInput
|
<VnInputNumber
|
||||||
:label="t('Compensation account')"
|
:label="t('Compensation account')"
|
||||||
clearable
|
clearable
|
||||||
v-model="data.compensationAccount"
|
v-model="data.compensationAccount"
|
||||||
|
|
|
@ -63,7 +63,7 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
format: (row, dashIfEmpty) => dashIfEmpty(row.agencyMode?.name),
|
format: (row) => dashIfEmpty(row.agencyMode?.name),
|
||||||
columnClass: 'expand',
|
columnClass: 'expand',
|
||||||
label: t('Agency'),
|
label: t('Agency'),
|
||||||
},
|
},
|
||||||
|
@ -111,7 +111,11 @@ const columns = computed(() => [
|
||||||
{
|
{
|
||||||
title: t('customer.summary.goToLines'),
|
title: t('customer.summary.goToLines'),
|
||||||
icon: 'vn:lines',
|
icon: 'vn:lines',
|
||||||
action: ({ id }) => router.push({ params: { id }, name: 'TicketSale' }),
|
action: ({ id }) =>
|
||||||
|
window.open(
|
||||||
|
router.resolve({ params: { id }, name: 'TicketSale' }).href,
|
||||||
|
'_blank'
|
||||||
|
),
|
||||||
isPrimary: true,
|
isPrimary: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -150,6 +154,8 @@ const setShippedColor = (date) => {
|
||||||
if (difference == 0) return 'warning';
|
if (difference == 0) return 'warning';
|
||||||
if (difference < 0) return 'success';
|
if (difference < 0) return 'success';
|
||||||
};
|
};
|
||||||
|
const rowClick = ({ id }) =>
|
||||||
|
window.open(router.resolve({ params: { id }, name: 'TicketSummary' }).href, '_blank');
|
||||||
|
|
||||||
const getItemPackagingType = (ticketSales) => {
|
const getItemPackagingType = (ticketSales) => {
|
||||||
if (!ticketSales?.length) return '-';
|
if (!ticketSales?.length) return '-';
|
||||||
|
@ -177,13 +183,14 @@ const getItemPackagingType = (ticketSales) => {
|
||||||
:column-search="false"
|
:column-search="false"
|
||||||
url="Tickets"
|
url="Tickets"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
search-url="tickets"
|
|
||||||
:without-header="true"
|
:without-header="true"
|
||||||
auto-load
|
auto-load
|
||||||
|
:row-click="rowClick"
|
||||||
order="shipped DESC, id"
|
order="shipped DESC, id"
|
||||||
:disable-option="{ card: true, table: true }"
|
:disable-option="{ card: true, table: true }"
|
||||||
class="full-width"
|
class="full-width"
|
||||||
:disable-infinite-scroll="true"
|
:disable-infinite-scroll="true"
|
||||||
|
:search-url="false"
|
||||||
>
|
>
|
||||||
<template #column-nickname="{ row }">
|
<template #column-nickname="{ row }">
|
||||||
<span class="link">
|
<span class="link">
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
import axios from 'axios';
|
||||||
|
|
||||||
|
export async function getClientRisk(_filter) {
|
||||||
|
const filter = {
|
||||||
|
..._filter,
|
||||||
|
include: { relation: 'company', scope: { fields: ['code'] } },
|
||||||
|
};
|
||||||
|
|
||||||
|
return await axios(`ClientRisks`, {
|
||||||
|
params: { filter: JSON.stringify(filter) },
|
||||||
|
});
|
||||||
|
}
|
|
@ -3,8 +3,6 @@ import { ref, computed } from 'vue';
|
||||||
import { useRoute } from 'vue-router';
|
import { useRoute } from 'vue-router';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useQuasar } from 'quasar';
|
import { useQuasar } from 'quasar';
|
||||||
import axios from 'axios';
|
|
||||||
import { useArrayData } from 'src/composables/useArrayData';
|
|
||||||
import { downloadFile } from 'src/composables/downloadFile';
|
import { downloadFile } from 'src/composables/downloadFile';
|
||||||
import FormModel from 'components/FormModel.vue';
|
import FormModel from 'components/FormModel.vue';
|
||||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||||
|
@ -12,15 +10,15 @@ import FetchData from 'src/components/FetchData.vue';
|
||||||
import VnRow from 'components/ui/VnRow.vue';
|
import VnRow from 'components/ui/VnRow.vue';
|
||||||
import VnInputDate from 'src/components/common/VnInputDate.vue';
|
import VnInputDate from 'src/components/common/VnInputDate.vue';
|
||||||
import VnInput from 'src/components/common/VnInput.vue';
|
import VnInput from 'src/components/common/VnInput.vue';
|
||||||
|
import VnDms from 'src/components/common/VnDms.vue';
|
||||||
|
import VnConfirm from 'src/components/ui/VnConfirm.vue';
|
||||||
|
import axios from 'axios';
|
||||||
|
|
||||||
const quasar = useQuasar();
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
const dms = ref({});
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
|
const quasar = useQuasar();
|
||||||
const editDownloadDisabled = ref(false);
|
const editDownloadDisabled = ref(false);
|
||||||
const arrayData = useArrayData();
|
|
||||||
const invoiceIn = computed(() => arrayData.store.data);
|
|
||||||
const userConfig = ref(null);
|
const userConfig = ref(null);
|
||||||
const invoiceId = computed(() => +route.params.id);
|
const invoiceId = computed(() => +route.params.id);
|
||||||
|
|
||||||
|
@ -36,98 +34,25 @@ const warehousesRef = ref();
|
||||||
const allowTypesRef = ref();
|
const allowTypesRef = ref();
|
||||||
const allowedContentTypes = ref([]);
|
const allowedContentTypes = ref([]);
|
||||||
const sageWithholdings = ref([]);
|
const sageWithholdings = ref([]);
|
||||||
const inputFileRef = ref();
|
const documentDialogRef = ref({});
|
||||||
const editDmsRef = ref();
|
const invoiceInRef = ref({});
|
||||||
const createDmsRef = ref();
|
|
||||||
|
|
||||||
async function checkFileExists(dmsId) {
|
function deleteFile(dmsFk) {
|
||||||
if (!dmsId) return;
|
quasar
|
||||||
try {
|
.dialog({
|
||||||
await axios.get(`Dms/${dmsId}`, { fields: ['id'] });
|
component: VnConfirm,
|
||||||
editDownloadDisabled.value = false;
|
componentProps: {
|
||||||
} catch (e) {
|
title: t('globals.confirmDeletion'),
|
||||||
editDownloadDisabled.value = true;
|
message: t('globals.confirmDeletionMessage'),
|
||||||
}
|
},
|
||||||
}
|
})
|
||||||
|
.onOk(async () => {
|
||||||
async function setEditDms(dmsId) {
|
await axios.post(`dms/${dmsFk}/removeFile`);
|
||||||
const { data } = await axios.get(`Dms/${dmsId}`);
|
invoiceInRef.value.formData.dmsFk = null;
|
||||||
dms.value = {
|
invoiceInRef.value.formData.dms = undefined;
|
||||||
warehouseId: data.warehouseFk,
|
invoiceInRef.value.hasChanges = true;
|
||||||
companyId: data.companyFk,
|
invoiceInRef.value.save();
|
||||||
dmsTypeId: data.dmsTypeFk,
|
|
||||||
...data,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (!allowedContentTypes.value.length) await allowTypesRef.value.fetch();
|
|
||||||
|
|
||||||
editDmsRef.value.show();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function setCreateDms() {
|
|
||||||
const { data } = await axios.get('DmsTypes/findOne', {
|
|
||||||
where: { code: 'invoiceIn' },
|
|
||||||
});
|
|
||||||
dms.value = {
|
|
||||||
reference: invoiceIn.value.supplierRef,
|
|
||||||
warehouseId: userConfig.value.warehouseFk,
|
|
||||||
companyId: userConfig.value.companyFk,
|
|
||||||
dmsTypeId: data.id,
|
|
||||||
description: invoiceIn.value.supplier.name,
|
|
||||||
hasFile: true,
|
|
||||||
hasFileAttached: true,
|
|
||||||
files: null,
|
|
||||||
};
|
|
||||||
|
|
||||||
createDmsRef.value.show();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function onSubmit() {
|
|
||||||
try {
|
|
||||||
const isEdit = !!dms.value.id;
|
|
||||||
const errors = {
|
|
||||||
companyId: `The company can't be empty`,
|
|
||||||
warehouseId: `The warehouse can't be empty`,
|
|
||||||
dmsTypeId: `The DMS Type can't be empty`,
|
|
||||||
description: `The description can't be empty`,
|
|
||||||
};
|
|
||||||
|
|
||||||
Object.keys(errors).forEach((key) => {
|
|
||||||
if (!dms.value[key]) throw Error(t(errors[key]));
|
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!isEdit && !dms.value.files) throw Error(t(`The files can't be empty`));
|
|
||||||
|
|
||||||
const formData = new FormData();
|
|
||||||
|
|
||||||
if (dms.value.files) {
|
|
||||||
for (let i = 0; i < dms.value.files.length; i++)
|
|
||||||
formData.append(dms.value.files[i].name, dms.value.files[i]);
|
|
||||||
dms.value.hasFileAttached = true;
|
|
||||||
}
|
|
||||||
const url = isEdit ? `dms/${dms.value.id}/updateFile` : 'Dms/uploadFile';
|
|
||||||
const { data } = await axios.post(url, formData, {
|
|
||||||
params: dms.value,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (data.length) invoiceIn.value.dmsFk = data[0].id;
|
|
||||||
|
|
||||||
if (!isEdit) {
|
|
||||||
createDmsRef.value.hide();
|
|
||||||
} else {
|
|
||||||
editDmsRef.value.hide();
|
|
||||||
}
|
|
||||||
|
|
||||||
quasar.notify({
|
|
||||||
message: t('globals.dataSaved'),
|
|
||||||
type: 'positive',
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
quasar.notify({
|
|
||||||
message: t(`${error.message}`),
|
|
||||||
type: 'negative',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
|
@ -181,10 +106,12 @@ async function onSubmit() {
|
||||||
@on-fetch="(data) => (sageWithholdings = data)"
|
@on-fetch="(data) => (sageWithholdings = data)"
|
||||||
/>
|
/>
|
||||||
<FormModel
|
<FormModel
|
||||||
|
ref="invoiceInRef"
|
||||||
model="InvoiceIn"
|
model="InvoiceIn"
|
||||||
:go-to="`/invoice-in/${invoiceId}/vat`"
|
:go-to="`/invoice-in/${invoiceId}/vat`"
|
||||||
auto-load
|
|
||||||
:url-update="`InvoiceIns/${invoiceId}/updateInvoiceIn`"
|
:url-update="`InvoiceIns/${invoiceId}/updateInvoiceIn`"
|
||||||
|
@on-fetch="(data) => (documentDialogRef.supplierName = data.supplier.nickname)"
|
||||||
|
auto-load
|
||||||
>
|
>
|
||||||
<template #form="{ data }">
|
<template #form="{ data }">
|
||||||
<VnRow>
|
<VnRow>
|
||||||
|
@ -242,16 +169,22 @@ async function onSubmit() {
|
||||||
</QItem>
|
</QItem>
|
||||||
</template>
|
</template>
|
||||||
</VnSelect>
|
</VnSelect>
|
||||||
<VnInput
|
|
||||||
:label="t('Document')"
|
<div class="row no-wrap">
|
||||||
v-model="data.dmsFk"
|
<VnInput
|
||||||
clearable
|
:label="t('Document')"
|
||||||
clear-icon="close"
|
v-model="data.dmsFk"
|
||||||
@update:model-value="checkFileExists(data.dmsFk)"
|
clearable
|
||||||
>
|
clear-icon="close"
|
||||||
<template #prepend>
|
class="full-width"
|
||||||
|
:disable="true"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
v-if="data.dmsFk"
|
||||||
|
class="row no-wrap q-pa-xs q-gutter-x-xs"
|
||||||
|
data-cy="dms-buttons"
|
||||||
|
>
|
||||||
<QBtn
|
<QBtn
|
||||||
v-if="data.dmsFk"
|
|
||||||
:class="{
|
:class="{
|
||||||
'no-pointer-events': editDownloadDisabled,
|
'no-pointer-events': editDownloadDisabled,
|
||||||
}"
|
}"
|
||||||
|
@ -262,33 +195,52 @@ async function onSubmit() {
|
||||||
round
|
round
|
||||||
@click="downloadFile(data.dmsFk)"
|
@click="downloadFile(data.dmsFk)"
|
||||||
/>
|
/>
|
||||||
</template>
|
|
||||||
<template #append>
|
|
||||||
<QBtn
|
<QBtn
|
||||||
:class="{
|
:class="{
|
||||||
'no-pointer-events': editDownloadDisabled,
|
'no-pointer-events': editDownloadDisabled,
|
||||||
}"
|
}"
|
||||||
:disable="editDownloadDisabled"
|
:disable="editDownloadDisabled"
|
||||||
v-if="data.dmsFk"
|
|
||||||
icon="edit"
|
icon="edit"
|
||||||
round
|
round
|
||||||
padding="xs"
|
padding="xs"
|
||||||
@click="setEditDms(data.dmsFk)"
|
@click="
|
||||||
|
() => {
|
||||||
|
documentDialogRef.show = true;
|
||||||
|
documentDialogRef.dms = data.dms;
|
||||||
|
}
|
||||||
|
"
|
||||||
>
|
>
|
||||||
<QTooltip>{{ t('Edit document') }}</QTooltip>
|
<QTooltip>{{ t('Edit document') }}</QTooltip>
|
||||||
</QBtn>
|
</QBtn>
|
||||||
<QBtn
|
<QBtn
|
||||||
v-else
|
:class="{
|
||||||
icon="add_circle"
|
'no-pointer-events': editDownloadDisabled,
|
||||||
round
|
}"
|
||||||
shortcut="+"
|
:disable="editDownloadDisabled"
|
||||||
|
icon="delete"
|
||||||
|
:title="t('Delete file')"
|
||||||
padding="xs"
|
padding="xs"
|
||||||
@click="setCreateDms()"
|
round
|
||||||
>
|
@click="deleteFile(data.dmsFk)"
|
||||||
<QTooltip>{{ t('Create document') }}</QTooltip>
|
/>
|
||||||
</QBtn>
|
</div>
|
||||||
</template>
|
<QBtn
|
||||||
</VnInput>
|
v-else
|
||||||
|
icon="add_circle"
|
||||||
|
round
|
||||||
|
shortcut="+"
|
||||||
|
padding="xs"
|
||||||
|
@click="
|
||||||
|
() => {
|
||||||
|
documentDialogRef.show = true;
|
||||||
|
delete documentDialogRef.dms;
|
||||||
|
}
|
||||||
|
"
|
||||||
|
data-cy="dms-create"
|
||||||
|
>
|
||||||
|
<QTooltip>{{ t('Create document') }}</QTooltip>
|
||||||
|
</QBtn>
|
||||||
|
</div>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow>
|
<VnRow>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
|
@ -319,237 +271,28 @@ async function onSubmit() {
|
||||||
</VnRow>
|
</VnRow>
|
||||||
</template>
|
</template>
|
||||||
</FormModel>
|
</FormModel>
|
||||||
<QDialog ref="editDmsRef">
|
<QDialog v-model="documentDialogRef.show">
|
||||||
<QForm @submit="onSubmit()" class="all-pointer-events">
|
<VnDms
|
||||||
<QCard class="q-pa-sm">
|
model="dms"
|
||||||
<QCardSection class="row items-center q-pb-none">
|
default-dms-code="invoiceIn"
|
||||||
<span class="text-primary text-h6">
|
:form-initial-data="documentDialogRef.dms"
|
||||||
<QIcon name="edit" class="q-mr-xs" />
|
:url="
|
||||||
{{ t('Edit document') }}
|
documentDialogRef.dms
|
||||||
</span>
|
? `Dms/${documentDialogRef.dms.id}/updateFile`
|
||||||
<QSpace />
|
: 'Dms/uploadFile'
|
||||||
<QBtn icon="close" flat round dense v-close-popup />
|
"
|
||||||
</QCardSection>
|
:description="documentDialogRef.supplierName"
|
||||||
<QCardSection class="q-py-none">
|
@on-data-saved="
|
||||||
<QItem>
|
(_, { data }) => {
|
||||||
<VnInput
|
let dmsData = data;
|
||||||
class="full-width q-pa-xs"
|
if (Array.isArray(data)) dmsData = data[0];
|
||||||
:label="t('Reference')"
|
invoiceInRef.formData.dmsFk = dmsData.id;
|
||||||
v-model="dms.reference"
|
invoiceInRef.formData.dms = dmsData;
|
||||||
clearable
|
invoiceInRef.hasChanges = true;
|
||||||
clear-icon="close"
|
invoiceInRef.save();
|
||||||
/>
|
}
|
||||||
<VnSelect
|
"
|
||||||
class="full-width q-pa-xs"
|
/>
|
||||||
:label="t('Company')"
|
|
||||||
v-model="dms.companyId"
|
|
||||||
:options="companies"
|
|
||||||
option-value="id"
|
|
||||||
option-label="code"
|
|
||||||
:required="true"
|
|
||||||
/>
|
|
||||||
</QItem>
|
|
||||||
<QItem>
|
|
||||||
<VnSelect
|
|
||||||
class="full-width q-pa-xs"
|
|
||||||
:label="t('Warehouse')"
|
|
||||||
v-model="dms.warehouseId"
|
|
||||||
:options="warehouses"
|
|
||||||
option-value="id"
|
|
||||||
option-label="name"
|
|
||||||
:required="true"
|
|
||||||
/>
|
|
||||||
<VnSelect
|
|
||||||
class="full-width q-pa-xs"
|
|
||||||
:label="t('Type')"
|
|
||||||
v-model="dms.dmsTypeId"
|
|
||||||
:options="dmsTypes"
|
|
||||||
option-value="id"
|
|
||||||
option-label="name"
|
|
||||||
:required="true"
|
|
||||||
/>
|
|
||||||
</QItem>
|
|
||||||
<QItem>
|
|
||||||
<VnInput
|
|
||||||
:label="t('Description')"
|
|
||||||
v-model="dms.description"
|
|
||||||
:required="true"
|
|
||||||
type="textarea"
|
|
||||||
class="full-width q-pa-xs"
|
|
||||||
size="lg"
|
|
||||||
autogrow
|
|
||||||
clearable
|
|
||||||
clear-icon="close"
|
|
||||||
/>
|
|
||||||
</QItem>
|
|
||||||
<QItem>
|
|
||||||
<QFile
|
|
||||||
ref="inputFileRef"
|
|
||||||
class="full-width q-pa-xs"
|
|
||||||
:label="t('File')"
|
|
||||||
v-model="dms.files"
|
|
||||||
multiple
|
|
||||||
:accept="allowedContentTypes.join(',')"
|
|
||||||
clearable
|
|
||||||
clear-icon="close"
|
|
||||||
>
|
|
||||||
<template #append>
|
|
||||||
<QBtn
|
|
||||||
icon="attach_file_add"
|
|
||||||
flat
|
|
||||||
round
|
|
||||||
padding="xs"
|
|
||||||
@click="inputFileRef.pickFiles()"
|
|
||||||
>
|
|
||||||
<QTooltip>
|
|
||||||
{{ t('globals.selectFile') }}
|
|
||||||
</QTooltip>
|
|
||||||
</QBtn>
|
|
||||||
<QBtn icon="info" flat round padding="xs">
|
|
||||||
<QTooltip max-width="30rem">
|
|
||||||
{{
|
|
||||||
`${t(
|
|
||||||
'Allowed content types'
|
|
||||||
)}: ${allowedContentTypes.join(', ')}`
|
|
||||||
}}
|
|
||||||
</QTooltip>
|
|
||||||
</QBtn>
|
|
||||||
</template>
|
|
||||||
</QFile>
|
|
||||||
</QItem>
|
|
||||||
<QItem>
|
|
||||||
<QCheckbox
|
|
||||||
:label="t('Generate identifier for original file')"
|
|
||||||
v-model="dms.hasFile"
|
|
||||||
/>
|
|
||||||
</QItem>
|
|
||||||
</QCardSection>
|
|
||||||
<QCardActions class="justify-end">
|
|
||||||
<QBtn
|
|
||||||
flat
|
|
||||||
:label="t('globals.close')"
|
|
||||||
color="primary"
|
|
||||||
v-close-popup
|
|
||||||
/>
|
|
||||||
<QBtn :label="t('globals.save')" color="primary" @click="onSubmit" />
|
|
||||||
</QCardActions>
|
|
||||||
</QCard>
|
|
||||||
</QForm>
|
|
||||||
</QDialog>
|
|
||||||
<QDialog ref="createDmsRef">
|
|
||||||
<QForm @submit="onSubmit()" class="all-pointer-events">
|
|
||||||
<QCard class="q-pa-sm">
|
|
||||||
<QCardSection class="row items-center q-pb-none">
|
|
||||||
<span class="text-primary text-h6">
|
|
||||||
<QIcon name="edit" class="q-mr-xs" />
|
|
||||||
{{ t('Create document') }}
|
|
||||||
</span>
|
|
||||||
<QSpace />
|
|
||||||
<QBtn icon="close" flat round dense v-close-popup />
|
|
||||||
</QCardSection>
|
|
||||||
<QCardSection class="q-pb-none">
|
|
||||||
<QItem>
|
|
||||||
<VnInput
|
|
||||||
class="full-width q-pa-xs"
|
|
||||||
:label="t('Reference')"
|
|
||||||
v-model="dms.reference"
|
|
||||||
/>
|
|
||||||
<VnSelect
|
|
||||||
class="full-width q-pa-xs"
|
|
||||||
:label="`${t('Company')}*`"
|
|
||||||
v-model="dms.companyId"
|
|
||||||
:options="companies"
|
|
||||||
option-value="id"
|
|
||||||
option-label="code"
|
|
||||||
:required="true"
|
|
||||||
/>
|
|
||||||
</QItem>
|
|
||||||
<QItem>
|
|
||||||
<VnSelect
|
|
||||||
class="full-width q-pa-xs"
|
|
||||||
:label="`${t('Warehouse')}*`"
|
|
||||||
v-model="dms.warehouseId"
|
|
||||||
:options="warehouses"
|
|
||||||
option-value="id"
|
|
||||||
option-label="name"
|
|
||||||
:required="true"
|
|
||||||
/>
|
|
||||||
<VnSelect
|
|
||||||
class="full-width q-pa-xs"
|
|
||||||
:label="`${t('Type')}*`"
|
|
||||||
v-model="dms.dmsTypeId"
|
|
||||||
:options="dmsTypes"
|
|
||||||
option-value="id"
|
|
||||||
option-label="name"
|
|
||||||
:required="true"
|
|
||||||
/>
|
|
||||||
</QItem>
|
|
||||||
<QItem>
|
|
||||||
<VnInput
|
|
||||||
class="full-width q-pa-xs"
|
|
||||||
type="textarea"
|
|
||||||
size="lg"
|
|
||||||
autogrow
|
|
||||||
:label="`${t('Description')}*`"
|
|
||||||
v-model="dms.description"
|
|
||||||
clearable
|
|
||||||
clear-icon="close"
|
|
||||||
:rules="[(val) => val.length || t('Required field')]"
|
|
||||||
/>
|
|
||||||
</QItem>
|
|
||||||
<QItem>
|
|
||||||
<QFile
|
|
||||||
ref="inputFileRef"
|
|
||||||
class="full-width q-pa-xs"
|
|
||||||
:label="t('File')"
|
|
||||||
v-model="dms.files"
|
|
||||||
multiple
|
|
||||||
:accept="allowedContentTypes.join(',')"
|
|
||||||
clearable
|
|
||||||
clear-icon="close"
|
|
||||||
>
|
|
||||||
<template #append>
|
|
||||||
<QBtn
|
|
||||||
icon="attach_file_add"
|
|
||||||
flat
|
|
||||||
round
|
|
||||||
padding="xs"
|
|
||||||
@click="inputFileRef.pickFiles()"
|
|
||||||
>
|
|
||||||
<QTooltip>
|
|
||||||
{{ t('globals.selectFile') }}
|
|
||||||
</QTooltip>
|
|
||||||
</QBtn>
|
|
||||||
<QBtn icon="info" flat round padding="xs">
|
|
||||||
<QTooltip max-width="30rem">
|
|
||||||
{{
|
|
||||||
`${t(
|
|
||||||
'Allowed content types'
|
|
||||||
)}: ${allowedContentTypes.join(', ')}`
|
|
||||||
}}
|
|
||||||
</QTooltip>
|
|
||||||
</QBtn>
|
|
||||||
</template>
|
|
||||||
</QFile>
|
|
||||||
</QItem>
|
|
||||||
<QItem>
|
|
||||||
<QCheckbox
|
|
||||||
:label="t('Generate identifier for original file')"
|
|
||||||
v-model="dms.hasFile"
|
|
||||||
/>
|
|
||||||
</QItem>
|
|
||||||
</QCardSection>
|
|
||||||
<QCardActions align="right">
|
|
||||||
<QBtn
|
|
||||||
flat
|
|
||||||
:label="t('globals.close')"
|
|
||||||
color="primary"
|
|
||||||
v-close-popup
|
|
||||||
/>
|
|
||||||
<QBtn :label="t('globals.save')" color="primary" @click="onSubmit" />
|
|
||||||
</QCardActions>
|
|
||||||
</QCard>
|
|
||||||
</QForm>
|
|
||||||
</QDialog>
|
</QDialog>
|
||||||
</template>
|
</template>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|
|
@ -20,6 +20,23 @@ const filter = {
|
||||||
{ relation: 'invoiceInDueDay' },
|
{ relation: 'invoiceInDueDay' },
|
||||||
{ relation: 'company' },
|
{ relation: 'company' },
|
||||||
{ relation: 'currency' },
|
{ relation: 'currency' },
|
||||||
|
{
|
||||||
|
relation: 'dms',
|
||||||
|
scope: {
|
||||||
|
fields: [
|
||||||
|
'dmsTypeFk',
|
||||||
|
'reference',
|
||||||
|
'hardCopyNumber',
|
||||||
|
'workerFk',
|
||||||
|
'description',
|
||||||
|
'hasFile',
|
||||||
|
'file',
|
||||||
|
'created',
|
||||||
|
'companyFk',
|
||||||
|
'warehouseFk',
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ const { t } = useI18n();
|
||||||
const invoiceOutGlobalStore = useInvoiceOutGlobalStore();
|
const invoiceOutGlobalStore = useInvoiceOutGlobalStore();
|
||||||
|
|
||||||
// invoiceOutGlobalStore state and getters
|
// invoiceOutGlobalStore state and getters
|
||||||
const { initialDataLoading, formInitialData, invoicing, status } =
|
const { initialDataLoading, formInitialData, status } =
|
||||||
storeToRefs(invoiceOutGlobalStore);
|
storeToRefs(invoiceOutGlobalStore);
|
||||||
|
|
||||||
// invoiceOutGlobalStore actions
|
// invoiceOutGlobalStore actions
|
||||||
|
@ -151,9 +151,8 @@ onMounted(async () => {
|
||||||
rounded
|
rounded
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<QBtn
|
<QBtn
|
||||||
v-if="!invoicing"
|
v-if="!getStatus || getStatus === 'stopping'"
|
||||||
:label="t('invoiceOut')"
|
:label="t('invoiceOut')"
|
||||||
type="submit"
|
type="submit"
|
||||||
color="primary"
|
color="primary"
|
||||||
|
@ -163,7 +162,7 @@ onMounted(async () => {
|
||||||
dense
|
dense
|
||||||
/>
|
/>
|
||||||
<QBtn
|
<QBtn
|
||||||
v-if="invoicing"
|
v-else
|
||||||
:label="t('stop')"
|
:label="t('stop')"
|
||||||
color="primary"
|
color="primary"
|
||||||
class="q-mt-md full-width"
|
class="q-mt-md full-width"
|
||||||
|
|
|
@ -109,7 +109,11 @@ const insertTag = (rows) => {
|
||||||
>
|
>
|
||||||
<template #body="{ rows, validate }">
|
<template #body="{ rows, validate }">
|
||||||
<QCard class="q-px-lg q-pt-md q-pb-sm">
|
<QCard class="q-px-lg q-pt-md q-pb-sm">
|
||||||
<VnRow v-for="(row, index) in rows" :key="index">
|
<VnRow
|
||||||
|
v-for="(row, index) in rows"
|
||||||
|
:key="index"
|
||||||
|
class="items-center"
|
||||||
|
>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('itemTags.tag')"
|
:label="t('itemTags.tag')"
|
||||||
:options="tagOptions"
|
:options="tagOptions"
|
||||||
|
@ -153,13 +157,14 @@ const insertTag = (rows) => {
|
||||||
:required="true"
|
:required="true"
|
||||||
:rules="validate('itemTag.priority')"
|
:rules="validate('itemTag.priority')"
|
||||||
/>
|
/>
|
||||||
<div class="row justify-center items-center" style="flex: 0">
|
<div class="row justify-center" style="flex: 0">
|
||||||
<QIcon
|
<QIcon
|
||||||
@click="itemTagsRef.remove([row])"
|
@click="itemTagsRef.remove([row])"
|
||||||
class="fill-icon-on-hover"
|
class="fill-icon-on-hover"
|
||||||
color="primary"
|
color="primary"
|
||||||
name="delete"
|
name="delete"
|
||||||
size="sm"
|
size="sm"
|
||||||
|
dense
|
||||||
>
|
>
|
||||||
<QTooltip>
|
<QTooltip>
|
||||||
{{ t('itemTags.removeTag') }}
|
{{ t('itemTags.removeTag') }}
|
||||||
|
@ -167,22 +172,20 @@ const insertTag = (rows) => {
|
||||||
</QIcon>
|
</QIcon>
|
||||||
</div>
|
</div>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="justify-center items-center">
|
|
||||||
<QBtn
|
|
||||||
@click="insertTag(rows)"
|
|
||||||
class="cursor-pointer"
|
|
||||||
color="primary"
|
|
||||||
flat
|
|
||||||
icon="add"
|
|
||||||
shortcut="+"
|
|
||||||
style="flex: 0"
|
|
||||||
>
|
|
||||||
<QTooltip>
|
|
||||||
{{ t('itemTags.addTag') }}
|
|
||||||
</QTooltip>
|
|
||||||
</QBtn>
|
|
||||||
</VnRow>
|
|
||||||
</QCard>
|
</QCard>
|
||||||
|
<QPageSticky position="bottom-right" :offset="[25, 25]">
|
||||||
|
<QBtn
|
||||||
|
@click="insertTag(rows)"
|
||||||
|
color="primary"
|
||||||
|
icon="add"
|
||||||
|
shortcut="+"
|
||||||
|
fab
|
||||||
|
>
|
||||||
|
<QTooltip>
|
||||||
|
{{ t('itemTags.addTag') }}
|
||||||
|
</QTooltip>
|
||||||
|
</QBtn>
|
||||||
|
</QPageSticky>
|
||||||
</template>
|
</template>
|
||||||
</CrudModel>
|
</CrudModel>
|
||||||
</QPage>
|
</QPage>
|
||||||
|
|
|
@ -12,6 +12,8 @@ import ItemSummary from '../Item/Card/ItemSummary.vue';
|
||||||
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
||||||
import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue';
|
import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue';
|
||||||
import { cloneItem } from 'src/pages/Item/composables/cloneItem';
|
import { cloneItem } from 'src/pages/Item/composables/cloneItem';
|
||||||
|
import RightMenu from 'src/components/common/RightMenu.vue';
|
||||||
|
import ItemListFilter from './ItemListFilter.vue';
|
||||||
|
|
||||||
const entityId = computed(() => route.params.id);
|
const entityId = computed(() => route.params.id);
|
||||||
const { openCloneDialog } = cloneItem();
|
const { openCloneDialog } = cloneItem();
|
||||||
|
@ -311,6 +313,11 @@ const columns = computed(() => [
|
||||||
:label="t('item.searchbar.label')"
|
:label="t('item.searchbar.label')"
|
||||||
:info="t('You can search by id')"
|
:info="t('You can search by id')"
|
||||||
/>
|
/>
|
||||||
|
<RightMenu>
|
||||||
|
<template #right-panel>
|
||||||
|
<ItemListFilter data-key="ItemList" />
|
||||||
|
</template>
|
||||||
|
</RightMenu>
|
||||||
<VnTable
|
<VnTable
|
||||||
ref="tableRef"
|
ref="tableRef"
|
||||||
data-key="ItemList"
|
data-key="ItemList"
|
||||||
|
@ -329,6 +336,7 @@ const columns = computed(() => [
|
||||||
auto-load
|
auto-load
|
||||||
redirect="Item"
|
redirect="Item"
|
||||||
:is-editable="false"
|
:is-editable="false"
|
||||||
|
:right-search="false"
|
||||||
:filer="itemFilter"
|
:filer="itemFilter"
|
||||||
>
|
>
|
||||||
<template #column-id="{ row }">
|
<template #column-id="{ row }">
|
||||||
|
|
|
@ -3,11 +3,12 @@ import { ref, computed } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useRoute } from 'vue-router';
|
import { useRoute } from 'vue-router';
|
||||||
import VnTable from 'components/VnTable/VnTable.vue';
|
import VnTable from 'components/VnTable/VnTable.vue';
|
||||||
|
import FetchData from 'src/components/FetchData.vue';
|
||||||
const tableRef = ref();
|
const tableRef = ref();
|
||||||
|
const payrollComponents = ref([]);
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const entityId = computed(() => route.params.id);
|
const entityId = computed(() => route.params.id);
|
||||||
|
|
||||||
const columns = computed(() => [
|
const columns = computed(() => [
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
|
@ -25,8 +26,9 @@ const columns = computed(() => [
|
||||||
create: true,
|
create: true,
|
||||||
component: 'select',
|
component: 'select',
|
||||||
attrs: {
|
attrs: {
|
||||||
url: 'payrollComponents',
|
options: payrollComponents,
|
||||||
fields: ['id', 'name'],
|
optionLabel: 'name',
|
||||||
|
optionValue: 'id',
|
||||||
},
|
},
|
||||||
cardVisible: true,
|
cardVisible: true,
|
||||||
},
|
},
|
||||||
|
@ -73,6 +75,16 @@ const columns = computed(() => [
|
||||||
]);
|
]);
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
|
<FetchData
|
||||||
|
url="PayrollComponents"
|
||||||
|
:filter="{
|
||||||
|
fields: ['id', 'name'],
|
||||||
|
where: { name: { neq: '' } },
|
||||||
|
order: 'name ASC',
|
||||||
|
}"
|
||||||
|
@on-fetch="(data) => (payrollComponents = data)"
|
||||||
|
auto-load
|
||||||
|
/>
|
||||||
<VnTable
|
<VnTable
|
||||||
ref="tableRef"
|
ref="tableRef"
|
||||||
data-key="WorkerBalance"
|
data-key="WorkerBalance"
|
||||||
|
@ -94,6 +106,7 @@ const columns = computed(() => [
|
||||||
:is-editable="true"
|
:is-editable="true"
|
||||||
:use-model="true"
|
:use-model="true"
|
||||||
:default-remove="false"
|
:default-remove="false"
|
||||||
|
search-url="balance"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
<i18n>
|
<i18n>
|
||||||
|
|
|
@ -134,6 +134,7 @@ const columns = computed(() => [
|
||||||
:is-editable="true"
|
:is-editable="true"
|
||||||
:use-model="true"
|
:use-model="true"
|
||||||
:default-remove="false"
|
:default-remove="false"
|
||||||
|
search-url="formation"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|
|
@ -100,5 +100,6 @@ const columns = [
|
||||||
:is-editable="true"
|
:is-editable="true"
|
||||||
:use-model="true"
|
:use-model="true"
|
||||||
:default-remove="false"
|
:default-remove="false"
|
||||||
|
search-url="medical"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -71,6 +71,7 @@ function setNotifications(data) {
|
||||||
:default-remove="false"
|
:default-remove="false"
|
||||||
:default-save="false"
|
:default-save="false"
|
||||||
@on-fetch="setNotifications"
|
@on-fetch="setNotifications"
|
||||||
|
search-url="notifications"
|
||||||
>
|
>
|
||||||
<template #body>
|
<template #body>
|
||||||
<div
|
<div
|
||||||
|
|
|
@ -63,6 +63,7 @@ function reloadData() {
|
||||||
url="DeviceProductionUsers"
|
url="DeviceProductionUsers"
|
||||||
:filter="{ where: { userFk: routeId } }"
|
:filter="{ where: { userFk: routeId } }"
|
||||||
order="id"
|
order="id"
|
||||||
|
search-url="pda"
|
||||||
auto-load
|
auto-load
|
||||||
>
|
>
|
||||||
<template #body="{ rows }">
|
<template #body="{ rows }">
|
||||||
|
|
|
@ -93,7 +93,7 @@ export const useInvoiceOutGlobalStore = defineStore({
|
||||||
|
|
||||||
async makeInvoice(formData, clientsToInvoice) {
|
async makeInvoice(formData, clientsToInvoice) {
|
||||||
this.invoicing = true;
|
this.invoicing = true;
|
||||||
this.status = 'packageInvoicing';
|
const promises = [];
|
||||||
try {
|
try {
|
||||||
this.printer = formData.printer;
|
this.printer = formData.printer;
|
||||||
const params = {
|
const params = {
|
||||||
|
@ -118,10 +118,11 @@ export const useInvoiceOutGlobalStore = defineStore({
|
||||||
);
|
);
|
||||||
throw new Error("There aren't addresses to invoice");
|
throw new Error("There aren't addresses to invoice");
|
||||||
}
|
}
|
||||||
|
this.status = 'invoicing';
|
||||||
for (const address of this.addresses) {
|
for (let index = 0; index < this.parallelism; index++) {
|
||||||
await this.invoiceClient(address, formData);
|
promises.push(this.invoiceClient(formData, index));
|
||||||
}
|
}
|
||||||
|
await Promise.all(promises);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
this.handleError(err);
|
this.handleError(err);
|
||||||
}
|
}
|
||||||
|
@ -171,17 +172,14 @@ export const useInvoiceOutGlobalStore = defineStore({
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
async invoiceClient(address, formData) {
|
async invoiceClient(formData, index) {
|
||||||
|
const address = this.addresses[index];
|
||||||
|
if (!address || !this.status || this.status == 'stopping') {
|
||||||
|
this.status = 'stopping';
|
||||||
|
this.invoicing = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
if (this.nRequests === this.parallelism || this.isInvoicing) return;
|
|
||||||
|
|
||||||
if (this.status === 'stopping') {
|
|
||||||
if (this.nRequests) return;
|
|
||||||
this.invoicing = false;
|
|
||||||
this.status = 'done';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const params = {
|
const params = {
|
||||||
clientId: address.clientId,
|
clientId: address.clientId,
|
||||||
addressId: address.id,
|
addressId: address.id,
|
||||||
|
@ -191,13 +189,11 @@ export const useInvoiceOutGlobalStore = defineStore({
|
||||||
serialType: formData.serialType,
|
serialType: formData.serialType,
|
||||||
};
|
};
|
||||||
|
|
||||||
this.status = 'invoicing';
|
|
||||||
this.invoicing = true;
|
this.invoicing = true;
|
||||||
|
|
||||||
const { data } = await axios.post('InvoiceOuts/invoiceClient', params);
|
const { data } = await axios.post('InvoiceOuts/invoiceClient', params);
|
||||||
|
|
||||||
if (data) await this.makePdfAndNotify(data, address);
|
if (data) await this.makePdfAndNotify(data, address);
|
||||||
this.addressIndex++;
|
|
||||||
this.isInvoicing = false;
|
this.isInvoicing = false;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (err?.response?.status >= 400 && err?.response?.status < 500) {
|
if (err?.response?.status >= 400 && err?.response?.status < 500) {
|
||||||
|
@ -205,13 +201,16 @@ export const useInvoiceOutGlobalStore = defineStore({
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
this.invoicing = false;
|
this.invoicing = false;
|
||||||
this.status = 'done';
|
|
||||||
notify(
|
notify(
|
||||||
'invoiceOut.globalInvoices.errors.criticalInvoiceError',
|
'invoiceOut.globalInvoices.errors.criticalInvoiceError',
|
||||||
'negative'
|
'negative'
|
||||||
);
|
);
|
||||||
throw new Error('Critical invoicing error, process stopped');
|
throw new Error('Critical invoicing error, process stopped');
|
||||||
}
|
}
|
||||||
|
} finally {
|
||||||
|
this.addressIndex++;
|
||||||
|
if (this.status != 'stopping')
|
||||||
|
await this.invoiceClient(formData, this.addressIndex);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -234,7 +233,6 @@ export const useInvoiceOutGlobalStore = defineStore({
|
||||||
|
|
||||||
handleError(err) {
|
handleError(err) {
|
||||||
this.invoicing = false;
|
this.invoicing = false;
|
||||||
this.status = null;
|
|
||||||
throw err;
|
throw err;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -279,7 +277,7 @@ export const useInvoiceOutGlobalStore = defineStore({
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
let porcentaje = (state.addressIndex / this.getNAddresses) * 100;
|
let porcentaje = (state.addressIndex / this.getNAddresses) * 100;
|
||||||
return porcentaje;
|
return porcentaje?.toFixed(2);
|
||||||
},
|
},
|
||||||
getAddressNumber(state) {
|
getAddressNumber(state) {
|
||||||
return state.addressIndex;
|
return state.addressIndex;
|
||||||
|
|
|
@ -28,7 +28,7 @@ describe('Client list', () => {
|
||||||
|
|
||||||
cy.get('.q-mt-lg > .q-btn--standard').click();
|
cy.get('.q-mt-lg > .q-btn--standard').click();
|
||||||
|
|
||||||
cy.checkNotification('Data created');
|
cy.checkNotification('created');
|
||||||
cy.url().should('include', '/summary');
|
cy.url().should('include', '/summary');
|
||||||
});
|
});
|
||||||
it('Client list search client', () => {
|
it('Client list search client', () => {
|
||||||
|
@ -43,4 +43,21 @@ describe('Client list', () => {
|
||||||
cy.url().should('include', `/customer/${id}/summary`);
|
cy.url().should('include', `/customer/${id}/summary`);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('Client founded create ticket', () => {
|
||||||
|
const search = 'Jessica Jones';
|
||||||
|
cy.searchByLabel('Name', search);
|
||||||
|
cy.clickButtonsDescriptor(2);
|
||||||
|
cy.waitForElement('#formModel');
|
||||||
|
cy.waitForElement('.q-form');
|
||||||
|
cy.checkValueForm(1, search);
|
||||||
|
});
|
||||||
|
it('Client founded create order', () => {
|
||||||
|
const search = 'Jessica Jones';
|
||||||
|
cy.searchByLabel('Name', search);
|
||||||
|
cy.clickButtonsDescriptor(4);
|
||||||
|
cy.waitForElement('#formModel');
|
||||||
|
cy.waitForElement('.q-form');
|
||||||
|
cy.checkValueForm(2, search);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -2,9 +2,8 @@
|
||||||
describe('InvoiceInBasicData', () => {
|
describe('InvoiceInBasicData', () => {
|
||||||
const formInputs = '.q-form > .q-card input';
|
const formInputs = '.q-form > .q-card input';
|
||||||
const firstFormSelect = '.q-card > .vn-row:nth-child(1) > .q-select';
|
const firstFormSelect = '.q-card > .vn-row:nth-child(1) > .q-select';
|
||||||
const documentBtns = '.q-form .q-field button';
|
const documentBtns = '[data-cy="dms-buttons"] button';
|
||||||
const dialogInputs = '.q-dialog input';
|
const dialogInputs = '.q-dialog input';
|
||||||
const dialogActionBtns = '.q-card__actions button';
|
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
cy.login('developer');
|
cy.login('developer');
|
||||||
|
@ -21,27 +20,35 @@ describe('InvoiceInBasicData', () => {
|
||||||
cy.get(formInputs).eq(1).invoke('val').should('eq', '4739');
|
cy.get(formInputs).eq(1).invoke('val').should('eq', '4739');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should edit the dms data', () => {
|
it('should edit, remove and create the dms data', () => {
|
||||||
const firtsInput = 'Ticket:65';
|
const firtsInput = 'Ticket:65';
|
||||||
const secondInput = "I don't know what posting here!";
|
const secondInput = "I don't know what posting here!";
|
||||||
|
|
||||||
|
//edit
|
||||||
cy.get(documentBtns).eq(1).click();
|
cy.get(documentBtns).eq(1).click();
|
||||||
cy.get(dialogInputs).eq(0).type(`{selectall}${firtsInput}`);
|
cy.get(dialogInputs).eq(0).type(`{selectall}${firtsInput}`);
|
||||||
cy.get('textarea').type(`{selectall}${secondInput}`);
|
cy.get('textarea').type(`{selectall}${secondInput}`);
|
||||||
cy.get(dialogActionBtns).eq(1).click();
|
cy.get('[data-cy="FormModelPopup_save"]').click();
|
||||||
|
|
||||||
cy.get(documentBtns).eq(1).click();
|
cy.get(documentBtns).eq(1).click();
|
||||||
cy.get(dialogInputs).eq(0).invoke('val').should('eq', firtsInput);
|
cy.get(dialogInputs).eq(0).invoke('val').should('eq', firtsInput);
|
||||||
cy.get('textarea').invoke('val').should('eq', secondInput);
|
cy.get('textarea').invoke('val').should('eq', secondInput);
|
||||||
});
|
cy.get('[data-cy="FormModelPopup_save"]').click();
|
||||||
|
cy.checkNotification('Data saved');
|
||||||
|
|
||||||
it('should throw an error creating a new dms if a file is not attached', () => {
|
//remove
|
||||||
cy.get(formInputs).eq(7).type('{selectall}{backspace}');
|
cy.get(documentBtns).eq(2).click();
|
||||||
cy.get(documentBtns).eq(0).click();
|
cy.get('[data-cy="VnConfirm_confirm"]').click();
|
||||||
cy.get(dialogActionBtns).eq(1).click();
|
cy.checkNotification('Data saved');
|
||||||
cy.get('.q-notification__message').should(
|
|
||||||
'have.text',
|
//create
|
||||||
"The files can't be empty"
|
cy.get('[data-cy="dms-create"]').eq(0).click();
|
||||||
|
cy.get('[data-cy="VnDms_inputFile"').selectFile(
|
||||||
|
'test/cypress/fixtures/image.jpg',
|
||||||
|
{
|
||||||
|
force: true,
|
||||||
|
}
|
||||||
);
|
);
|
||||||
|
cy.get('[data-cy="FormModelPopup_save"]').click();
|
||||||
|
cy.checkNotification('Data saved');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -14,6 +14,8 @@ describe('Ticket descriptor', () => {
|
||||||
|
|
||||||
it('should clone the ticket without warehouse', () => {
|
it('should clone the ticket without warehouse', () => {
|
||||||
cy.visit('/#/ticket/1/summary');
|
cy.visit('/#/ticket/1/summary');
|
||||||
|
cy.intercept('GET', /\/api\/Tickets\/\d/).as('ticket');
|
||||||
|
cy.wait('@ticket');
|
||||||
cy.openActionsDescriptor();
|
cy.openActionsDescriptor();
|
||||||
cy.contains(listItem, toCloneOpt).click();
|
cy.contains(listItem, toCloneOpt).click();
|
||||||
cy.clickConfirm();
|
cy.clickConfirm();
|
||||||
|
@ -28,6 +30,8 @@ describe('Ticket descriptor', () => {
|
||||||
|
|
||||||
it('should set the weight of the ticket', () => {
|
it('should set the weight of the ticket', () => {
|
||||||
cy.visit('/#/ticket/10/summary');
|
cy.visit('/#/ticket/10/summary');
|
||||||
|
cy.intercept('GET', /\/api\/Tickets\/\d/).as('ticket');
|
||||||
|
cy.wait('@ticket');
|
||||||
cy.openActionsDescriptor();
|
cy.openActionsDescriptor();
|
||||||
cy.contains(listItem, setWeightOpt).click();
|
cy.contains(listItem, setWeightOpt).click();
|
||||||
cy.intercept('POST', /\/api\/Tickets\/\d+\/setWeight/).as('weight');
|
cy.intercept('POST', /\/api\/Tickets\/\d+\/setWeight/).as('weight');
|
||||||
|
|
|
@ -267,7 +267,13 @@ Cypress.Commands.add('openActionDescriptor', (opt) => {
|
||||||
});
|
});
|
||||||
|
|
||||||
Cypress.Commands.add('openActionsDescriptor', () => {
|
Cypress.Commands.add('openActionsDescriptor', () => {
|
||||||
cy.get('.header > :nth-child(3) > .q-btn__content > .q-icon').click();
|
cy.get('[data-cy="descriptor-more-opts"]').click();
|
||||||
|
});
|
||||||
|
|
||||||
|
Cypress.Commands.add('clickButtonsDescriptor', (id) => {
|
||||||
|
cy.get(`.actions > .q-card__actions> .q-btn:nth-child(${id})`)
|
||||||
|
.invoke('removeAttr', 'target')
|
||||||
|
.click();
|
||||||
});
|
});
|
||||||
|
|
||||||
Cypress.Commands.add('openUserPanel', () => {
|
Cypress.Commands.add('openUserPanel', () => {
|
||||||
|
@ -290,6 +296,18 @@ Cypress.Commands.add('checkNotification', (text) => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Cypress.Commands.add('checkValueForm', (id, search) => {
|
||||||
|
cy.get(
|
||||||
|
`.grid-create > :nth-child(${id}) > .q-field__inner>.q-field__control> .q-field__control-container>.q-field__native >.q-field__input`
|
||||||
|
).should('have.value', search);
|
||||||
|
});
|
||||||
|
|
||||||
|
Cypress.Commands.add('checkValueSelectForm', (id, search) => {
|
||||||
|
cy.get(
|
||||||
|
`.grid-create > :nth-child(${id}) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container>.q-field__native>.q-field__input`
|
||||||
|
).should('have.value', search);
|
||||||
|
});
|
||||||
|
|
||||||
Cypress.Commands.add('searchByLabel', (label, value) => {
|
Cypress.Commands.add('searchByLabel', (label, value) => {
|
||||||
cy.get(`[label="${label}"] > .q-field > .q-field__inner`).type(`${value}{enter}`);
|
cy.get(`[label="${label}"] > .q-field > .q-field__inner`).type(`${value}{enter}`);
|
||||||
});
|
});
|
||||||
|
|
|
@ -0,0 +1,47 @@
|
||||||
|
import { describe, expect, it, beforeAll, beforeEach } from 'vitest';
|
||||||
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
|
import VnTable from 'src/components/VnTable/VnTable.vue';
|
||||||
|
|
||||||
|
describe('VnTable', () => {
|
||||||
|
let wrapper;
|
||||||
|
let vm;
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
wrapper = createWrapper(VnTable, {
|
||||||
|
propsData: {
|
||||||
|
columns: [],
|
||||||
|
},
|
||||||
|
});
|
||||||
|
vm = wrapper.vm;
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(() => (vm.selected = []));
|
||||||
|
|
||||||
|
describe('handleSelection()', () => {
|
||||||
|
const rows = [{ $index: 0 }, { $index: 1 }, { $index: 2 }];
|
||||||
|
const selectedRows = [{ $index: 1 }];
|
||||||
|
it('should add rows to selected when shift key is pressed and rows are added except last one', () => {
|
||||||
|
vm.handleSelection(
|
||||||
|
{ evt: { shiftKey: true }, added: true, rows: selectedRows },
|
||||||
|
rows
|
||||||
|
);
|
||||||
|
expect(vm.selected).toEqual([{ $index: 0 }]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should not add rows to selected when shift key is not pressed', () => {
|
||||||
|
vm.handleSelection(
|
||||||
|
{ evt: { shiftKey: false }, added: true, rows: selectedRows },
|
||||||
|
rows
|
||||||
|
);
|
||||||
|
expect(vm.selected).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should not add rows to selected when rows are not added', () => {
|
||||||
|
vm.handleSelection(
|
||||||
|
{ evt: { shiftKey: true }, added: false, rows: selectedRows },
|
||||||
|
rows
|
||||||
|
);
|
||||||
|
expect(vm.selected).toEqual([]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
Loading…
Reference in New Issue