verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 77 Releases Wiki Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Jorge Penadés 2025-02-13 13:16:25 +01:00
parent 1facb04d7a d38a07f881
commit 7a84e406e9
14 changed files with 174 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/components/FormModelPopup.vue
View File

@ -58,19 +58,6 @@ defineExpose({
<p>{{ subtitle }}</p> <p>{{ subtitle }}</p>
<slot name="form-inputs" :data="data" :validate="validate" /> <slot name="form-inputs" :data="data" :validate="validate" />
<div class="q-mt-lg row justify-end"> <div class="q-mt-lg row justify-end">
<QBtn
v-if="showSaveAndContinueBtn"
:label="t('globals.isSaveAndContinue')"
:title="t('globals.isSaveAndContinue')"
type="submit"
color="primary"
class="q-ml-sm"
:disabled="isLoading"
:loading="isLoading"
data-cy="FormModelPopup_isSaveAndContinue"
z-max
@click="() => (isSaveAndContinue = true)"
/>
<QBtn <QBtn
:label="t('globals.cancel')" :label="t('globals.cancel')"
:title="t('globals.cancel')" :title="t('globals.cancel')"
@ -90,6 +77,7 @@ defineExpose({
" "
/> />
<QBtn <QBtn
:flat="showSaveAndContinueBtn"
:label="t('globals.save')" :label="t('globals.save')"
:title="t('globals.save')" :title="t('globals.save')"
type="submit" type="submit"
@ -101,6 +89,19 @@ defineExpose({
z-max z-max
@click="() => (isSaveAndContinue = false)" @click="() => (isSaveAndContinue = false)"
/> />
<QBtn
v-if="showSaveAndContinueBtn"
:label="t('globals.isSaveAndContinue')"
:title="t('globals.isSaveAndContinue')"
type="submit"
color="primary"
class="q-ml-sm"
:disabled="isLoading"
:loading="isLoading"
data-cy="FormModelPopup_isSaveAndContinue"
z-max
@click="() => (isSaveAndContinue = true)"
/>
</div> </div>
</template> </template>
</FormModel> </FormModel>

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

@ -340,8 +340,9 @@ const clickHandler = async (event) => {
const isDateElement = event.target.closest('.q-date'); const isDateElement = event.target.closest('.q-date');
const isTimeElement = event.target.closest('.q-time'); const isTimeElement = event.target.closest('.q-time');
const isQselectDropDown = event.target.closest('.q-select__dropdown-icon');
if (isDateElement || isTimeElement) return; if (isDateElement || isTimeElement || isQselectDropDown) return;
if (clickedElement === null) { if (clickedElement === null) {
destroyInput(editingRow.value, editingField.value); destroyInput(editingRow.value, editingField.value);
@ -411,7 +412,7 @@ async function renderInput(rowId, field, clickedElement) {
focusOnMount: true, focusOnMount: true,
eventHandlers: { eventHandlers: {
'update:modelValue': async (value) => { 'update:modelValue': async (value) => {
if (isSelect) { if (isSelect && value) {
row[column.name] = value[column.attrs?.optionValue ?? 'id']; row[column.name] = value[column.attrs?.optionValue ?? 'id'];
row[column?.name + 'TextValue'] = row[column?.name + 'TextValue'] =
value[column.attrs?.optionLabel ?? 'name']; value[column.attrs?.optionLabel ?? 'name'];
@ -593,6 +594,7 @@ const checkbox = ref(null);
@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)" @selection="(details) => handleSelection(details, rows)"
:hide-selected-banner="true"
> >
<template #top-left v-if="!$props.withoutHeader"> <template #top-left v-if="!$props.withoutHeader">
<slot name="top-left"> </slot> <slot name="top-left"> </slot>
@ -1042,7 +1044,7 @@ es:
.grid-three { .grid-three {
display: grid; display: grid;
grid-template-columns: repeat(auto-fit, minmax(150px, max-content)); grid-template-columns: repeat(auto-fit, minmax(300px, max-content));
max-width: 100%; max-width: 100%;
grid-gap: 20px; grid-gap: 20px;
margin: 0 auto; margin: 0 auto;

4
src/components/common/VnColor.vue
View File

@ -2,7 +2,7 @@
const $props = defineProps({ const $props = defineProps({
colors: { colors: {
type: String, type: String,
default: '{"value":[]}', default: '{"value": []}',
}, },
}); });
@ -11,7 +11,7 @@ const maxHeight = 30;
const colorHeight = maxHeight / colorArray?.length; const colorHeight = maxHeight / colorArray?.length;
</script> </script>
<template> <template>
<div class="color-div" :style="{ height: `${maxHeight}px` }"> <div v-if="colors" class="color-div" :style="{ height: `${maxHeight}px` }">
<div <div
v-for="(color, index) in colorArray" v-for="(color, index) in colorArray"
:key="index" :key="index"

33
src/components/ui/CardDescriptor.vue
View File

@ -6,6 +6,7 @@ import { useArrayData } from 'composables/useArrayData';
import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import { useState } from 'src/composables/useState'; import { useState } from 'src/composables/useState';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
import { useClipboard } from 'src/composables/useClipboard';
import VnMoreOptions from './VnMoreOptions.vue'; import VnMoreOptions from './VnMoreOptions.vue';
const $props = defineProps({ const $props = defineProps({
@ -42,6 +43,7 @@ const $props = defineProps({
const state = useState(); const state = useState();
const route = useRoute(); const route = useRoute();
const { t } = useI18n(); const { t } = useI18n();
const { copyText } = useClipboard();
const { viewSummary } = useSummaryDialog(); const { viewSummary } = useSummaryDialog();
let arrayData; let arrayData;
let store; let store;
@ -99,6 +101,14 @@ function getValueFromPath(path) {
return current; return current;
} }
function copyIdText(id) {
copyText(id, {
component: {
copyValue: id,
},
});
}
const emit = defineEmits(['onFetch']); const emit = defineEmits(['onFetch']);
const iconModule = computed(() => route.matched[1].meta.icon); const iconModule = computed(() => route.matched[1].meta.icon);
@ -182,9 +192,22 @@ const toModule = computed(() =>
</slot> </slot>
</div> </div>
</QItemLabel> </QItemLabel>
<QItem dense> <QItem>
<QItemLabel class="subtitle" caption> <QItemLabel class="subtitle" caption>
#{{ getValueFromPath(subtitle) ?? entity.id }} #{{ getValueFromPath(subtitle) ?? entity.id }}
<QBtn
round
flat
dense
size="sm"
icon="content_copy"
color="primary"
@click.stop="copyIdText(entity.id)"
>
<QTooltip>
{{ t('globals.copyId') }}
</QTooltip>
</QBtn>
</QItemLabel> </QItemLabel>
</QItem> </QItem>
</QList> </QList>
@ -292,3 +315,11 @@ const toModule = computed(() =>
} }
} }
</style> </style>
<i18n>
en:
globals:
copyId: Copy ID
es:
globals:
copyId: Copiar ID
</i18n>

1
src/i18n/locale/en.yml
View File

@ -156,6 +156,7 @@ globals:
changeState: Change state changeState: Change state
raid: 'Raid {daysInForward} days' raid: 'Raid {daysInForward} days'
isVies: Vies isVies: Vies
noData: No data available
pageTitles: pageTitles:
logIn: Login logIn: Login
addressEdit: Update address addressEdit: Update address

1
src/i18n/locale/es.yml
View File

@ -160,6 +160,7 @@ globals:
changeState: Cambiar estado changeState: Cambiar estado
raid: 'Redada {daysInForward} días' raid: 'Redada {daysInForward} días'
isVies: Vies isVies: Vies
noData: Datos no disponibles
pageTitles: pageTitles:
logIn: Inicio de sesión logIn: Inicio de sesión
addressEdit: Modificar consignatario addressEdit: Modificar consignatario

76
src/pages/Entry/Card/EntryBuys.vue
View File

@ -156,10 +156,10 @@ const columns = [
{ {
align: 'center', align: 'center',
labelAbbreviation: t('Sti.'), labelAbbreviation: t('Sti.'),
label: t('Printed Stickers/Stickers'), label: t('Stickers'),
toolTip: t('Printed Stickers/Stickers'), toolTip: t('Printed Stickers/Stickers'),
name: 'stickers', name: 'stickers',
component: 'number', component: 'input',
create: true, create: true,
attrs: { attrs: {
positive: false, positive: false,
@ -179,7 +179,7 @@ const columns = [
component: 'select', component: 'select',
attrs: { attrs: {
url: 'packagings', url: 'packagings',
fields: ['id', 'volume'], fields: ['id'],
optionLabel: 'id', optionLabel: 'id',
}, },
create: true, create: true,
@ -192,10 +192,10 @@ const columns = [
component: 'number', component: 'number',
create: true, create: true,
width: '35px', width: '35px',
format: (row, dashIfEmpty) => parseFloat(row['weight']).toFixed(1),
}, },
{ {
align: 'center', labelAbbreviation: 'P',
labelAbbreviation: 'Pack',
label: 'Packing', label: 'Packing',
toolTip: 'Packing', toolTip: 'Packing',
name: 'packing', name: 'packing',
@ -209,14 +209,13 @@ const columns = [
row['amount'] = row['quantity'] * row['buyingValue']; row['amount'] = row['quantity'] * row['buyingValue'];
}, },
}, },
width: '35px', width: '20px',
style: (row) => { style: (row) => {
if (row.groupingMode === 'grouping') if (row.groupingMode === 'grouping')
return { color: 'var(--vn-label-color)' }; return { color: 'var(--vn-label-color)' };
}, },
}, },
{ {
align: 'center',
labelAbbreviation: 'GM', labelAbbreviation: 'GM',
label: t('Grouping selector'), label: t('Grouping selector'),
toolTip: t('Grouping selector'), toolTip: t('Grouping selector'),
@ -229,7 +228,7 @@ const columns = [
indeterminateValue: null, indeterminateValue: null,
}, },
size: 'xs', size: 'xs',
width: '30px', width: '25px',
create: true, create: true,
rightFilter: false, rightFilter: false,
getIcon: (value) => { getIcon: (value) => {
@ -245,12 +244,12 @@ const columns = [
}, },
{ {
align: 'center', align: 'center',
labelAbbreviation: 'Group', labelAbbreviation: 'G',
label: 'Grouping', label: 'Grouping',
toolTip: 'Grouping', toolTip: 'Grouping',
name: 'grouping', name: 'grouping',
component: 'number', component: 'number',
width: '35px', width: '20px',
create: true, create: true,
style: (row) => { style: (row) => {
if (row.groupingMode === 'packing') return { color: 'var(--vn-label-color)' }; if (row.groupingMode === 'packing') return { color: 'var(--vn-label-color)' };
@ -290,6 +289,7 @@ const columns = [
}, },
}, },
width: '45px', width: '45px',
format: (row) => parseFloat(row['buyingValue']).toFixed(3),
}, },
{ {
align: 'center', align: 'center',
@ -301,6 +301,7 @@ const columns = [
positive: false, positive: false,
}, },
isEditable: false, isEditable: false,
format: (row) => parseFloat(row['amount']).toFixed(2),
style: getAmountStyle, style: getAmountStyle,
}, },
{ {
@ -312,6 +313,7 @@ const columns = [
component: 'number', component: 'number',
width: '35px', width: '35px',
create: true, create: true,
format: (row) => parseFloat(row['price2']).toFixed(2),
}, },
{ {
align: 'center', align: 'center',
@ -325,6 +327,7 @@ const columns = [
}, },
width: '35px', width: '35px',
create: true, create: true,
format: (row) => parseFloat(row['price3']).toFixed(2),
}, },
{ {
align: 'center', align: 'center',
@ -344,6 +347,7 @@ const columns = [
style: (row) => { style: (row) => {
if (!row?.hasMinPrice) return { color: 'var(--vn-label-color)' }; if (!row?.hasMinPrice) return { color: 'var(--vn-label-color)' };
}, },
format: (row) => parseFloat(row['minPrice']).toFixed(2),
}, },
{ {
align: 'center', align: 'center',
@ -518,7 +522,7 @@ onMounted(() => {
<Teleport to="#st-data" v-if="stateStore?.isSubToolbarShown() && editableMode"> <Teleport to="#st-data" v-if="stateStore?.isSubToolbarShown() && editableMode">
<QBtnGroup push style="column-gap: 1px"> <QBtnGroup push style="column-gap: 1px">
<QBtnDropdown <QBtnDropdown
icon="exposure_neg_1" label="+/-"
color="primary" color="primary"
flat flat
:title="t('Invert quantity value')" :title="t('Invert quantity value')"
@ -533,7 +537,7 @@ onMounted(() => {
@click="invertQuantitySign(selectedRows, -1)" @click="invertQuantitySign(selectedRows, -1)"
data-cy="set-negative-quantity" data-cy="set-negative-quantity"
> >
<span style="font-size: medium">-1</span> <span style="font-size: large">-</span>
</QBtn> </QBtn>
</QItemSection> </QItemSection>
</QItem> </QItem>
@ -544,7 +548,7 @@ onMounted(() => {
@click="invertQuantitySign(selectedRows, 1)" @click="invertQuantitySign(selectedRows, 1)"
data-cy="set-positive-quantity" data-cy="set-positive-quantity"
> >
<span style="font-size: medium">1</span> <span style="font-size: large">+</span>
</QBtn> </QBtn>
</QItemSection> </QItemSection>
</QItem> </QItem>
@ -558,11 +562,11 @@ onMounted(() => {
:disable="!selectedRows.length" :disable="!selectedRows.length"
data-cy="check-buy-amount" data-cy="check-buy-amount"
> >
<QTooltip>{{}}</QTooltip>
<QList> <QList>
<QItem> <QItem>
<QItemSection> <QItemSection>
<QBtn <QBtn
size="sm"
icon="check" icon="check"
flat flat
@click="setIsChecked(selectedRows, true)" @click="setIsChecked(selectedRows, true)"
@ -573,6 +577,7 @@ onMounted(() => {
<QItem> <QItem>
<QItemSection> <QItemSection>
<QBtn <QBtn
size="sm"
icon="close" icon="close"
flat flat
@click="setIsChecked(selectedRows, false)" @click="setIsChecked(selectedRows, false)"
@ -662,7 +667,7 @@ onMounted(() => {
<FetchedTags :item="row" :columns="3" /> <FetchedTags :item="row" :columns="3" />
</template> </template>
<template #column-stickers="{ row }"> <template #column-stickers="{ row }">
<span class="editable-text"> <span :class="editableMode ? 'editable-text' : ''">
<span style="color: var(--vn-label-color)"> <span style="color: var(--vn-label-color)">
{{ row.printedStickers }} {{ row.printedStickers }}
</span> </span>
@ -693,20 +698,36 @@ onMounted(() => {
</template> </template>
<template #column-create-itemFk="{ data }"> <template #column-create-itemFk="{ data }">
<VnSelect <VnSelect
url="Items" url="Items/search"
v-model="data.itemFk" v-model="data.itemFk"
:label="t('Article')" :label="t('Article')"
:fields="['id', 'name']" :fields="['id', 'name', 'size', 'producerName']"
:filter-options="['id', 'name', 'size', 'producerName']"
option-label="name" option-label="name"
option-value="id" option-value="id"
@update:modelValue=" @update:modelValue="
async (value) => { async (value) => {
setBuyUltimate(value, data); await setBuyUltimate(value, data);
} }
" "
:required="true" :required="true"
data-cy="itemFk-create-popup" data-cy="itemFk-create-popup"
/> sort-by="nickname DESC"
>
<template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel>
{{ scope.opt.name }}
</QItemLabel>
<QItemLabel caption>
#{{ scope.opt.id }}, {{ scope.opt?.size }},
{{ scope.opt?.producerName }}
</QItemLabel>
</QItemSection>
</QItem>
</template>
</VnSelect>
</template> </template>
<template #column-create-groupingMode="{ data }"> <template #column-create-groupingMode="{ data }">
<VnSelectEnum <VnSelectEnum
@ -720,9 +741,14 @@ onMounted(() => {
/> />
</template> </template>
<template #previous-create-dialog="{ data }"> <template #previous-create-dialog="{ data }">
<div style="position: absolute"> <div
style="position: absolute"
:class="{ 'centered-container': !data.itemFk }"
>
<ItemDescriptor :id="data.itemFk" v-if="data.itemFk" /> <ItemDescriptor :id="data.itemFk" v-if="data.itemFk" />
<SkeletonDescriptor v-if="!data.itemFk" :has-image="true" /> <div v-else>
<span>{{ t('globals.noData') }}</span>
</div>
</div> </div>
</template> </template>
</VnTable> </VnTable>
@ -744,6 +770,7 @@ es:
Com.: Ref. Com.: Ref.
Comment: Referencia Comment: Referencia
Minimum price: Precio mínimo Minimum price: Precio mínimo
Stickers: Etiquetas
Printed Stickers/Stickers: Etiquetas impresas/Etiquetas Printed Stickers/Stickers: Etiquetas impresas/Etiquetas
Cost: Cost. Cost: Cost.
Buying value: Coste Buying value: Coste
@ -761,7 +788,12 @@ es:
Check buy amount: Marcar como correcta la cantidad de compra Check buy amount: Marcar como correcta la cantidad de compra
</i18n> </i18n>
<style lang="scss" scoped> <style lang="scss" scoped>
.test { .centered-container {
display: flex;
justify-content: center; justify-content: center;
align-items: center;
position: absolute;
width: 40%;
height: 100%;
} }
</style> </style>

12
src/pages/Entry/EntryList.vue
View File

@ -182,14 +182,6 @@ const columns = computed(() => [
name: 'entryTypeCode', name: 'entryTypeCode',
cardVisible: true, cardVisible: true,
}, },
{
name: 'dated',
label: t('entry.list.tableVisibleColumns.dated'),
component: 'date',
cardVisible: false,
visible: false,
create: true,
},
{ {
name: 'companyFk', name: 'companyFk',
label: t('entry.list.tableVisibleColumns.companyFk'), label: t('entry.list.tableVisibleColumns.companyFk'),
@ -220,7 +212,8 @@ function getBadgeAttrs(row) {
let timeDiff = today - timeTicket; let timeDiff = today - timeTicket;
if (timeDiff > 0) return { color: 'warning', 'text-color': 'black' }; if (timeDiff > 0) return { color: 'info', 'text-color': 'black' };
if (timeDiff < 0) return { color: 'warning', 'text-color': 'black' };
switch (row.entryTypeCode) { switch (row.entryTypeCode) {
case 'regularization': case 'regularization':
case 'life': case 'life':
@ -245,7 +238,6 @@ function getBadgeAttrs(row) {
default: default:
break; break;
} }
if (timeDiff < 0) return { color: 'info', 'text-color': 'black' };
return { color: 'transparent' }; return { color: 'transparent' };
} }

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

@ -110,10 +110,16 @@ const columns = computed(() => [
attrs: { inWhere: true }, attrs: { inWhere: true },
align: 'left', align: 'left',
}, },
{
label: t('globals.visible'),
name: 'stock',
attrs: { inWhere: true },
align: 'left',
},
]); ]);
const totalLabels = computed(() => const totalLabels = computed(() =>
rows.value.reduce((acc, row) => acc + row.stock / row.packing, 0).toFixed(2) rows.value.reduce((acc, row) => acc + row.stock / row.packing, 0).toFixed(2),
); );
const removeLines = async () => { const removeLines = async () => {
@ -157,7 +163,7 @@ watchEffect(selectedRows);
openConfirmationModal( openConfirmationModal(
t('shelvings.removeConfirmTitle'), t('shelvings.removeConfirmTitle'),
t('shelvings.removeConfirmSubtitle'), t('shelvings.removeConfirmSubtitle'),
removeLines removeLines,
) )
" "
> >

22
src/pages/Ticket/Negative/TicketLackList.vue
View File

@ -34,7 +34,7 @@ const redirectToCreateView = ({ itemFk }) => {
const columns = computed(() => [ const columns = computed(() => [
{ {
name: 'date', name: 'date',
align: 'left', align: 'center',
label: t('negative.date'), label: t('negative.date'),
format: ({ timed }) => toDate(timed), format: ({ timed }) => toDate(timed),
sortable: true, sortable: true,
@ -47,7 +47,7 @@ const columns = computed(() => [
{ {
columnClass: 'shrink', columnClass: 'shrink',
name: 'timed', name: 'timed',
align: 'left', align: 'center',
label: t('negative.timed'), label: t('negative.timed'),
format: ({ timed }) => toHour(timed), format: ({ timed }) => toHour(timed),
sortable: true, sortable: true,
@ -58,7 +58,7 @@ const columns = computed(() => [
}, },
{ {
name: 'itemFk', name: 'itemFk',
align: 'left', align: 'center',
label: t('negative.id'), label: t('negative.id'),
format: ({ itemFk }) => itemFk, format: ({ itemFk }) => itemFk,
sortable: true, sortable: true,
@ -70,7 +70,7 @@ const columns = computed(() => [
}, },
{ {
name: 'longName', name: 'longName',
align: 'left', align: 'center',
label: t('negative.longName'), label: t('negative.longName'),
field: ({ longName }) => longName, field: ({ longName }) => longName,
@ -81,7 +81,7 @@ const columns = computed(() => [
}, },
{ {
name: 'producer', name: 'producer',
align: 'left', align: 'center',
label: t('negative.supplier'), label: t('negative.supplier'),
field: ({ producer }) => dashIfEmpty(producer), field: ({ producer }) => dashIfEmpty(producer),
sortable: true, sortable: true,
@ -89,7 +89,7 @@ const columns = computed(() => [
}, },
{ {
name: 'inkFk', name: 'inkFk',
align: 'left', align: 'center',
label: t('negative.colour'), label: t('negative.colour'),
field: ({ inkFk }) => inkFk, field: ({ inkFk }) => inkFk,
sortable: true, sortable: true,
@ -97,7 +97,7 @@ const columns = computed(() => [
}, },
{ {
name: 'size', name: 'size',
align: 'left', align: 'center',
label: t('negative.size'), label: t('negative.size'),
field: ({ size }) => size, field: ({ size }) => size,
sortable: true, sortable: true,
@ -110,7 +110,7 @@ const columns = computed(() => [
}, },
{ {
name: 'category', name: 'category',
align: 'left', align: 'center',
label: t('negative.origen'), label: t('negative.origen'),
field: ({ category }) => dashIfEmpty(category), field: ({ category }) => dashIfEmpty(category),
sortable: true, sortable: true,
@ -118,7 +118,7 @@ const columns = computed(() => [
}, },
{ {
name: 'lack', name: 'lack',
align: 'left', align: 'center',
label: t('negative.lack'), label: t('negative.lack'),
field: ({ lack }) => lack, field: ({ lack }) => lack,
columnFilter: { columnFilter: {
@ -127,12 +127,12 @@ const columns = computed(() => [
columnClass: 'shrink', columnClass: 'shrink',
}, },
sortable: true, sortable: true,
headerStyle: 'padding-left: 33px', headerStyle: 'padding-center: 33px',
cardVisible: true, cardVisible: true,
}, },
{ {
name: 'tableActions', name: 'tableActions',
align: 'left', align: 'center',
actions: [ actions: [
{ {
title: t('Open details'), title: t('Open details'),

24
src/pages/Ticket/Negative/TicketLackTable.vue
View File

@ -52,27 +52,26 @@ const route = useRoute();
const columns = computed(() => [ const columns = computed(() => [
{ {
name: 'status', name: 'status',
align: 'left', align: 'center',
sortable: false, sortable: false,
columnClass: 'expand', columnClass: 'shrink',
columnFilter: false, columnFilter: false,
}, },
{ {
name: 'ticketFk', name: 'ticketFk',
label: t('negative.detail.ticketFk'), label: t('negative.detail.ticketFk'),
align: 'left', align: 'center',
sortable: true, sortable: true,
columnFilter: { columnFilter: {
component: 'input', component: 'input',
type: 'number', type: 'number',
}, },
columnClass: 'shrink',
}, },
{ {
name: 'shipped', name: 'shipped',
label: t('negative.detail.shipped'), label: t('negative.detail.shipped'),
field: 'shipped', field: 'shipped',
align: 'left', align: 'center',
format: ({ shipped }) => toDate(shipped), format: ({ shipped }) => toDate(shipped),
sortable: true, sortable: true,
columnFilter: { columnFilter: {
@ -84,11 +83,9 @@ const columns = computed(() => [
name: 'minTimed', name: 'minTimed',
label: t('negative.detail.theoreticalhour'), label: t('negative.detail.theoreticalhour'),
field: 'minTimed', field: 'minTimed',
align: 'left', align: 'center',
format: ({ minTimed }) => toHour(minTimed),
sortable: true, sortable: true,
component: 'time', component: 'time',
columnClass: 'shrink',
columnFilter: {}, columnFilter: {},
}, },
{ {
@ -104,29 +101,27 @@ const columns = computed(() => [
optionValue: 'code', optionValue: 'code',
}, },
}, },
columnClass: 'expand', align: 'center',
align: 'left',
sortable: true, sortable: true,
}, },
{ {
name: 'zoneName', name: 'zoneName',
label: t('negative.detail.zoneName'), label: t('negative.detail.zoneName'),
field: 'zoneName', field: 'zoneName',
align: 'left', align: 'center',
sortable: true, sortable: true,
}, },
{ {
name: 'nickname', name: 'nickname',
label: t('negative.detail.nickname'), label: t('negative.detail.nickname'),
field: 'nickname', field: 'nickname',
align: 'left', align: 'center',
sortable: true, sortable: true,
}, },
{ {
name: 'quantity', name: 'quantity',
label: t('negative.detail.quantity'), label: t('negative.detail.quantity'),
field: 'quantity', field: 'quantity',
align: 'left',
sortable: true, sortable: true,
component: 'input', component: 'input',
type: 'number', type: 'number',
@ -167,7 +162,6 @@ const saveChange = async (field, { row }) => {
} }
}; };
const hasToIgnore = (row) => row.hasToIgnore === 1;
function onBuysFetched(data) { function onBuysFetched(data) {
Object.assign(item.value, data[0]); Object.assign(item.value, data[0]);
} }
@ -244,7 +238,7 @@ function onBuysFetched(data) {
</template> </template>
<template #column-status="{ row }"> <template #column-status="{ row }">
<QTd style="width: 150px"> <QTd style="min-width: 150px">
<div class="icon-container"> <div class="icon-container">
<QIcon <QIcon
v-if="row.isBasket" v-if="row.isBasket"

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

@ -232,7 +232,7 @@ const columns = computed(() => [
function resetAgenciesSelector(formData) { function resetAgenciesSelector(formData) {
agenciesOptions.value = []; agenciesOptions.value = [];
if(formData) formData.agencyModeId = null; if (formData) formData.agencyModeId = null;
} }
function redirectToLines(id) { function redirectToLines(id) {
@ -240,7 +240,7 @@ function redirectToLines(id) {
window.open(url, '_blank'); window.open(url, '_blank');
} }
const onClientSelected = async (formData) => { const onClientSelected = async (formData) => {
resetAgenciesSelector(formData); resetAgenciesSelector(formData);
await fetchClient(formData); await fetchClient(formData);
await fetchAddresses(formData); await fetchAddresses(formData);
@ -248,14 +248,12 @@ const onClientSelected = async (formData) => {
const fetchAvailableAgencies = async (formData) => { const fetchAvailableAgencies = async (formData) => {
resetAgenciesSelector(formData); resetAgenciesSelector(formData);
const response= await getAgencies(formData, selectedClient.value); const response = await getAgencies(formData, selectedClient.value);
if (!response) return; if (!response) return;
const { options, agency } = response const { options, agency } = response;
if(options) if (options) agenciesOptions.value = options;
agenciesOptions.value = options; if (agency) formData.agencyModeId = agency;
if(agency)
formData.agencyModeId = agency;
}; };
const fetchClient = async (formData) => { const fetchClient = async (formData) => {
@ -330,7 +328,7 @@ function openBalanceDialog(ticket) {
const description = ref([]); const description = ref([]);
const firstTicketClientId = checkedTickets[0].clientFk; const firstTicketClientId = checkedTickets[0].clientFk;
const isSameClient = checkedTickets.every( const isSameClient = checkedTickets.every(
(ticket) => ticket.clientFk === firstTicketClientId (ticket) => ticket.clientFk === firstTicketClientId,
); );
if (!isSameClient) { if (!isSameClient) {
@ -369,7 +367,7 @@ async function onSubmit() {
description: dialogData.value.value.description, description: dialogData.value.value.description,
clientFk: dialogData.value.value.clientFk, clientFk: dialogData.value.value.clientFk,
email: email[0].email, email: email[0].email,
} },
); );
if (data) notify('globals.dataSaved', 'positive'); if (data) notify('globals.dataSaved', 'positive');
@ -388,32 +386,32 @@ function setReference(data) {
switch (data) { switch (data) {
case 1: case 1:
newDescription = `${t( newDescription = `${t(
'ticketList.creditCard' 'ticketList.creditCard',
)}, ${dialogData.value.value.description.replace( )}, ${dialogData.value.value.description.replace(
/^(Credit Card, |Cash, |Transfers, )/, /^(Credit Card, |Cash, |Transfers, )/,
'' '',
)}`; )}`;
break; break;
case 2: case 2:
newDescription = `${t( newDescription = `${t(
'ticketList.cash' 'ticketList.cash',
)}, ${dialogData.value.value.description.replace( )}, ${dialogData.value.value.description.replace(
/^(Credit Card, |Cash, |Transfers, )/, /^(Credit Card, |Cash, |Transfers, )/,
'' '',
)}`; )}`;
break; break;
case 3: case 3:
newDescription = `${newDescription.replace( newDescription = `${newDescription.replace(
/^(Credit Card, |Cash, |Transfers, )/, /^(Credit Card, |Cash, |Transfers, )/,
'' '',
)}`; )}`;
break; break;
case 4: case 4:
newDescription = `${t( newDescription = `${t(
'ticketList.transfers' 'ticketList.transfers',
)}, ${dialogData.value.value.description.replace( )}, ${dialogData.value.value.description.replace(
/^(Credit Card, |Cash, |Transfers, )/, /^(Credit Card, |Cash, |Transfers, )/,
'' '',
)}`; )}`;
break; break;
case 3317: case 3317:

8
test/cypress/integration/entry/entrylist.spec.js → test/cypress/integration/entry/entryList.spec.js
View File

@ -124,12 +124,12 @@ describe('Entry', () => {
clickAndType('stickers', '1'); clickAndType('stickers', '1');
checkText('quantity', '11'); checkText('quantity', '11');
checkText('amount', '550'); checkText('amount', '550.00');
clickAndType('packing', '2'); clickAndType('packing', '2');
checkText('packing', '12close'); checkText('packing', '12close');
checkText('weight', '12'); checkText('weight', '12.0');
checkText('quantity', '132'); checkText('quantity', '132');
checkText('amount', '6600'); checkText('amount', '6600.00');
checkColor('packing', COLORS.enabled); checkColor('packing', COLORS.enabled);
selectCell('groupingMode').click().click().click(); selectCell('groupingMode').click().click().click();
@ -137,7 +137,7 @@ describe('Entry', () => {
checkColor('grouping', COLORS.enabled); checkColor('grouping', COLORS.enabled);
selectCell('buyingValue').click().clear().type('{backspace}{backspace}1'); selectCell('buyingValue').click().clear().type('{backspace}{backspace}1');
checkText('amount', '132'); checkText('amount', '132.00');
checkColor('minPrice', COLORS.disable); checkColor('minPrice', COLORS.disable);
selectCell('hasMinPrice').click().click(); selectCell('hasMinPrice').click().click();

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

@ -4,9 +4,6 @@ describe('Route', () => {
cy.login('developer'); cy.login('developer');
cy.visit(`/#/route/extended-list`); cy.visit(`/#/route/extended-list`);
}); });
const getVnSelect =
'> :nth-child(1) > .column > .q-field > .q-field__inner > .q-field__control > .q-field__control-container';
const getRowColumn = (row, column) => `:nth-child(${row}) > :nth-child(${column})`;
it('Route list create route', () => { it('Route list create route', () => {
cy.addBtnClick(); cy.addBtnClick();
@ -16,18 +13,25 @@ describe('Route', () => {
}); });
it('Route list search and edit', () => { it('Route list search and edit', () => {
cy.get('#searchbar input').type('{enter}'); /* cy.get('#searchbar input').type('{enter}');
cy.get('td[data-col-field="description"]').click(); */ cy.get('[data-col-field="description"][data-row-index="0"]')
cy.get('input[name="description"]').type('routeTestOne{enter}'); .click()
/* cy.get('.q-table tr') .type('routeTestOne{enter}');
cy.get('.q-table tr')
.its('length') .its('length')
.then((rowCount) => { .then((rowCount) => {
expect(rowCount).to.be.greaterThan(0); expect(rowCount).to.be.greaterThan(0);
}); });
cy.get(getRowColumn(1, 3) + getVnSelect).type('{downArrow}{enter}'); cy.get('[data-col-field="workerFk"][data-row-index="0"]')
cy.get(getRowColumn(1, 4) + getVnSelect).type('{downArrow}{enter}'); .click()
cy.get(getRowColumn(1, 5) + getVnSelect).type('{downArrow}{enter}'); .type('{downArrow}{enter}');
cy.get('[data-col-field="agencyModeFk"][data-row-index="0"]')
.click()
.type('{downArrow}{enter}');
cy.get('[data-col-field="vehicleFk"][data-row-index="0"]')
.click()
.type('{downArrow}{enter}');
cy.get('button[title="Save"]').click(); cy.get('button[title="Save"]').click();
cy.get('.q-notification__message').should('have.text', 'Data saved'); */ cy.get('.q-notification__message').should('have.text', 'Data saved');
}); });
}); });