Compare commits
2 Commits
Author | SHA1 | Date |
---|---|---|
|
9b6891ba0d | |
|
e3e16ebc3b |
|
@ -68,6 +68,7 @@ const filter = {
|
|||
},
|
||||
},
|
||||
],
|
||||
where: { and: [{ originFk: route.params.id }] },
|
||||
};
|
||||
|
||||
const paginate = ref();
|
||||
|
@ -266,6 +267,13 @@ onMounted(() => {
|
|||
onUnmounted(() => {
|
||||
stateStore.rightDrawer = false;
|
||||
});
|
||||
|
||||
watch(
|
||||
() => router.currentRoute.value.params.id,
|
||||
() => {
|
||||
applyFilter();
|
||||
},
|
||||
);
|
||||
</script>
|
||||
<template>
|
||||
<VnPaginate
|
||||
|
@ -273,7 +281,6 @@ onUnmounted(() => {
|
|||
:data-key
|
||||
:url="dataKey + 's'"
|
||||
:user-filter="filter"
|
||||
:filter="{ where: { and: [{ originFk: route.params.id }] } }"
|
||||
:skeleton="false"
|
||||
auto-load
|
||||
@on-fetch="setLogTree"
|
||||
|
|
|
@ -39,7 +39,7 @@ const checkboxOptions = ref([
|
|||
{ name: 'select', label: 'Accesses', selected: false },
|
||||
]);
|
||||
const columns = computed(() => [
|
||||
{ name: 'changedModelValue', orderBy: 'id' },
|
||||
{ name: 'changedModelValue' },
|
||||
{ name: 'changedModel' },
|
||||
{ name: 'userType', orderBy: false },
|
||||
{ name: 'userFk' },
|
||||
|
|
|
@ -6,7 +6,6 @@ import { computed } from 'vue';
|
|||
|
||||
const $props = defineProps({
|
||||
label: { type: String, default: null },
|
||||
tooltip: { type: String, default: null },
|
||||
value: {
|
||||
type: [String, Boolean, Number],
|
||||
default: null,
|
||||
|
@ -41,10 +40,7 @@ const val = computed(() => $props.value);
|
|||
<template v-else>
|
||||
<div v-if="label || $slots.label" class="label">
|
||||
<slot name="label">
|
||||
<QTooltip v-if="tooltip">{{ tooltip }}</QTooltip>
|
||||
<span style="color: var(--vn-label-color)">
|
||||
{{ label }}
|
||||
</span>
|
||||
<span style="color: var(--vn-label-color)">{{ label }}</span>
|
||||
</slot>
|
||||
</div>
|
||||
<div class="value" v-if="value || $slots.value">
|
||||
|
|
|
@ -131,7 +131,6 @@ const columns = computed(() => [
|
|||
name: 'isConciliate',
|
||||
label: t('Conciliated'),
|
||||
cardVisible: true,
|
||||
component: 'checkbox',
|
||||
},
|
||||
{
|
||||
align: 'left',
|
||||
|
|
|
@ -208,8 +208,7 @@ const sumRisk = ({ clientRisks }) => {
|
|||
:text="t('customer.summary.consignee')"
|
||||
/>
|
||||
<VnLv
|
||||
:tooltip="t('customer.summary.addressName')"
|
||||
:label="t('customer.summary.addressNameAbbr')"
|
||||
:label="t('customer.summary.addressName')"
|
||||
:value="entity.defaultAddress.nickname"
|
||||
/>
|
||||
<VnLv
|
||||
|
@ -253,8 +252,7 @@ const sumRisk = ({ clientRisks }) => {
|
|||
/>
|
||||
<VnLv
|
||||
v-if="entity.claimsRatio"
|
||||
:tooltip="t('customer.summary.priceIncreasingRate')"
|
||||
:label="t('customer.summary.priceIncreasingRateAbbr')"
|
||||
:label="t('customer.summary.priceIncreasingRate')"
|
||||
:value="toPercentage(priceIncreasingRate)"
|
||||
/>
|
||||
<VnLv
|
||||
|
@ -263,8 +261,7 @@ const sumRisk = ({ clientRisks }) => {
|
|||
/>
|
||||
<VnLv
|
||||
v-if="entity.claimsRatio"
|
||||
:label="t('customer.summary.claimRateAbbr')"
|
||||
:tooltip="t('customer.summary.claimRate')"
|
||||
:label="t('customer.summary.claimRate')"
|
||||
:value="toPercentage(claimRate)"
|
||||
/>
|
||||
</QCard>
|
||||
|
@ -321,9 +318,8 @@ const sumRisk = ({ clientRisks }) => {
|
|||
/>
|
||||
|
||||
<VnLv
|
||||
:label="t('customer.summary.recommendCreditAbbr')"
|
||||
:tooltip="t('customer.summary.recommendCredit')"
|
||||
:value="toCurrency(entity.recommendedCredit)"
|
||||
:label="t('customer.summary.recommendCredit')"
|
||||
:value="entity.recommendedCredit"
|
||||
/>
|
||||
</QCard>
|
||||
<QCard class="vn-max">
|
||||
|
|
|
@ -111,11 +111,14 @@ const columns = computed(() => [
|
|||
component: 'number',
|
||||
},
|
||||
columnField: {
|
||||
component: markRaw(VnLinkPhone),
|
||||
attrs: ({ model }) => {
|
||||
return {
|
||||
'phone-number': model,
|
||||
};
|
||||
component: null,
|
||||
after: {
|
||||
component: markRaw(VnLinkPhone),
|
||||
attrs: ({ model }) => {
|
||||
return {
|
||||
'phone-number': model,
|
||||
};
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
|
@ -42,17 +42,14 @@ customer:
|
|||
hasCoreVnl: Has core VNL
|
||||
hasB2BVnl: Has B2B VNL
|
||||
addressName: Address name
|
||||
addressNameAbbr: A. Name
|
||||
addressCity: City
|
||||
username: Username
|
||||
webAccess: Web access
|
||||
totalGreuge: Total greuge
|
||||
mana: Mana
|
||||
priceIncreasingRate: Price increasing rate
|
||||
priceIncreasingRateAbbr: Price inc. rate
|
||||
averageInvoiced: Average invoiced
|
||||
claimRate: Claming rate
|
||||
claimRateAbbr: Claim. rate
|
||||
payMethodFk: Billing data
|
||||
risk: Risk
|
||||
maximumRisk: Solunion's maximum risk
|
||||
|
@ -71,7 +68,6 @@ customer:
|
|||
descriptorInfo: Invoices minus payments plus orders not yet
|
||||
rating: Rating
|
||||
recommendCredit: Recommended credit
|
||||
recommendCreditAbbr: Rec. credit
|
||||
goToLines: Go to lines
|
||||
basicData:
|
||||
socialName: Fiscal name
|
||||
|
|
|
@ -42,17 +42,14 @@ customer:
|
|||
hasCoreVnl: Recibido core VNL
|
||||
hasB2BVnl: Recibido B2B VNL
|
||||
addressName: Nombre de la dirección
|
||||
addressNameAbbr: N. Dirección
|
||||
addressCity: Ciudad
|
||||
username: Usuario
|
||||
webAccess: Acceso web
|
||||
totalGreuge: Greuge total
|
||||
mana: Maná
|
||||
priceIncreasingRate: Ratio de incremento de precio
|
||||
priceIncreasingRateAbbr: R. Inc. Precio
|
||||
averageInvoiced: Facturación media
|
||||
claimRate: Ratio de reclamaciones
|
||||
claimRateAbbr: R. Reclamaciones
|
||||
maximumRisk: Riesgo máximo asumido por Solunion
|
||||
payMethodFk: Forma de pago
|
||||
risk: Riesgo
|
||||
|
@ -71,7 +68,6 @@ customer:
|
|||
descriptorInfo: Facturas menos recibos mas pedidos sin facturar
|
||||
rating: Clasificación
|
||||
recommendCredit: Crédito recomendado
|
||||
recommendCreditAbbr: Cr. Recomendado
|
||||
goToLines: Ir a líneas
|
||||
basicData:
|
||||
socialName: Nombre fiscal
|
||||
|
|
|
@ -38,9 +38,7 @@ function handleDelete(row) {
|
|||
ticketNotesCrudRef.value.remove([row]);
|
||||
}
|
||||
|
||||
async function handleSave(e) {
|
||||
if (e.shiftKey && e.key === 'Enter') return;
|
||||
e.preventDefault();
|
||||
async function handleSave() {
|
||||
if (!isSaving.value) {
|
||||
isSaving.value = true;
|
||||
await ticketNotesCrudRef.value?.saveChanges();
|
||||
|
@ -72,7 +70,7 @@ async function handleSave(e) {
|
|||
<div
|
||||
v-for="(row, index) in rows"
|
||||
:key="index"
|
||||
class="q-mb-md row q-gutter-x-md"
|
||||
class="q-mb-md row items-center q-gutter-x-md"
|
||||
>
|
||||
<VnSelect
|
||||
:label="t('ticketNotes.observationType')"
|
||||
|
@ -88,8 +86,7 @@ async function handleSave(e) {
|
|||
:label="t('basicData.description')"
|
||||
v-model="row.description"
|
||||
class="col"
|
||||
@keydown.enter.stop="handleSave"
|
||||
autogrow
|
||||
@keyup.enter="handleSave"
|
||||
data-cy="ticketNotesDescription"
|
||||
/>
|
||||
<QIcon
|
||||
|
|
|
@ -241,7 +241,6 @@ onMounted(async () => {
|
|||
:value="`${entity.address?.nickname} #${entity.address?.id}`"
|
||||
/>
|
||||
<VnLv
|
||||
class="white-space-normal"
|
||||
:label="t('ticket.summary.consigneeStreet')"
|
||||
:value="formattedAddress"
|
||||
/>
|
||||
|
@ -525,7 +524,4 @@ onMounted(async () => {
|
|||
.grafana {
|
||||
color: $primary-light;
|
||||
}
|
||||
.white-space-normal :deep(.value span) {
|
||||
white-space: normal;
|
||||
}
|
||||
</style>
|
||||
|
|
|
@ -273,7 +273,6 @@ en:
|
|||
orderFk: Order
|
||||
from: From
|
||||
shipped: Shipped
|
||||
shippedDate: Shipped date
|
||||
to: To
|
||||
stateFk: State
|
||||
groupedStates: Grouped State
|
||||
|
@ -301,7 +300,6 @@ es:
|
|||
orderFk: Pedido
|
||||
from: Desde
|
||||
shipped: F. envío
|
||||
shippedDate: F. envío
|
||||
to: Hasta
|
||||
stateFk: Estado
|
||||
groupedStates: Estado agrupado
|
||||
|
|
|
@ -113,13 +113,13 @@ const columns = computed(() => [
|
|||
},
|
||||
{
|
||||
align: 'left',
|
||||
name: 'shipped',
|
||||
name: 'shippedDate',
|
||||
cardVisible: true,
|
||||
label: t('ticketList.shipped'),
|
||||
columnFilter: {
|
||||
component: 'date',
|
||||
},
|
||||
format: ({ shipped }) => toDate(shipped),
|
||||
format: ({ shippedDate }) => toDate(shippedDate),
|
||||
},
|
||||
{
|
||||
align: 'left',
|
||||
|
@ -477,7 +477,7 @@ function setReference(data) {
|
|||
prefix="card"
|
||||
:array-data-props="{
|
||||
url: 'Tickets/filter',
|
||||
order: ['shipped DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id'],
|
||||
order: ['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id'],
|
||||
exprBuilder,
|
||||
}"
|
||||
>
|
||||
|
@ -515,10 +515,10 @@ function setReference(data) {
|
|||
<DepartmentDescriptorProxy :id="row.departmentFk" />
|
||||
</span>
|
||||
</template>
|
||||
<template #column-shipped="{ row }">
|
||||
<template #column-shippedDate="{ row }">
|
||||
<span v-if="getDateColor(row.shipped)">
|
||||
<QChip :class="getDateColor(row.shipped)" dense square>
|
||||
{{ toDate(row.shipped) }}
|
||||
{{ toDate(row.shippedDate) }}
|
||||
</QChip>
|
||||
</span>
|
||||
</template>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import '../commands.js';
|
||||
describe('EntryDescriptor', () => {
|
||||
describe.skip('EntryDescriptor', () => {
|
||||
beforeEach(() => {
|
||||
cy.login('buyer');
|
||||
cy.visit(`/#/entry/list`);
|
||||
|
|
|
@ -34,7 +34,7 @@ describe('InvoiceOut list', () => {
|
|||
cy.get('.summaryHeader > div').should('include.text', 'A1111111');
|
||||
});
|
||||
|
||||
it('should open the client descriptor', () => {
|
||||
it.skip('should open the client descriptor', () => {
|
||||
cy.get(firstRowDescriptor).click();
|
||||
cy.get(summaryPopupIcon).click();
|
||||
});
|
||||
|
|
|
@ -30,7 +30,7 @@ describe('InvoiceOut summary', () => {
|
|||
cy.get('.q-item > .q-item__label').should('include.text', '1101');
|
||||
});
|
||||
|
||||
it('should open the ticket list', () => {
|
||||
it.skip('should open the ticket list', () => {
|
||||
cy.get(toTicketList).click();
|
||||
cy.get('[data-col-field="stateFk"]').each(($el) => {
|
||||
cy.wrap($el).contains('T1111111');
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
const firstRow = 'tbody > :nth-child(1)';
|
||||
|
||||
describe('TicketSale', () => {
|
||||
describe('#23', () => {
|
||||
describe.skip('#23', () => {
|
||||
beforeEach(() => {
|
||||
cy.login('claimManager');
|
||||
cy.viewport(1920, 1080);
|
||||
|
|
Loading…
Reference in New Issue