-
{{ t(`params.${tag.label}`) }}:
-
{{ formatFn(tag.value) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ opt.name }}
+ {{ opt.nickname }}
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
-
-
-
-
-
+ filled
+ @update:modelValue="() => searchFn()"
+ />
-
+
+
+
+
-
-en:
- params:
- search: Contains
- userFk: User
- created: Created
es:
+ tooltips:
+ search: Buscar por identificador o concepto
+ changes: Buscar por cambios. Los atributos deben buscarse por su nombre interno, para obtenerlo situar el cursor sobre el atributo.
+ actions:
+ Creates: Crea
+ Edits: Modifica
+ Deletes: Elimina
+ Accesses: Accede
+ Users:
+ User: Usuario
+ All: Todo
+ System: Sistema
params:
- search: Contiene
- userFk: Usuario
- created: Creada
- User: Usuario
+ changedModel: Entity
+
+en:
+ tooltips:
+ search: Search by identifier or concept
+ changes: Search by changes. Attributes must be searched by their internal name, to get it place the cursor over the attribute.
+ actions:
+ Creates: Creates
+ Edits: Edits
+ Deletes: Deletes
+ Accesses: Accesses
+ Users:
+ User: User
+ All: All
+ System: System
+ params:
+ changedModel: Entidad
diff --git a/src/components/common/VnLogValue.vue b/src/components/common/VnLogValue.vue
new file mode 100644
index 000000000..3f1617ce7
--- /dev/null
+++ b/src/components/common/VnLogValue.vue
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/common/VnSection.vue b/src/components/common/VnSection.vue
index 4bd17124f..34eb14601 100644
--- a/src/components/common/VnSection.vue
+++ b/src/components/common/VnSection.vue
@@ -40,10 +40,6 @@ const $props = defineProps({
type: Boolean,
default: true,
},
- keepData: {
- type: Boolean,
- default: true,
- },
});
const route = useRoute();
@@ -61,7 +57,6 @@ onBeforeMount(() => {
if ($props.dataKey)
arrayData = useArrayData($props.dataKey, {
searchUrl: 'table',
- keepData: $props.keepData,
...$props.arrayDataProps,
navigate: $props.redirect,
});
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 6eda03891..8d598e7ec 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -152,6 +152,20 @@ const value = computed({
},
});
+const arrayDataKey =
+ $props.dataKey ??
+ ($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
+
+const arrayData = useArrayData(arrayDataKey, {
+ url: $props.url,
+ searchUrl: false,
+ mapKey: $attrs['map-key'],
+});
+
+const computedSortBy = computed(() => {
+ return $props.sortBy || $props.optionLabel + ' ASC';
+});
+
watch(options, (newValue) => {
setOptions(newValue);
});
@@ -170,23 +184,14 @@ onMounted(() => {
if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
});
-const arrayDataKey =
- $props.dataKey ??
- ($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
-
-const arrayData = useArrayData(arrayDataKey, {
- url: $props.url,
- searchUrl: false,
- mapKey: $attrs['map-key'],
-});
-
+const someIsLoading = computed(() => isLoading.value || arrayData.isLoading);
function findKeyInOptions() {
if (!$props.options) return;
return filter($props.modelValue, $props.options)?.length;
}
function setOptions(data) {
- data = dataByOrder(data, $props.sortBy);
+ data = dataByOrder(data, computedSortBy.value);
myOptions.value = JSON.parse(JSON.stringify(data));
myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
emit('update:options', data);
@@ -216,7 +221,8 @@ function filter(val, options) {
async function fetchFilter(val) {
if (!$props.url) return;
- const { fields, include, sortBy, limit } = $props;
+ const { fields, include, limit } = $props;
+ const sortBy = computedSortBy.value;
const key =
optionFilterValue.value ??
(new RegExp(/\d/g).test(val)
@@ -361,7 +367,8 @@ function getCaption(opt) {
virtual-scroll-slice-size="options.length"
hide-bottom-space
:input-debounce="useURL ? '300' : '0'"
- :loading="isLoading"
+ :loading="someIsLoading"
+ :disable="someIsLoading"
@virtual-scroll="onScroll"
@keydown="handleKeyDown"
:data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
diff --git a/src/components/common/VnSmsDialog.vue b/src/components/common/VnSmsDialog.vue
index 8851a33b2..ada2d02fa 100644
--- a/src/components/common/VnSmsDialog.vue
+++ b/src/components/common/VnSmsDialog.vue
@@ -232,7 +232,7 @@ fr:
pt: Portugais
pt:
Send SMS: Enviar SMS
- CustomerDefaultLanguage: Este cliente utiliza o
{locale} como seu idioma padrão
+ CustomerDefaultLanguage: Este cliente utiliza o {locale} como seu idioma padrão
Language: Linguagem
Phone: Móvel
Subject: Assunto
diff --git a/src/components/common/__tests__/VnDmsList.spec.js b/src/components/common/__tests__/VnDmsList.spec.js
index 9649943a2..22101239e 100644
--- a/src/components/common/__tests__/VnDmsList.spec.js
+++ b/src/components/common/__tests__/VnDmsList.spec.js
@@ -4,12 +4,15 @@ import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
describe('VnDmsList', () => {
let vm;
- const dms = {
- userFk: 1,
- name: 'DMS 1'
+ const dms = {
+ userFk: 1,
+ name: 'DMS 1',
};
-
+
beforeAll(() => {
+ vi.mock('src/composables/getUrl', () => ({
+ getUrl: vi.fn().mockResolvedValue(''),
+ }));
vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
vm = createWrapper(VnDmsList, {
props: {
@@ -18,8 +21,8 @@ describe('VnDmsList', () => {
filter: 'wd.workerFk',
updateModel: 'Workers',
deleteModel: 'WorkerDms',
- downloadModel: 'WorkerDms'
- }
+ downloadModel: 'WorkerDms',
+ },
}).vm;
});
@@ -29,46 +32,45 @@ describe('VnDmsList', () => {
describe('setData()', () => {
const data = [
- {
- userFk: 1,
+ {
+ userFk: 1,
name: 'Jessica',
lastName: 'Jones',
file: '4.jpg',
- created: '2021-07-28 21:00:00'
+ created: '2021-07-28 21:00:00',
},
- {
- userFk: 2,
+ {
+ userFk: 2,
name: 'Bruce',
lastName: 'Banner',
created: '2022-07-28 21:00:00',
dms: {
- userFk: 2,
+ userFk: 2,
name: 'Bruce',
lastName: 'BannerDMS',
created: '2022-07-28 21:00:00',
file: '4.jpg',
- }
+ },
},
{
userFk: 3,
name: 'Natasha',
lastName: 'Romanoff',
file: '4.jpg',
- created: '2021-10-28 21:00:00'
- }
- ]
+ created: '2021-10-28 21:00:00',
+ },
+ ];
it('Should replace objects that contain the "dms" property with the value of the same and sort by creation date', () => {
vm.setData(data);
expect([vm.rows][0][0].lastName).toEqual('BannerDMS');
expect([vm.rows][0][1].lastName).toEqual('Romanoff');
-
});
});
describe('parseDms()', () => {
- const resultDms = { ...dms, userId:1};
-
+ const resultDms = { ...dms, userId: 1 };
+
it('Should add properties that end with "Fk" by changing the suffix to "Id"', () => {
const parsedDms = vm.parseDms(dms);
expect(parsedDms).toEqual(resultDms);
@@ -76,12 +78,12 @@ describe('VnDmsList', () => {
});
describe('showFormDialog()', () => {
- const resultDms = { ...dms, userId:1};
-
+ const resultDms = { ...dms, userId: 1 };
+
it('should call fn parseDms() and set show true if dms is defined', () => {
vm.showFormDialog(dms);
expect(vm.formDialog.show).toEqual(true);
expect(vm.formDialog.dms).toEqual(resultDms);
});
});
-});
\ No newline at end of file
+});
diff --git a/src/components/common/__tests__/VnInputDateTime.spec.js b/src/components/common/__tests__/VnInputDateTime.spec.js
new file mode 100644
index 000000000..23132d77d
--- /dev/null
+++ b/src/components/common/__tests__/VnInputDateTime.spec.js
@@ -0,0 +1,81 @@
+import { createWrapper } from 'app/test/vitest/helper.js';
+import { describe, it, expect, beforeAll } from 'vitest';
+import VnInputDateTime from 'components/common/VnInputDateTime.vue';
+import vnDateBoot from 'src/boot/vnDate';
+
+let vm;
+let wrapper;
+
+beforeAll(() => {
+ // Initialize the vnDate boot
+ vnDateBoot();
+});
+function generateWrapper(date, outlined, showEvent) {
+ wrapper = createWrapper(VnInputDateTime, {
+ props: {
+ modelValue: date,
+ isOutlined: outlined,
+ showEvent: showEvent,
+ },
+ });
+ wrapper = wrapper.wrapper;
+ vm = wrapper.vm;
+}
+
+describe('VnInputDateTime', () => {
+ describe('selectedDate', () => {
+ it('formats a valid datetime correctly', async () => {
+ generateWrapper('2023-12-25T10:30:00', false, true);
+ await vm.$nextTick();
+ expect(vm.selectedDate).toBe('25-12-2023 10:30');
+ });
+
+ it('handles null date value', async () => {
+ generateWrapper(null, false, true);
+ await vm.$nextTick();
+ expect(vm.selectedDate).toBeInstanceOf(Date);
+ });
+
+ it('updates the model value when a new datetime is set', async () => {
+ vm.selectedDate = '31-12-2023 15:45';
+ await vm.$nextTick();
+ expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
+ });
+ });
+
+ describe('styleAttrs', () => {
+ it('should return empty styleAttrs when isOutlined is false', async () => {
+ generateWrapper('2023-12-25T10:30:00', false, true);
+ await vm.$nextTick();
+ expect(vm.styleAttrs).toEqual({});
+ });
+
+ it('should set styleAttrs when isOutlined is true', async () => {
+ generateWrapper('2023-12-25T10:30:00', true, true);
+ await vm.$nextTick();
+ expect(vm.styleAttrs).toEqual({
+ dense: true,
+ outlined: true,
+ rounded: true,
+ });
+ });
+ });
+
+ describe('component rendering', () => {
+ it('should render date and time icons', async () => {
+ generateWrapper('2023-12-25T10:30:00', false, true);
+ await vm.$nextTick();
+ const icons = wrapper.findAllComponents({ name: 'QIcon' });
+ expect(icons.length).toBe(2);
+ expect(icons[0].props('name')).toBe('today');
+ expect(icons[1].props('name')).toBe('access_time');
+ });
+
+ it('should render popup proxies for date and time', async () => {
+ generateWrapper('2023-12-25T10:30:00', false, true);
+ await vm.$nextTick();
+ const popups = wrapper.findAllComponents({ name: 'QPopupProxy' });
+ expect(popups.length).toBe(2);
+ });
+ });
+});
diff --git a/src/components/common/__tests__/VnJsonValue.spec.js b/src/components/common/__tests__/VnJsonValue.spec.js
index 393b39f3a..c3aa1a769 100644
--- a/src/components/common/__tests__/VnJsonValue.spec.js
+++ b/src/components/common/__tests__/VnJsonValue.spec.js
@@ -65,7 +65,7 @@ describe('VnJsonValue', () => {
const date = new Date('2023-01-01');
const wrapper = buildComponent({ value: date });
const span = wrapper.find('span');
- expect(span.text()).toBe('2023-01-01');
+ expect(span.text()).toBe('01/01/2023, 01:00:00');
expect(span.classes()).toContain('json-object');
});
diff --git a/src/components/common/__tests__/VnLog.spec.js b/src/components/common/__tests__/VnLog.spec.js
index 53d2732a0..7f33578df 100644
--- a/src/components/common/__tests__/VnLog.spec.js
+++ b/src/components/common/__tests__/VnLog.spec.js
@@ -108,27 +108,4 @@ describe('VnLog', () => {
expect(vm.logTree[0].originFk).toEqual(1);
expect(vm.logTree[0].logs[0].user.name).toEqual('salesPerson');
});
-
- it('should correctly set the selectedFilters when filtering', () => {
- vm.searchInput = '1';
- vm.userSelect = '21';
- vm.checkboxOptions.insert.selected = true;
- vm.checkboxOptions.update.selected = true;
-
- vm.selectFilter('search');
- vm.selectFilter('userSelect');
-
- expect(vm.selectedFilters.changedModelId).toEqual('1');
- expect(vm.selectedFilters.userFk).toEqual('21');
- expect(vm.selectedFilters.action).toEqual({ inq: ['insert', 'update'] });
- });
-
- it('should correctly set the date from', () => {
- vm.dateFrom = '18-09-2023';
- vm.selectFilter('date', 'from');
- expect(vm.selectedFilters.creationDate.between).toEqual([
- new Date('2023-09-18T00:00:00.000Z'),
- new Date('2023-09-18T21:59:59.999Z'),
- ]);
- });
});
diff --git a/src/components/common/__tests__/VnLogFilter.spec.js b/src/components/common/__tests__/VnLogFilter.spec.js
new file mode 100644
index 000000000..a28fa85b1
--- /dev/null
+++ b/src/components/common/__tests__/VnLogFilter.spec.js
@@ -0,0 +1,28 @@
+import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import VnLogFilter from 'src/components/common/VnLogFilter.vue';
+
+describe('VnLogFilter', () => {
+ let vm;
+ beforeAll(async () => {
+ vm = createWrapper(VnLogFilter, {
+ props: {
+ dataKey: 'ClaimLog',
+ },
+ }).vm;
+ });
+
+ afterEach(() => {
+ vi.clearAllMocks();
+ });
+
+ it('should getActions selected', async () => {
+ vm.checkboxOptions.find((o) => o.name == 'insert').selected = true;
+ vm.checkboxOptions.find((o) => o.name == 'update').selected = true;
+
+ const actions = vm.getActions();
+
+ expect(actions.length).toEqual(2);
+ expect(actions).toEqual(['insert', 'update']);
+ });
+});
diff --git a/src/components/common/__tests__/VnLogValue.spec.js b/src/components/common/__tests__/VnLogValue.spec.js
new file mode 100644
index 000000000..c23743a02
--- /dev/null
+++ b/src/components/common/__tests__/VnLogValue.spec.js
@@ -0,0 +1,26 @@
+import { describe, it, expect } from 'vitest';
+import VnLogValue from 'src/components/common/VnLogValue.vue';
+import { createWrapper } from 'app/test/vitest/helper';
+
+const buildComponent = (props) => {
+ return createWrapper(VnLogValue, {
+ props,
+ global: {},
+ }).wrapper;
+};
+
+describe('VnLogValue', () => {
+ const id = 1;
+ it('renders without descriptor', async () => {
+ expect(getIcon('inventFk').exists()).toBe(false);
+ });
+
+ it('renders with descriptor', async () => {
+ expect(getIcon('claimFk').text()).toBe('launch');
+ });
+
+ function getIcon(name) {
+ const wrapper = buildComponent({ value: { val: id }, name });
+ return wrapper.find('.q-icon');
+ }
+});
diff --git a/src/components/common/__tests__/VnNotes.spec.js b/src/components/common/__tests__/VnNotes.spec.js
index 2603bf03c..ea595060a 100644
--- a/src/components/common/__tests__/VnNotes.spec.js
+++ b/src/components/common/__tests__/VnNotes.spec.js
@@ -1,16 +1,6 @@
-import {
- describe,
- it,
- expect,
- vi,
- beforeAll,
- afterEach,
- beforeEach,
- afterAll,
-} from 'vitest';
+import { describe, it, expect, vi, afterEach, beforeEach, afterAll } from 'vitest';
import { createWrapper, axios } from 'app/test/vitest/helper';
import VnNotes from 'src/components/ui/VnNotes.vue';
-import vnDate from 'src/boot/vnDate';
describe('VnNotes', () => {
let vm;
@@ -18,6 +8,7 @@ describe('VnNotes', () => {
let spyFetch;
let postMock;
let patchMock;
+ let deleteMock;
let expectedInsertBody;
let expectedUpdateBody;
const defaultOptions = {
@@ -57,6 +48,7 @@ describe('VnNotes', () => {
beforeEach(() => {
postMock = vi.spyOn(axios, 'post');
patchMock = vi.spyOn(axios, 'patch');
+ deleteMock = vi.spyOn(axios, 'delete');
});
afterEach(() => {
@@ -153,4 +145,16 @@ describe('VnNotes', () => {
);
});
});
+
+ describe('delete', () => {
+ it('Should call axios.delete with url and vnPaginateRef.fetch', async () => {
+ generateWrapper();
+ createSpyFetch();
+
+ await vm.deleteNote({ id: 1 });
+
+ expect(deleteMock).toHaveBeenCalledWith(`${vm.$props.url}/1`);
+ expect(spyFetch).toHaveBeenCalled();
+ });
+ });
});
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 564112e5f..5f9a89d64 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -1,363 +1,38 @@
-
-
-
-
-
-
-
-
-
- {{ getValueFromPath(title) ?? $props.title }}
-
-
-
- {{ entity.name }}
-
-
-
-
-
-
- #{{ getValueFromPath(subtitle) ?? entity.id }}
-
-
-
- {{ t('globals.copyId') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- en:
- globals:
- copyId: Copy ID
- es:
- globals:
- copyId: Copiar ID
-
+ "
+ />
+
+
+
+
+
+
diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index 05bfed998..a6c23be2e 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -159,6 +159,7 @@ async function fetch() {
display: flex;
flex-direction: row;
margin-top: 2px;
+ align-items: start;
.label {
color: var(--vn-label-color);
width: 9em;
@@ -169,9 +170,15 @@ async function fetch() {
flex-grow: 0;
flex-shrink: 0;
}
+ &.ellipsis > .value {
+ text-overflow: ellipsis;
+ white-space: pre;
+ }
.value {
color: var(--vn-text-color);
overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
}
.header {
@@ -201,6 +208,23 @@ async function fetch() {
}
}
}
+
+.vn-card-group {
+ display: grid;
+ grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+ gap: 16px;
+}
+
+.vn-card-content {
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ > div {
+ max-height: 70px;
+ }
+}
+
+
+
+ en:
+ globals:
+ copyId: Copy ID
+ es:
+ globals:
+ copyId: Copiar ID
+
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 93e3a57f2..dc9e4e776 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -61,6 +61,10 @@ const $props = defineProps({
type: Object,
default: null,
},
+ showTagChips: {
+ type: Boolean,
+ default: true,
+ },
});
const emit = defineEmits([
@@ -88,13 +92,14 @@ const userOrders = ref(useFilterParams($props.dataKey).orders);
defineExpose({ search, params: userParams, remove });
const isLoading = ref(false);
-async function search(evt) {
+async function search(evt, name, value) {
try {
if (evt && $props.disableSubmitEvent) return;
store.filter.where = {};
isLoading.value = true;
const filter = { ...userParams.value, ...$props.modelValue };
+ if (name) filter[name] = value;
store.userParamsChanged = true;
await arrayData.addFilter({
params: filter,
@@ -214,7 +219,7 @@ const getLocale = (label) => {
-
+
@@ -249,7 +254,7 @@ const getLocale = (label) => {
:key="chip.label"
:removable="!unremovableParams?.includes(chip.label)"
@remove="remove(chip.label)"
- data-cy="vnFilterPanelChip"
+ :data-cy="`vnFilterPanelChip_${chip.label}`"
>
+import { dashIfEmpty } from 'src/filters';
+
defineProps({ email: { type: [String], default: null } });
+ {{ dashIfEmpty(email) }}
diff --git a/src/components/ui/VnLinkPhone.vue b/src/components/ui/VnLinkPhone.vue
index a9e9bc0fc..e34a70011 100644
--- a/src/components/ui/VnLinkPhone.vue
+++ b/src/components/ui/VnLinkPhone.vue
@@ -1,7 +1,7 @@
+
-
-
- {{ capitalize(type).replace('-', '') }}
-
-
+
+
+
+
+ {{ capitalize(type).replace('-', '') }}
+
+
+ {{ dashIfEmpty(phone) }}
+
diff --git a/src/components/ui/VnLv.vue b/src/components/ui/VnLv.vue
index a198c9c05..4c5a429f4 100644
--- a/src/components/ui/VnLv.vue
+++ b/src/components/ui/VnLv.vue
@@ -6,6 +6,7 @@ import { computed } from 'vue';
const $props = defineProps({
label: { type: String, default: null },
+ tooltip: { type: String, default: null },
value: {
type: [String, Boolean, Number],
default: null,
@@ -28,23 +29,27 @@ function copyValueText() {
const val = computed(() => $props.value);
-
+
- {{ label }}
+ {{ tooltip }}
+
+ {{ label }}
+
-
+
-
+
{{ dash ? dashIfEmpty(value) : value }}
diff --git a/src/components/ui/VnMoreOptions.vue b/src/components/ui/VnMoreOptions.vue
index 8a1c7a0f2..bc81233d5 100644
--- a/src/components/ui/VnMoreOptions.vue
+++ b/src/components/ui/VnMoreOptions.vue
@@ -9,10 +9,10 @@
data-cy="descriptor-more-opts"
>
- {{ $t('components.cardDescriptor.moreOptions') }}
+ {{ $t('components.vnDescriptor.moreOptions') }}
-
+
diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 6ce28254d..9cedbccfa 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -18,10 +18,10 @@ import VnInput from 'components/common/VnInput.vue';
const emit = defineEmits(['onFetch']);
-const $attrs = useAttrs();
-
-const isRequired = computed(() => {
- return Object.keys($attrs).includes('required');
+const originalAttrs = useAttrs();
+const $attrs = computed(() => {
+ const { required, deletable, ...rest } = originalAttrs;
+ return rest;
});
const $props = defineProps({
@@ -40,6 +40,11 @@ const quasar = useQuasar();
const newNote = reactive({ text: null, observationTypeFk: null });
const observationTypes = ref([]);
const vnPaginateRef = ref();
+
+const defaultObservationType = computed(() =>
+ observationTypes.value.find(ot => ot.code === 'salesPerson')?.id
+);
+
let originalText;
function handleClick(e) {
@@ -48,6 +53,11 @@ function handleClick(e) {
else insert();
}
+async function deleteNote(e) {
+ await axios.delete(`${$props.url}/${e.id}`);
+ await vnPaginateRef.value.fetch();
+}
+
async function insert() {
if (!newNote.text || ($props.selectType && !newNote.observationTypeFk)) return;
@@ -111,14 +121,22 @@ function fetchData([data]) {
originalText = data?.notes;
emit('onFetch', data);
}
+
+const handleObservationTypes = (data) => {
+ observationTypes.value = data;
+ if(defaultObservationType.value) {
+ newNote.observationTypeFk = defaultObservationType.value;
+ }
+};
+
@@ -189,7 +207,6 @@ function fetchData([data]) {
:search-url="false"
@on-fetch="
newNote.text = '';
- newNote.observationTypeFk = null;
"
>
@@ -226,6 +243,21 @@ function fetchData([data]) {
+
+
+
+ {{ t('ticketNotes.removeNote') }}
+
+
+
{{ t('Edit document') }}
@@ -210,6 +219,7 @@ function deleteFile(dmsFk) {
padding="xs"
round
@click="deleteFile(data.dmsFk)"
+ data-cy="invoiceInBasicDataDmsDelete"
/>
{{ t('Create document') }}
@@ -237,9 +247,9 @@ function deleteFile(dmsFk) {
:label="t('Currency')"
v-model="data.currencyFk"
:options="currencies"
- option-value="id"
option-label="code"
sort-by="id"
+ data-cy="invoiceInBasicDataCurrencyFk"
/>
-
-
-
@@ -313,7 +314,6 @@ function deleteFile(dmsFk) {
supplierFk: Proveedor
Expedition date: Fecha expedición
Operation date: Fecha operación
- Undeductible VAT: Iva no deducible
Document: Documento
Download file: Descargar archivo
Entry date: Fecha asiento
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue b/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
index 1d0a8d078..775a2a72b 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
@@ -1,22 +1,16 @@
-
-
+
{{ entity?.supplier?.nickname }}
@@ -163,7 +159,7 @@ async function setInvoiceCorrection(id) {
-
+
es:
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 18602f043..74936f00a 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -40,6 +40,13 @@ const vatColumns = ref([
sortable: true,
align: 'left',
},
+ {
+ name: 'isDeductible',
+ label: 'invoiceIn.isDeductible',
+ field: (row) => row.isDeductible,
+ sortable: true,
+ align: 'center',
+ },
{
name: 'vat',
label: 'invoiceIn.summary.sageVat',
@@ -198,6 +205,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
color="orange-11"
text-color="black"
@click="book(entityId)"
+ data-cy="invoiceInSummary_book"
/>
@@ -206,113 +214,109 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
-
-
-
-
-
-
-
-
- {{ entity.supplier?.name }}
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ toCurrency(entity.totals.totalDueDay) }}
-
-
-
-
+
+
+
+
+
+ {{ entity.supplier?.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ toCurrency(entity.totals.totalDueDay) }}
+
+
+
+
+
${msg}
`, ''),
+ promise: () => toBook(id),
},
- }).onOk(() => toBook(id));
+ });
}
async function toBook(id) {
- let type = 'positive';
- let message = t('globals.dataSaved');
-
+ let err = false;
try {
await axios.post(`InvoiceIns/${id}/toBook`);
store.data.isBooked = true;
} catch (e) {
- type = 'negative';
- message = t('It was not able to book the invoice');
+ err = true;
+ throw e;
} finally {
- notify({ type, message });
+ if (!err) notify({ type: 'positive', message: t('globals.dataSaved') });
}
}
diff --git a/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue b/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue
index 19ed73e50..66b7fa433 100644
--- a/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue
+++ b/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue
@@ -25,8 +25,7 @@ const { t } = useI18n();
@@ -36,8 +35,7 @@ const { t } = useI18n();
diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml
index 0ab12e14c..a7a8d2469 100644
--- a/src/pages/InvoiceIn/locale/en.yml
+++ b/src/pages/InvoiceIn/locale/en.yml
@@ -4,6 +4,7 @@ invoiceIn:
serial: Serial
isBooked: Is booked
supplierRef: Invoice nº
+ isDeductible: Deductible
list:
ref: Reference
supplier: Supplier
@@ -58,7 +59,6 @@ invoiceIn:
bank: Bank
foreignValue: Foreign value
dueTotal: Due day
- noMatch: Do not match
code: Code
net: Net
stems: Stems
@@ -69,3 +69,4 @@ invoiceIn:
isBooked: Is booked
account: Ledger account
correctingFk: Rectificative
+ noMatch: No match with the vat({totalTaxableBase})
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
index e91f00a60..c593f5a08 100644
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -4,6 +4,7 @@ invoiceIn:
serial: Serie
isBooked: Contabilizada
supplierRef: Nº factura
+ isDeductible: Deducible
list:
ref: Referencia
supplier: Proveedor
@@ -66,3 +67,4 @@ invoiceIn:
isBooked: Contabilizada
account: Cuenta contable
correctingFk: Rectificativa
+ noMatch: No cuadra con el iva({totalTaxableBase})
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
index 2402c0bf6..b93b8c8b7 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
@@ -3,7 +3,7 @@ import { ref, computed } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import InvoiceOutDescriptorMenu from './InvoiceOutDescriptorMenu.vue';
@@ -34,7 +34,7 @@ function ticketFilter(invoice) {
-
-
+
diff --git a/src/pages/InvoiceOut/InvoiceOutFilter.vue b/src/pages/InvoiceOut/InvoiceOutFilter.vue
index 99524e0d6..93a343565 100644
--- a/src/pages/InvoiceOut/InvoiceOutFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutFilter.vue
@@ -33,17 +33,13 @@ const states = ref();
-
+
@@ -51,7 +47,7 @@ const states = ref();
@@ -62,8 +58,7 @@ const states = ref();
:label="t('invoiceOut.params.min')"
dense
lazy-rules
- outlined
- rounded
+ filled
type="number"
v-model.number="params.min"
/>
@@ -73,8 +68,7 @@ const states = ref();
:label="t('invoiceOut.params.max')"
dense
lazy-rules
- outlined
- rounded
+ filled
type="number"
v-model.number="params.max"
/>
@@ -94,7 +88,7 @@ const states = ref();
@@ -103,15 +97,14 @@ const states = ref();
{
serialTypesOptions.value = Array.from(
- new Set(data.map((item) => item.type).filter((type) => type))
+ new Set(data.map((item) => item.type).filter((type) => type)),
);
};
@@ -99,8 +99,7 @@ onMounted(async () => {
option-label="name"
hide-selected
dense
- outlined
- rounded
+ filled
data-cy="InvoiceOutGlobalClientSelect"
>
@@ -124,19 +123,18 @@ onMounted(async () => {
option-label="type"
hide-selected
dense
- outlined
- rounded
+ filled
data-cy="InvoiceOutGlobalSerialSelect"
/>
{
:options="companiesOptions"
option-label="code"
dense
- outlined
- rounded
+ filled
data-cy="InvoiceOutGlobalCompanySelect"
/>
{
v-model="formData.printer"
:options="printersOptions"
dense
- outlined
- rounded
+ filled
data-cy="InvoiceOutGlobalPrinterSelect"
/>
@@ -166,7 +162,7 @@ onMounted(async () => {
color="primary"
class="q-mt-md full-width"
unelevated
- rounded
+ filled
dense
/>
{
color="primary"
class="q-mt-md full-width"
unelevated
- rounded
+ filled
dense
@click="getStatus = 'stopping'"
/>
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
index b24c8b247..1e2f80ec2 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
@@ -35,17 +35,13 @@ const props = defineProps({
-
+
@@ -57,8 +53,7 @@ const props = defineProps({
option-label="code"
option-value="code"
dense
- outlined
- rounded
+ filled
@update:model-value="searchFn()"
>
@@ -84,9 +79,8 @@ const props = defineProps({
v-model="params.country"
option-label="name"
option-value="name"
- outlined
dense
- rounded
+ filled
@update:model-value="searchFn()"
>
@@ -110,9 +104,8 @@ const props = defineProps({
url="Clients"
:label="t('globals.client')"
v-model="params.clientId"
- outlined
dense
- rounded
+ filled
@update:model-value="searchFn()"
/>
@@ -122,7 +115,7 @@ const props = defineProps({
@@ -130,9 +123,8 @@ const props = defineProps({
{
- {
-
+
diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue
index ab26b9cae..87d42e25b 100644
--- a/src/pages/Item/Card/ItemTags.vue
+++ b/src/pages/Item/Card/ItemTags.vue
@@ -89,7 +89,6 @@ const insertTag = (rows) => {
:default-remove="false"
:user-filter="{
fields: ['id', 'itemFk', 'tagFk', 'value', 'priority'],
- where: { itemFk: route.params.id },
include: {
relation: 'tag',
scope: {
@@ -97,6 +96,7 @@ const insertTag = (rows) => {
},
},
}"
+ :filter="{ where: { itemFk: route.params.id } }"
order="priority"
auto-load
@on-fetch="onItemTagsFetched"
diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index 8d92e245d..d68b966c6 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -13,7 +13,6 @@ const props = defineProps({
required: true,
},
});
-
@@ -28,8 +27,7 @@ const props = defineProps({
:fields="['id', 'nickname']"
option-label="nickname"
dense
- outlined
- rounded
+ filled
use-input
@update:model-value="searchFn()"
sort-by="nickname ASC"
@@ -46,8 +44,7 @@ const props = defineProps({
:label="t('params.warehouseFk')"
v-model="params.warehouseFk"
dense
- outlined
- rounded
+ filled
use-input
@update:model-value="searchFn()"
/>
@@ -58,7 +55,7 @@ const props = defineProps({
@@ -68,7 +65,7 @@ const props = defineProps({
diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index 22e948e06..f4500d5fa 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -177,11 +177,7 @@ onMounted(async () => {
-
+
@@ -197,8 +193,7 @@ onMounted(async () => {
option-label="name"
hide-selected
dense
- outlined
- rounded
+ filled
/>
@@ -213,8 +208,7 @@ onMounted(async () => {
option-label="name"
hide-selected
dense
- outlined
- rounded
+ filled
>
@@ -240,8 +234,7 @@ onMounted(async () => {
option-label="nickname"
hide-selected
dense
- outlined
- rounded
+ filled
/>
@@ -252,8 +245,7 @@ onMounted(async () => {
@update:model-value="searchFn()"
hide-selected
dense
- outlined
- rounded
+ filled
/>
@@ -282,8 +274,7 @@ onMounted(async () => {
:options="tagOptions"
option-label="name"
dense
- outlined
- rounded
+ filled
:emit-value="false"
use-input
:is-clearable="false"
@@ -299,8 +290,7 @@ onMounted(async () => {
option-value="value"
option-label="value"
dense
- outlined
- rounded
+ filled
emit-value
use-input
:disable="!tag"
@@ -312,7 +302,7 @@ onMounted(async () => {
v-model="tag.value"
:label="t('params.value')"
:disable="!tag"
- is-outlined
+ filled
:is-clearable="false"
@keydown.enter.prevent="applyTags(params, searchFn)"
/>
@@ -351,8 +341,7 @@ onMounted(async () => {
option-label="label"
option-value="label"
dense
- outlined
- rounded
+ filled
:emit-value="false"
use-input
:is-clearable="false"
@@ -377,7 +366,7 @@ onMounted(async () => {
v-model="fieldFilter.value"
:label="t('params.value')"
:disable="!fieldFilter.selectedField"
- is-outlined
+ filled
@keydown.enter="applyFieldFilters(params, searchFn)"
/>
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index a29203df3..68f36c566 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -87,11 +87,7 @@ onMounted(async () => {
-
+
@@ -99,7 +95,7 @@ onMounted(async () => {
@@ -114,8 +110,7 @@ onMounted(async () => {
option-label="nickname"
hide-selected
dense
- outlined
- rounded
+ filled
/>
@@ -124,7 +119,7 @@ onMounted(async () => {
@@ -139,8 +134,7 @@ onMounted(async () => {
option-label="name"
hide-selected
dense
- outlined
- rounded
+ filled
/>
@@ -153,25 +147,16 @@ onMounted(async () => {
:params="{ departmentCodes: ['VT'] }"
hide-selected
dense
- outlined
- rounded
+ filled
/>
-
+
-
+
@@ -180,7 +165,7 @@ onMounted(async () => {
:label="t('params.daysOnward')"
v-model="params.daysOnward"
lazy-rules
- is-outlined
+ filled
/>
@@ -195,8 +180,7 @@ onMounted(async () => {
option-label="name"
hide-selected
dense
- outlined
- rounded
+ filled
/>
diff --git a/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue b/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue
index 972f4cad9..106b005bf 100644
--- a/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue
+++ b/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue
@@ -2,7 +2,7 @@
import { computed } from 'vue';
import { useRoute } from 'vue-router';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
import filter from './ItemTypeFilter.js';
@@ -25,7 +25,7 @@ const entityId = computed(() => {
});
- {
:value="entity.category?.name"
/>
-
+
diff --git a/src/pages/Item/components/ItemProposal.vue b/src/pages/Item/components/ItemProposal.vue
index d2dbea7b3..22c1d3d8b 100644
--- a/src/pages/Item/components/ItemProposal.vue
+++ b/src/pages/Item/components/ItemProposal.vue
@@ -6,10 +6,12 @@ import { toCurrency } from 'filters/index';
import VnStockValueDisplay from 'src/components/ui/VnStockValueDisplay.vue';
import VnTable from 'src/components/VnTable/VnTable.vue';
import axios from 'axios';
-import notifyResults from 'src/utils/notifyResults';
+import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
import FetchData from 'components/FetchData.vue';
+import { useState } from 'src/composables/useState';
const MATCH = 'match';
+const { notifyResults } = displayResults();
const { t } = useI18n();
const $props = defineProps({
@@ -18,14 +20,20 @@ const $props = defineProps({
required: true,
default: () => {},
},
+ filter: {
+ type: Object,
+ required: true,
+ default: () => {},
+ },
replaceAction: {
type: Boolean,
- required: false,
+ required: true,
default: false,
},
+
sales: {
type: Array,
- required: false,
+ required: true,
default: () => [],
},
});
@@ -36,6 +44,8 @@ const proposalTableRef = ref(null);
const sale = computed(() => $props.sales[0]);
const saleFk = computed(() => sale.value.saleFk);
const filter = computed(() => ({
+ where: $props.filter,
+
itemFk: $props.itemLack.itemFk,
sales: saleFk.value,
}));
diff --git a/src/pages/Item/components/ItemProposalProxy.vue b/src/pages/Item/components/ItemProposalProxy.vue
index 7da0ce398..27edd3670 100644
--- a/src/pages/Item/components/ItemProposalProxy.vue
+++ b/src/pages/Item/components/ItemProposalProxy.vue
@@ -1,13 +1,17 @@
@@ -54,12 +54,12 @@ const total = ref(0);
"
/>
-
+
diff --git a/src/pages/Order/Card/OrderFilter.vue b/src/pages/Order/Card/OrderFilter.vue
index 42578423f..5f91153ac 100644
--- a/src/pages/Order/Card/OrderFilter.vue
+++ b/src/pages/Order/Card/OrderFilter.vue
@@ -49,8 +49,7 @@ const sourceList = ref([]);
v-model="params.clientFk"
lazy-rules
dense
- outlined
- rounded
+ filled
/>
-
+
-
-
-
- {{ t('order.summary.basket') }} #{{ entity?.id }} -
- {{ entity?.client?.name }} ({{ entity?.clientFk }})
-
-
-
- {{ t('order.summary.confirmLines') }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ dashIfEmpty(entity?.address?.nickname) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ dashIfEmpty(entity?.address?.phone) }}
-
-
-
-
-
-
-
-
-
-
-
- {{ entity?.note }}
-
-
-
-
-
-
- {{ t('globals.subtotal') }}
-
-
- {{
- toCurrency(entity?.subTotal)
- }}
-
-
-
-
- {{ t('globals.vat') }}
-
-
- {{ toCurrency(entity?.VAT) }}
-
-
-
-
- {{ t('order.summary.total') }}
-
-
- {{ toCurrency(entity?.total) }}
-
-
-
-
-
-
-
-
- {{ t('globals.item') }}
- {{ t('globals.description') }}
- {{ t('globals.quantity') }}
- {{ t('globals.price') }}
- {{ t('order.summary.amount') }}
-
-
-
-
-
-
- {{ props.row.item?.id }}
-
-
-
-
-
-
- {{ props.row.item.name }}
-
- {{ props.row.item.subName }}
-
-
+
+
+ {{ t('order.summary.basket') }} #{{ entity?.id }} -
+ {{ entity?.client?.name }} ({{ entity?.clientFk }})
+
+
+
+ {{ t('order.summary.confirmLines') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dashIfEmpty(entity?.address?.nickname) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dashIfEmpty(entity?.address?.phone) }}
+
+
+
+
+
+
+
+
+
+ {{ entity?.note }}
+
+
+
+
+
+
+ {{ t('globals.subtotal') }}
+
+
+ {{ toCurrency(entity?.subTotal) }}
+
+
+
+
+ {{ t('globals.vat') }}
+
+
+ {{ toCurrency(entity?.VAT) }}
+
+
+
+
+ {{ t('order.summary.total') }}
+
+
+ {{ toCurrency(entity?.total) }}
+
+
+
+
+
+
+
+
+ {{ t('globals.item') }}
+ {{ t('globals.description') }}
+ {{ t('globals.quantity') }}
+ {{ t('globals.price') }}
+ {{ t('order.summary.amount') }}
+
+
+
+
+
+
+ {{ props.row.item?.id }}
+
+
+
+
+
+
+ {{ props.row.item.name }}
+
+ {{ props.row.item.subName }}
+
-
-
-
- {{ props.row.quantity }}
-
-
- {{ toCurrency(props.row.price) }}
-
-
- {{
- toCurrency(props.row?.quantity * props.row?.price)
- }}
-
-
-
-
-
-
-
-
diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index ffa964c92..c096dee21 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -5,7 +5,7 @@ import VnInput from 'src/components/common/VnInput.vue';
import TicketTransferForm from './TicketTransferForm.vue';
import { toDateFormat } from 'src/filters/date.js';
-const emit = defineEmits(['ticketTransfered']);
+const emit = defineEmits(['ticketTransferred']);
const $props = defineProps({
mana: {
diff --git a/src/pages/Ticket/Card/TicketTransferProxy.vue b/src/pages/Ticket/Card/TicketTransferProxy.vue
index 7d5d82f85..af3b13990 100644
--- a/src/pages/Ticket/Card/TicketTransferProxy.vue
+++ b/src/pages/Ticket/Card/TicketTransferProxy.vue
@@ -1,8 +1,8 @@
@@ -39,12 +29,11 @@ const getGroupedStates = (data) => {
{
-
+
-
+
@@ -82,7 +63,7 @@ const getGroupedStates = (data) => {
@@ -90,7 +71,7 @@ const getGroupedStates = (data) => {
@@ -98,9 +79,8 @@ const getGroupedStates = (data) => {
{
map-options
use-input
dense
- outlined
- rounded
+ filled
/>
@@ -136,29 +115,23 @@ const getGroupedStates = (data) => {
-
+
@@ -166,17 +139,13 @@ const getGroupedStates = (data) => {
-
+
@@ -215,16 +184,6 @@ const getGroupedStates = (data) => {
/>
-
-
-
-
-
@@ -241,8 +200,7 @@ const getGroupedStates = (data) => {
map-options
use-input
dense
- outlined
- rounded
+ filled
/>
@@ -260,8 +218,7 @@ const getGroupedStates = (data) => {
map-options
use-input
dense
- outlined
- rounded
+ filled
/>
@@ -281,8 +238,7 @@ const getGroupedStates = (data) => {
map-options
use-input
dense
- outlined
- rounded
+ filled
/>
@@ -291,7 +247,7 @@ const getGroupedStates = (data) => {
@@ -307,6 +263,7 @@ en:
orderFk: Order
from: From
shipped: Shipped
+ shippedDate: Shipped date
to: To
stateFk: State
groupedStates: Grouped State
@@ -326,7 +283,7 @@ en:
ON_PREPARATION: On preparation
PACKED: Packed
DELIVERED: Delivered
- ON_PREVIOUS: ON_PREVIOUS
+ ON_PREVIOUS: On previous
es:
params:
search: Contiene
@@ -334,6 +291,7 @@ es:
orderFk: Pedido
from: Desde
shipped: F. envío
+ shippedDate: F. envío
to: Hasta
stateFk: Estado
groupedStates: Estado agrupado
@@ -371,7 +329,7 @@ es:
ON_PREPARATION: En preparación
PACKED: Encajado
DELIVERED: Servido
- ON_PREVIOUS: ON_PREVIOUS
+ ON_PREVIOUS: En previa
Collection: Colección
Nickname: Nombre mostrado
diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
index 588379ed9..6ed3afcc6 100644
--- a/src/pages/Ticket/TicketFuture.vue
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -89,7 +89,7 @@ const ticketColumns = computed(() => [
},
{
label: t('advanceTickets.import'),
- name: 'import',
+ name: 'totalWithVat',
align: 'left',
headerClass: 'horizontal-separator',
columnFilter: false,
@@ -317,7 +317,7 @@ watch(
{{ dashIfEmpty(row.state) }}
-
+
@@ -82,7 +82,7 @@ onMounted(async () => {
@@ -91,7 +91,7 @@ onMounted(async () => {
@@ -100,7 +100,7 @@ onMounted(async () => {
@@ -115,8 +115,7 @@ onMounted(async () => {
:info="t('iptInfo')"
@update:model-value="searchFn()"
dense
- outlined
- rounded
+ filled
>
@@ -132,8 +131,7 @@ onMounted(async () => {
:info="t('iptInfo')"
@update:model-value="searchFn()"
dense
- outlined
- rounded
+ filled
>
@@ -148,8 +146,7 @@ onMounted(async () => {
option-label="name"
@update:model-value="searchFn()"
dense
- outlined
- rounded
+ filled
>
@@ -164,8 +161,7 @@ onMounted(async () => {
option-label="name"
@update:model-value="searchFn()"
dense
- outlined
- rounded
+ filled
>
@@ -191,8 +187,7 @@ onMounted(async () => {
option-label="name"
@update:model-value="searchFn()"
dense
- outlined
- rounded
+ filled
>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index c603246d1..096aa101c 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -119,15 +119,16 @@ const columns = computed(() => [
columnFilter: {
component: 'date',
},
- format: ({ shippedDate }) => toDate(shippedDate),
+ format: ({ shipped }) => toDate(shipped),
},
{
align: 'left',
- name: 'shipped',
+ name: 'shippedHour',
component: 'time',
columnFilter: false,
label: t('ticketList.hour'),
format: (row) => toTimeFormat(row.shipped),
+ orderBy: false,
},
{
align: 'left',
@@ -136,6 +137,7 @@ const columns = computed(() => [
columnFilter: false,
label: t('ticketList.closure'),
format: (row, dashIfEmpty) => dashIfEmpty(toTimeFormat(row.zoneLanding)),
+ orderBy: false,
},
{
align: 'left',
@@ -248,7 +250,7 @@ const columns = computed(() => [
name: 'TicketCard',
}).href;
window.open(url, '_blank');
- } else viewSummary(row.id, TicketSummary);
+ } else viewSummary(row.id, TicketSummary, 'lg-width');
},
},
],
@@ -340,25 +342,20 @@ async function makeInvoice(ticket) {
});
}
-async function sendDocuware(ticket) {
- try {
- let ticketIds = ticket.map((item) => item.id);
+async function sendDocuware(tickets) {
+ let ticketIds = tickets.map((item) => item.id);
- const { data } = await axios.post(`Docuwares/upload`, {
- fileCabinet: 'deliveryNote',
- ticketIds,
- });
+ const { data } = await axios.post(`Docuwares/upload-delivery-note`, {
+ ticketIds,
+ });
- for (let ticket of ticketIds) {
- ticket.stateFk = data.id;
- ticket.state = data.name;
- ticket.alertLevel = data.alertLevel;
- ticket.alertLevelCode = data.code;
- }
- notify('globals.dataSaved', 'positive');
- } catch (err) {
- console.err('err: ', err);
+ for (let ticket of tickets) {
+ ticket.stateFk = data.id;
+ ticket.state = data.name;
+ ticket.alertLevel = data.alertLevel;
+ ticket.alertLevelCode = data.code;
}
+ notify('globals.dataSaved', 'positive');
}
function openBalanceDialog(ticket) {
@@ -482,7 +479,7 @@ function setReference(data) {
prefix="card"
:array-data-props="{
url: 'Tickets/filter',
- order: ['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id'],
+ order: ['shipped DESC', 'id DESC'],
exprBuilder,
}"
>
@@ -520,10 +517,10 @@ function setReference(data) {
-
+
- {{ toDate(row.shippedDate) }}
+ {{ toDate(row.shipped) }}
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 9eb8ce8cb..175f0955b 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -205,6 +205,7 @@ ticketList:
toLines: Go to lines
addressNickname: Address nickname
ref: Reference
+ hour: Hour
rounding: Rounding
noVerifiedData: No verified data
purchaseRequest: Purchase request
@@ -235,6 +236,7 @@ negative:
minTimed: minTimed
negativeAction: Negative
totalNegative: Total negatives
+ availabled: Availabled
days: Days
buttonsUpdate:
item: Item
@@ -264,7 +266,7 @@ negative:
isRookie: Is rookie
turno: Turn line
isBasket: Basket
- hasObservation: Has substitution
+ hasObservation: Has substitution note
hasToIgnore: VIP
modal:
changeItem:
@@ -287,3 +289,4 @@ negative:
newTicket: New ticket
status: Result
message: Message
+ noSplit: No split
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 62013d9c5..3d03a7b33 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -216,7 +216,8 @@ ticketList:
negative:
hour: Hora
id: Id Articulo
- longName: Articulo
+ longName: Artículo
+ itemFk: Artículo
supplier: Productor
colour: Color
size: Medida
@@ -232,6 +233,7 @@ negative:
inkFk: Color
timed: Hora
date: Fecha
+ availabled: Disponible
minTimed: Hora
type: Tipo
negativeAction: Negativo
@@ -265,7 +267,7 @@ negative:
isRookie: Cliente nuevo
turno: Linea turno
isBasket: Cesta
- hasObservation: Tiene sustitución
+ hasObservation: Tiene nota de sustitución
hasToIgnore: VIP
modal:
changeItem:
@@ -284,10 +286,11 @@ negative:
title: Gestionar tickets spliteados
subTitle: Confir fecha y agencia
split:
- ticket: Ticket viejo
+ ticket: Ticket origen
newTicket: Ticket nuevo
status: Estado
message: Mensaje
+ noSplit: No se puede splitar
rounding: Redondeo
noVerifiedData: Sin datos comprobados
purchaseRequest: Petición de compra
diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
index 922f89f33..d57046bae 100644
--- a/src/pages/Travel/Card/TravelDescriptor.vue
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -3,7 +3,7 @@ import { computed, ref } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import useCardDescription from 'src/composables/useCardDescription';
import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue';
@@ -31,7 +31,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
- (data.value = useCardDescription(entity.ref, entity.
:to="{
name: 'TravelList',
query: {
- params: JSON.stringify({
+ table: JSON.stringify({
agencyModeFk: entity.agencyModeFk,
}),
},
@@ -79,7 +79,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
-
+
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index dbb997ccb..22e2cff86 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -1,5 +1,5 @@
@@ -281,70 +286,68 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ entry.supplierName }}
+
+
+
+
-
-
-
-
-
+
{{ toCurrency(entry.invoiceAmount) }}
{{ entry.reference }}
-
+
{{ entry.stickers }}
-
+
{{ entry.loadedkg }}
-
+
{{ entry.volumeKg }}
-
-
-
-
-
-
-
-
+
+
+ {{ entry.evaNotes }}
+
@@ -662,18 +629,21 @@ watch(route, () => {
}
:deep(.q-table) {
+ table-layout: auto;
+ width: 100%;
border-collapse: collapse;
+ overflow: hidden;
+ text-overflow: ellipsis;
- th {
- padding: 0;
- }
tbody tr td {
&:nth-child(1) {
max-width: 65px;
}
- &:nth-child(4) {
- padding: 0;
- }
+ padding: 0 5px 0;
+ }
+ thead > tr > th {
+ padding: 3px;
+ color: var(--vn-label-color);
}
}
diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index ae6e695be..76ffdba20 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -87,7 +87,7 @@ warehouses();
-
+
@@ -95,7 +95,7 @@ warehouses();
@@ -106,8 +106,7 @@ warehouses();
type="number"
:label="t('extraCommunity.filter.totalEntries')"
dense
- outlined
- rounded
+ filled
min="0"
class="input-number"
>
@@ -141,8 +140,7 @@ warehouses();
option-label="name"
hide-selected
dense
- outlined
- rounded
+ filled
/>
@@ -152,7 +150,7 @@ warehouses();
:label="t('extraCommunity.filter.shippedFrom')"
v-model="params.shippedFrom"
@update:model-value="searchFn()"
- is-outlined
+ filled
/>
@@ -162,7 +160,7 @@ warehouses();
:label="t('extraCommunity.filter.landedTo')"
v-model="params.landedTo"
@update:model-value="searchFn()"
- is-outlined
+ filled
/>
@@ -176,8 +174,7 @@ warehouses();
option-label="name"
hide-selected
dense
- outlined
- rounded
+ filled
/>
@@ -191,8 +188,7 @@ warehouses();
option-label="name"
hide-selected
dense
- outlined
- rounded
+ filled
/>
@@ -206,8 +202,7 @@ warehouses();
option-label="name"
hide-selected
dense
- outlined
- rounded
+ filled
/>
@@ -218,8 +213,7 @@ warehouses();
v-model="params.cargoSupplierFk"
hide-selected
dense
- outlined
- rounded
+ filled
/>
@@ -229,8 +223,7 @@ warehouses();
v-model="params.entrySupplierFk"
hide-selected
dense
- outlined
- rounded
+ filled
/>
@@ -245,8 +238,7 @@ warehouses();
:filter-options="['code', 'name']"
hide-selected
dense
- outlined
- rounded
+ filled
/>
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index d2cf6092d..5498fd269 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -33,19 +33,14 @@ defineExpose({ states });
-
+
diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index 48fc4094b..32edaa6e9 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -40,7 +40,7 @@ watch(
(newValue) => {
checkHolidays(newValue);
},
- { deep: true, immediate: true }
+ { deep: true, immediate: true },
);
const emit = defineEmits(['update:businessFk', 'update:year', 'update:absenceType']);
@@ -166,52 +166,44 @@ const yearList = ref(generateYears());
}}
+
+
+
+
+
+ # {{ scope.opt?.businessFk }}
+
+ {{ toDateFormat(scope.opt?.started) }} -
+ {{
+ scope.opt?.ended
+ ? toDateFormat(scope.opt?.ended)
+ : 'Indef.'
+ }}
+
+
+
+
+
+
{
};
- {
{
-
-
- {{ t('globals.phone') }}
+
+
-
-
- {{ t('worker.summary.sipExtension') }}
+
+
@@ -167,7 +165,7 @@ const handlePhotoUpdated = (evt = false) => {
-
+
-
-
-
-
-
-
-
-
-
-
-
- {{ t('worker.pda.removePDA') }}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
- ID: {{ scope.opt?.id }}
-
- {{ scope.opt?.modelFk }},
- {{ scope.opt?.serialNumber }}
-
-
-
-
-
-
-
-
-
-
+
+ {{ t('worker.pda.removePDA') }}
+
-
- {{ t('globals.new') }}
-
-
-
+
+
+ {{ t('worker.pda.sendToTablet') }}
+
+
+
+
+ {{ t('globals.downloadPdf') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID: {{ scope.opt?.id }}
+
+ {{ scope.opt?.modelFk }},
+ {{ scope.opt?.serialNumber }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('globals.new') }}
+
+
-
es:
Model: Modelo
@@ -190,4 +309,7 @@ es:
Do you want to remove this PDA?: ¿Desea eliminar este PDA?
You can only have one PDA: Solo puedes tener un PDA si no eres autonomo
This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
+ Are you sure you want to send it?: ¿Seguro que quieres enviarlo?
+ Sign PDA: Firmar PDA
+ PDF sended to signed: PDF enviado para firmar
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index ad78a3fb9..96d5220f5 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -48,82 +48,91 @@ onBeforeMount(async () => {
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
-
-
-
-
- {{ t('worker.summary.phoneExtension') }}
-
-
-
-
-
- {{ t('worker.summary.entPhone') }}
-
-
-
-
-
- {{ t('worker.summary.personalPhone') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
{
formInitialData: {},
}"
table-height="85vh"
+ v-model:selected="selectedRows"
+ :table="{
+ 'row-key': 'id',
+ selection: 'multiple',
+ }"
>
{{ dashIfEmpty(formatRow(row)) }}
@@ -271,6 +317,21 @@ const exprBuilder = (param, value) => {
+
+
+
+