Compare commits
No commits in common. "dev" and "8621-createCmrListE2eTest" have entirely different histories.
dev
...
8621-creat
211
CHANGELOG.md
211
CHANGELOG.md
|
@ -1,214 +1,3 @@
|
|||
# Version 25.12 - 2025-03-25
|
||||
|
||||
### Added 🆕
|
||||
|
||||
- chore: add junit-merge dependency to package.json by:alexm
|
||||
- chore: downgrade version from 25.14.0 to 25.12.0 in package.json by:alexm
|
||||
- chore: reduce page load timeout in Cypress configuration by:alexm
|
||||
- chore: refs #6695 update Cypress to version 14.1.0 and simplify test execution in Jenkinsfile by:alexm
|
||||
- chore: refs #8602 add comments for clarity in Cypress commands file by:pablone
|
||||
- chore: refs #8602 enhance Cypress support files with detailed comments and organization by:pablone
|
||||
- ci: refs #6695 feat jenkins parallel e2e by:alexm
|
||||
- feat: integrate vue-router to enhance routing capabilities in ZoneCard component by:alexm
|
||||
- feat: refs #6695 implement parallel Cypress testing and enhance timeout configurations by:alexm
|
||||
- feat: refs #6695 update Cypress parallel test execution to use 3 instances by:alexm
|
||||
- feat: refs #6802 add dash placeholder for empty department names in InvoiceOut list by:jgallego
|
||||
- feat: refs #6802 add DepartmentDescriptorProxy to InvoiceOutList and update translations by:jgallego
|
||||
- feat: refs #6802 add DepartmentDescriptorProxy to various components and update department handling by:jgallego
|
||||
- feat: refs #7587 add 'ticketClaimed' translation and implement claims retrieval in TicketDescriptor by:jtubau
|
||||
- feat: refs #7949 show new field in ticket sales by:Jon
|
||||
- feat: refs #8045 added new logic to show the correct icon and the correct path to redirect by:Jon
|
||||
- feat: refs #8045 modified icon and route to redirect from CardDescriptor by:Jon
|
||||
- feat: refs #8074 modified spinner size by:Jon
|
||||
- feat: refs #8600 added calendar e2e and modified basic data by:Jon
|
||||
- feat: refs #8600 added deliveryDays and modified warehouse E2Es by:Jon
|
||||
- feat: refs #8600 added new tests for zoneSummary & zoneLocations by:provira
|
||||
- feat: refs #8602 add custom Cypress commands for improved element interaction and request handling by:pablone
|
||||
- feat: refs #8602 add new Cypress command for clicking buttons with icons by:pablone
|
||||
- feat: refs #8602 add remove functionality for tag filters in EntryBuys component by:pablone
|
||||
- feat: refs #8602 add sorting options for select fields and update locale files with supplier name by:pablone
|
||||
- feat: refs #8602 refactor EntryBuys component and enhance observation tests by:pablone
|
||||
- feat: refs #8602 remove unused state property from useArrayDataStore by:pablone
|
||||
- feat: refs #8602 remove unused URL property from VnTable in ClaimList component by:pablone
|
||||
- feat: refs #8602 skip warehouse creation and removal test in ZoneWarehouse spec by:pablone
|
||||
- feat: refs #8602 streamline beforeSaveFn execution in CrudModel component by:pablone
|
||||
- feat: refs #8602 streamline beforeSaveFn execution in VnTable component by:pablone
|
||||
- feat: refs #8602 streamline filter logic in EntryBuys component by:pablone
|
||||
- feat: refs #8602 update entry components and tests, add data-cy attributes for Cypress integration by:pablone
|
||||
- feat: refs #8602 update localization for purchased spaces and enhance Entry components with new labels by:pablone
|
||||
- feat: refs #8606 adapt module to VnCatdBeta by:Jon
|
||||
- feat: refs #8612 added summary button & changed e2e tests by:provira
|
||||
- feat: refs #8612 changed shelving to VnTable & created e2e tests by:provira
|
||||
- feat: refs #8616 add summary prop to CardDescriptor in RoadmapDescriptor and WorkerDescriptor by:jtubau
|
||||
- feat: refs #8616 add VnCheckbox component to VnFilter and update prop types in VnFilterPanel and VnSearchbar by:jtubau
|
||||
- feat: refs #8630 add Agency and Vehicle descriptor components with summary props by:jtubau
|
||||
- feat: refs #8638 add AWB field to travel and entry forms, update translations and styles by:pablone
|
||||
- feat: refs #8638 add data attributes for transfer buys functionality in EntryBuys.vue and corresponding tests by:pablone
|
||||
- feat: refs #8648 enhance roadmapList tests with improved selectors and additional scenarios by:jtubau
|
||||
- feat: refs #8664 add CmrFilter component and integrate it into CmrList for enhanced filtering options by:jtubau
|
||||
- feat: refs #8721 add ticket navigation and update route columns by:jtubau
|
||||
- feat: run.sh build neccessary images by:alexm
|
||||
- feat: update Jenkinsfile to pull Docker images for back and db services by:alexm
|
||||
- feat: update labels and add department selection in InvoiceOut filter and list by:jgallego
|
||||
- refactor: refs #8626 update button styles and improve route redirection logic by:jtubau
|
||||
- style: refs #8041 new variable by:benjaminedc
|
||||
|
||||
### Changed 📦
|
||||
|
||||
- feat: refs #8602 refactor EntryBuys component and enhance observation tests by:pablone
|
||||
- refactor(cypress): refs #6695 simplify parallel test execution script by:alexm
|
||||
- refactor: deleted useless (origin/Warmfix-DepartmentIcon) by:Jon
|
||||
- refactor: refs #6695 enable ClaimNotes test suite by:alexm
|
||||
- refactor: refs #6695 fix invoiceOutSummary by:alexm
|
||||
- refactor: refs #6695 improve notification check and extend waitForElement timeout by:alexm
|
||||
- refactor: refs #6695 remove mocha dependency and optimize Cypress command execution by:alexm
|
||||
- refactor: refs #6695 skips by:alexm
|
||||
- refactor: refs #6695 skip zoneWarehouse by:alexm
|
||||
- refactor: refs #6695 streamline Cypress test execution and remove deprecated configurations by:alexm
|
||||
- refactor: refs #6802 replace salesPerson references with department in claims and tickets by:jgallego
|
||||
- refactor: refs #6802 replace 'salesPerson' terminology with 'team' across multiple locales and components by:jgallego
|
||||
- refactor: refs #6802 update import paths for DepartmentDescriptorProxy to use Worker directory by:jgallego
|
||||
- refactor: refs #6802 update InvoiceOutNegativeBases to use Department instead of Worker by:jgallego
|
||||
- refactor: refs #6802 update TicketFilter and TicketSale components to use departmentFk and adjust API endpoints by:jgallego
|
||||
- refactor: refs #8041 unify class link and unify titles to VnTitles by:benjaminedc
|
||||
- refactor: refs #8045 modified icon and module const by:Jon
|
||||
- refactor: refs #8197 rename VnCardBeta to VnCard by:alexm
|
||||
- refactor: refs #8197 simplify menu retrieval logic in LeftMenu component by:alexm
|
||||
- refactor: refs #8322 changed Wagon component to use VnSection/VnCardBeta by:provira
|
||||
- refactor: refs #8322 remove keyBinding from Wagon router module by:alexm
|
||||
- refactor: refs #8322 update WagonCard component and routing structure by:alexm
|
||||
- refactor: refs #8370 modified function to get the correct date by:Jon
|
||||
- refactor: refs #8472 remove added div and add class to VnInput by:jtubau
|
||||
- refactor: refs #8472 unified styling for the more-create-dialog slot to ensure consistency across all scenarios by:jtubau
|
||||
- refactor: refs #8472 update class names from q-span-2 to col-span-2 for consistency in layout by:jtubau
|
||||
- refactor: refs #8600 changed test case description by:provira
|
||||
- refactor: refs #8600 modified make invoice and send dialog e2es by:Jon
|
||||
- refactor: refs #8600 modified upcomingDeliveries e2e and created deliveryDays by:Jon
|
||||
- refactor: refs #8600 modified zoneSummary e2e by:Jon
|
||||
- refactor: refs #8602 remove redundant date input test from entryList.spec.js by:pablone
|
||||
- refactor: refs #8606 clear some warnings by:Jon
|
||||
- refactor: refs #8606 deleted code and fixed translation by:Jon
|
||||
- refactor: refs #8606 merged previous and e2e changes and corrected minor errors by:Jon
|
||||
- refactor: refs #8606 requested changes by:Jon
|
||||
- refactor: refs #8616 integrate summary dialog and update navigation in Agency and Vehicle components by:jtubau
|
||||
- refactor: refs #8616 integrate VnSelectWorker component in RouteList and optimize format functions by:jtubau
|
||||
- refactor: refs #8616 simplify template bindings and improve link generation in VehicleSummary by:jtubau
|
||||
- refactor: refs #8616 update routing components for AgencyList and RouteRoadmap in route.js by:jtubau
|
||||
- refactor: refs #8619 simplify empty data check in RouteDescriptor component by:jtubau
|
||||
- refactor: refs #8626 add cardVisible property to RouteList columns by:jtubau
|
||||
- refactor: refs #8626 add formatting for agency and vehicle columns in RouteList by:jtubau
|
||||
- refactor: refs #8626 enhance Worker and Agency components with data attributes and improved routing by:jtubau
|
||||
- refactor: refs #8626 improve test messages and selectors in route tests by:jtubau
|
||||
- refactor: refs #8626 update button styles and improve route redirection logic by:jtubau
|
||||
- refactor: refs #8626 update RouteList columns and enable AgencyWorkCenter tests by:jtubau
|
||||
- refactor: refs #8630 add vehicle translations and enhance route list columns by:jtubau
|
||||
- refactor: refs #8648 update roadmap deletion test to use current element text by:jtubau
|
||||
- refactor: refs #8664 enhance CmrList component with query initialization and user parameters by:jtubau
|
||||
- refactor: refs #8664 localization files by:jtubau
|
||||
- refactor: refs #8664 remove CmrFilter and replace with VnSearchbar in CmrList by:jtubau
|
||||
- refactor: remove unnecessary login and reload calls in ClaimDevelopment tests by:alexm
|
||||
- refactor: simplify client selection in order creation test by:alexm
|
||||
- refactor: update client ID input selector and remove viewport setting by:alexm
|
||||
- test: refs #8197 comment out ticket list tests for refactoring by:alexm
|
||||
- test: refs #8626 refactor notification check in routeList.spec.js by:jtubau
|
||||
- test: refs #8626 refactor routeList.spec.js to use a constant for summary URL by:jtubau
|
||||
- test: refs #8626 refactor routeList.spec.js to use selectors and improve readability by:jtubau
|
||||
|
||||
### Fixed 🛠️
|
||||
|
||||
- fix: add --init flag to Docker container for Cypress tests by:alexm
|
||||
- fix: agency list filters by:jtubau
|
||||
- fix: align Article label to the left in EntryBuys component by:alexm
|
||||
- fix: card descriptor imports by:Jon
|
||||
- fix: card descriptor merge by:Jon
|
||||
- fix(ClaimAction): update shelving options to use URL instead of static data by:jgallego
|
||||
- fix(ClaimSummary): clean url by:alexm
|
||||
- fix(cypress.config.js): refs #6695 update reporter to junit and remove unused dependencies by:alexm
|
||||
- fix(cypressParallel.sh): refs #6695 improve script readability by:alexm
|
||||
- fix(cypressParallel.sh): refs #6695 improve test execution output for clarity by:alexm
|
||||
- fix(cypressParallel.sh): refs #6695 simplify test execution output format by:alexm
|
||||
- fix(cypress scripts): refs #6695 improve cleanup process and adjust output redirection by:alexm
|
||||
- fix: fixed department descriptor icon by:Jon
|
||||
- fix: fixed submodule descriptors icons by:Jon
|
||||
- fix(invoiceOutSummary.spec.js): refs #6695 remove unnecessary visibility check for descriptor by:alexm
|
||||
- fix(Jenkinsfile): reduce parallel Cypress test execution from 3 to 2 by:alexm
|
||||
- fix(Jenkinsfile): refs #6695 add credentials for Docker login in E2E stage by:alexm
|
||||
- fix(Jenkinsfile): refs #6695 change parallel test execution from 4 to 2 by:alexm
|
||||
- fix(Jenkinsfile): refs #6695 increase parallel test execution from 2 to 4 by:alexm
|
||||
- fix(Jenkinsfile): refs #6695 update parallel test execution to 4 by:alexm
|
||||
- fix(LeftMenu): refs #8197 handle missing children in findRoute and update menu structure by:alexm
|
||||
- fix: refs #6695 update Cypress configuration and test result paths by:alexm
|
||||
- fix: refs #6695 update Jenkinsfile to build Docker image correctly and modify logout test visit method by:alexm
|
||||
- fix: refs #6695 update Jenkinsfile to remove specific e2e XML files and adjust Cypress parallel execution by:alexm
|
||||
- fix: refs #6695 update Jenkinsfile to source cypressParallel.sh correctly by:alexm
|
||||
- fix: refs #6695 update visit method in TicketLackDetail.spec.js to prevent page reload by:alexm
|
||||
- fix: refs #6802 update import path for DepartmentDescriptorProxy in OrderList.vue by:jgallego
|
||||
- fix: refs #6802 update OrderFilter to use department relation instead of salesPerson by:jgallego
|
||||
- fix: refs #8041 update redirection from preview to summary in ShelvingList tests by:benjaminedc
|
||||
- fix: refs #8041 update selector for summary header in ParkingList tests by:benjaminedc
|
||||
- fix: refs #8041 update summaryHeader selector in ParkingList test by:benjaminedc
|
||||
- fix: refs #8322 update order property for WagonList component by:alexm
|
||||
- fix: refs #8370 change param rely on month by:Jon
|
||||
- fix: refs #8417 added data-cy to all files and fixed test by:provira
|
||||
- fix: refs #8417 added data-cy to delete button by:provira
|
||||
- fix: refs #8417 fixed claimPhoto e2e by:provira
|
||||
- fix: refs #8417 fixed claimPhoto e2e test by:provira
|
||||
- fix: refs #8417 fixed e2e test by:provira
|
||||
- fix: refs #8417 fixed e2e test case by:provira
|
||||
- fix: refs #8417 fixed failing test case by:provira
|
||||
- fix: refs #8417 fixed invoiceOutSummary e2e test by:provira
|
||||
- fix: refs #8417 removed .only by:provira
|
||||
- fix: refs #8583 basicData, business, summary by:carlossa
|
||||
- fix: refs #8583 basicData e2e by:carlossa
|
||||
- fix: refs #8583 basicData timeControl by:carlossa
|
||||
- fix: refs #8583 cypressconf by:carlossa
|
||||
- fix: refs #8583 dataCy operator by:carlossa
|
||||
- fix: refs #8583 fix AddCard by:carlossa
|
||||
- fix: refs #8583 mutual create by:carlossa
|
||||
- fix: refs #8583 operator by:carlossa
|
||||
- fix: refs #8583 remove workerTimeControl by:carlossa
|
||||
- fix: refs #8583 tMutual, tNotes, TOperator by:carlossa
|
||||
- fix: refs #8583 wBusiness by:carlossa
|
||||
- fix: refs #8583 wBusiness e2e by:carlossa
|
||||
- fix: refs #8583 workerBasicData & workerTimeControl by:carlossa
|
||||
- fix: refs #8583 workerBusiness by:carlossa
|
||||
- fix: refs #8583 workerBusiness e2e by:carlossa
|
||||
- fix: refs #8583 workerBusiness test by:carlossa
|
||||
- fix: refs #8583 workerE2E by:carlossa
|
||||
- fix: refs #8583 worker mutual e2e by:carlossa
|
||||
- fix: refs #8583 workerSummary test by:carlossa
|
||||
- fix: refs #8583 workerTimeControl by:carlossa
|
||||
- fix: refs #8583 workerTimeControl e2e by:carlossa
|
||||
- fix: refs #8600 e2e by:Jon
|
||||
- fix: refs #8600 fixed calendar e2e by:Jon
|
||||
- fix: refs #8600 fixed e2e and skip client ones by:Jon
|
||||
- fix: refs #8600 fixed e2e by:Jon
|
||||
- fix: refs #8600 fixed invoiceOut summary e2e by:Jon
|
||||
- fix: refs #8600 fixed zoneList & added test case to zoneSummary by:provira
|
||||
- fix: refs #8600 zone basic data e2e and skip intermitent invoice out summary it by:Jon
|
||||
- fix: refs #8602 delete unused entryDms and stockBought test files (origin/8581-e2eInvoiceIn) by:pablone
|
||||
- fix: refs #8606 deleted code by:Jon
|
||||
- fix: refs #8612 changed QCheckbox for VnCheckbox by:provira
|
||||
- fix: refs #8612 fixed shelving e2e tests by:provira
|
||||
- fix: refs #8616 add conditional for SupplierDescriptorProxy and bind attributes in CardDescriptor by:jtubau
|
||||
- fix: refs #8616 remove redundant v-on binding from QCheckbox in VnCheckbox.vue by:jtubau
|
||||
- fix: refs #8616 update binding syntax for is-editable prop in AgencyList.vue by:jtubau
|
||||
- fix: refs #8616 update FormModel prop from 'update-url' to 'url-update' in Agency and RoadMap BasicData by:jtubau
|
||||
- fix: refs #8619 handle empty ticket records in RouteDescriptor component by:jtubau
|
||||
- fix: refs #8619 update route descriptor to handle empty ticket records and adjust test cases by:jtubau
|
||||
- fix: refs #8626 remove duplicate ref attribute from RouteList.vue by:jtubau
|
||||
- fix: refs #8630 remove duplicated locations by:jtubau
|
||||
- fix: refs #8638 restore invoiceInBasicData by:pablone
|
||||
- fix: refs #8638 update comment formatting in VnTable.vue by:pablone
|
||||
- fix: refs #8638 update null check for maxlength validation in VnInput.vue by:pablone
|
||||
- fix: simplify menu structure in monitor router module (origin/fix_monitor_leftMenu) by:Javier Segarra
|
||||
- refactor: refs #6695 fix invoiceOutSummary by:alexm
|
||||
- refactor: refs #8606 deleted code and fixed translation by:Jon
|
||||
- test: fix intermitent e2e by:alexm
|
||||
- test: fix orderList e2e, unestables by:alexm
|
||||
- test(OrderList): fix inconsistency by:alexm
|
||||
- test(TicketList): fix inconsistency by:alexm
|
||||
|
||||
# Version 25.10 - 2025-03-11
|
||||
|
||||
### Added 🆕
|
||||
|
|
|
@ -126,7 +126,7 @@ pipeline {
|
|||
sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
|
||||
|
||||
image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
|
||||
sh 'sh test/cypress/cypressParallel.sh 2'
|
||||
sh 'sh test/cypress/cypressParallel.sh 1'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -49,9 +49,3 @@ pnpm run test:e2e:summary
|
|||
```bash
|
||||
quasar build
|
||||
```
|
||||
|
||||
### Serve the app for production
|
||||
|
||||
```bash
|
||||
quasar build quasar serve dist/spa --host 0.0.0.0 --proxy=./proxy-serve.js
|
||||
```
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "salix-front",
|
||||
"version": "25.16.0",
|
||||
"version": "25.14.0",
|
||||
"description": "Salix frontend",
|
||||
"productName": "Salix",
|
||||
"author": "Verdnatura",
|
||||
|
@ -76,4 +76,4 @@
|
|||
"vite": "^6.0.11",
|
||||
"vitest": "^0.31.1"
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,5 +1,5 @@
|
|||
<script setup>
|
||||
import { onMounted, ref, computed } from 'vue';
|
||||
import { onMounted, ref } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useState } from 'src/composables/useState';
|
||||
import { useStateStore } from 'stores/useStateStore';
|
||||
|
@ -18,14 +18,6 @@ const state = useState();
|
|||
const user = state.getUser();
|
||||
const appName = 'Lilium';
|
||||
const pinnedModulesRef = ref();
|
||||
const hostname = window.location.hostname;
|
||||
const env = ref();
|
||||
|
||||
const getEnvironment = computed(() => {
|
||||
env.value = hostname.split('-');
|
||||
if (env.value.length <= 1) return;
|
||||
return env.value[0];
|
||||
});
|
||||
|
||||
onMounted(() => stateStore.setMounted());
|
||||
const refresh = () => window.location.reload();
|
||||
|
@ -57,9 +49,6 @@ const refresh = () => window.location.reload();
|
|||
{{ t('globals.backToDashboard') }}
|
||||
</QTooltip>
|
||||
</QBtn>
|
||||
<QBadge v-if="getEnvironment" color="primary" align="top">
|
||||
{{ getEnvironment }}
|
||||
</QBadge>
|
||||
</RouterLink>
|
||||
<VnBreadcrumbs v-if="$q.screen.gt.sm" />
|
||||
<QSpinner
|
||||
|
|
|
@ -17,6 +17,17 @@ defineProps({ row: { type: Object, required: true } });
|
|||
</QTooltip>
|
||||
</QIcon>
|
||||
</router-link>
|
||||
<QIcon
|
||||
v-if="row?.reserved"
|
||||
color="primary"
|
||||
name="vn:reserva"
|
||||
size="xs"
|
||||
data-cy="ticketSaleReservedIcon"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ t('ticketSale.reserved') }}
|
||||
</QTooltip>
|
||||
</QIcon>
|
||||
<QIcon
|
||||
v-if="row?.isDeleted"
|
||||
color="primary"
|
||||
|
|
|
@ -55,8 +55,6 @@ const $props = defineProps({
|
|||
},
|
||||
});
|
||||
|
||||
const label = $props.showLabel && $props.column.label ? $props.column.label : '';
|
||||
|
||||
const defaultSelect = {
|
||||
attrs: {
|
||||
row: $props.row,
|
||||
|
@ -64,7 +62,7 @@ const defaultSelect = {
|
|||
class: 'fit',
|
||||
},
|
||||
forceAttrs: {
|
||||
label,
|
||||
label: $props.showLabel && $props.column.label,
|
||||
},
|
||||
};
|
||||
|
||||
|
@ -76,7 +74,7 @@ const defaultComponents = {
|
|||
class: 'fit',
|
||||
},
|
||||
forceAttrs: {
|
||||
label,
|
||||
label: $props.showLabel && $props.column.label,
|
||||
},
|
||||
},
|
||||
number: {
|
||||
|
@ -86,7 +84,7 @@ const defaultComponents = {
|
|||
class: 'fit',
|
||||
},
|
||||
forceAttrs: {
|
||||
label,
|
||||
label: $props.showLabel && $props.column.label,
|
||||
},
|
||||
},
|
||||
date: {
|
||||
|
@ -98,7 +96,7 @@ const defaultComponents = {
|
|||
class: 'fit',
|
||||
},
|
||||
forceAttrs: {
|
||||
label,
|
||||
label: $props.showLabel && $props.column.label,
|
||||
},
|
||||
},
|
||||
time: {
|
||||
|
@ -107,7 +105,7 @@ const defaultComponents = {
|
|||
disable: !$props.isEditable,
|
||||
},
|
||||
forceAttrs: {
|
||||
label,
|
||||
label: $props.showLabel && $props.column.label,
|
||||
},
|
||||
},
|
||||
checkbox: {
|
||||
|
@ -127,7 +125,7 @@ const defaultComponents = {
|
|||
return defaultAttrs;
|
||||
},
|
||||
forceAttrs: {
|
||||
label,
|
||||
label: $props.showLabel && $props.column.label,
|
||||
autofocus: true,
|
||||
},
|
||||
events: {
|
||||
|
|
|
@ -70,7 +70,7 @@ function textAlignToFlex(textAlign) {
|
|||
:style="textAlignToFlex(align)"
|
||||
>
|
||||
<span :title="label">{{ label }}</span>
|
||||
<div v-if="name && (model?.index || vertical)">
|
||||
<div v-if="name && model?.index">
|
||||
<QChip
|
||||
:label="!vertical ? model?.index : ''"
|
||||
:icon="
|
||||
|
@ -83,14 +83,14 @@ function textAlignToFlex(textAlign) {
|
|||
:size="vertical ? '' : 'sm'"
|
||||
:class="[
|
||||
model?.index ? 'color-vn-text' : 'bg-transparent',
|
||||
vertical ? 'q-mx-none q-py-lg' : '',
|
||||
vertical ? 'q-px-none' : '',
|
||||
]"
|
||||
class="no-box-shadow"
|
||||
:clickable="true"
|
||||
style="min-width: 40px; max-height: 30px"
|
||||
>
|
||||
<div
|
||||
class="column justify-center text-center"
|
||||
class="column flex-center"
|
||||
v-if="vertical"
|
||||
:style="!model?.index && 'color: #5d5d5d'"
|
||||
>
|
||||
|
|
|
@ -897,7 +897,7 @@ const rowCtrlClickFunction = computed(() => {
|
|||
{{ row[splittedColumns.title.name] }}
|
||||
</span>
|
||||
</QCardSection>
|
||||
<!-- Fields -->
|
||||
<!-- Fields -->
|
||||
<QCardSection
|
||||
class="q-pl-sm q-py-xs"
|
||||
:class="$props.cardClass"
|
||||
|
@ -1156,7 +1156,7 @@ es:
|
|||
|
||||
.grid-create {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(150px, max-content));
|
||||
grid-template-columns: 1fr 1fr;
|
||||
max-width: 100%;
|
||||
grid-gap: 20px;
|
||||
margin: 0 auto;
|
||||
|
|
|
@ -26,12 +26,7 @@ function columnName(col) {
|
|||
}
|
||||
</script>
|
||||
<template>
|
||||
<VnFilterPanel
|
||||
v-bind="$attrs"
|
||||
:search-button="true"
|
||||
:disable-submit-event="true"
|
||||
:search-url
|
||||
>
|
||||
<VnFilterPanel v-bind="$attrs" :search-button="true" :disable-submit-event="true">
|
||||
<template #body="{ params, orders, searchFn }">
|
||||
<div
|
||||
class="container"
|
||||
|
@ -39,20 +34,13 @@ function columnName(col) {
|
|||
:key="col.id"
|
||||
>
|
||||
<div class="filter">
|
||||
<slot
|
||||
:name="`filter-${col.name}`"
|
||||
:params="params"
|
||||
:column-name="columnName(col)"
|
||||
:search-fn
|
||||
>
|
||||
<VnFilter
|
||||
ref="tableFilterRef"
|
||||
:column="col"
|
||||
:data-key="$attrs['data-key']"
|
||||
v-model="params[columnName(col)]"
|
||||
:search-url="searchUrl"
|
||||
/>
|
||||
</slot>
|
||||
<VnFilter
|
||||
ref="tableFilterRef"
|
||||
:column="col"
|
||||
:data-key="$attrs['data-key']"
|
||||
v-model="params[columnName(col)]"
|
||||
:search-url="searchUrl"
|
||||
/>
|
||||
</div>
|
||||
<div class="order">
|
||||
<VnTableOrder
|
||||
|
@ -89,13 +77,13 @@ function columnName(col) {
|
|||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
min-height: 45px;
|
||||
height: 45px;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.filter {
|
||||
width: 70%;
|
||||
min-height: 40px;
|
||||
height: 40px;
|
||||
text-align: center;
|
||||
}
|
||||
.order {
|
||||
|
|
|
@ -60,7 +60,7 @@ async function confirm() {
|
|||
v-model="address"
|
||||
is-outlined
|
||||
autofocus
|
||||
data-cy="SendEmailNotificationDialogInput"
|
||||
data-cy="SendEmailNotifiactionDialogInput"
|
||||
/>
|
||||
</QCardSection>
|
||||
<QCardActions align="right">
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
<script setup>
|
||||
import { useDialogPluginComponent } from 'quasar';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { computed, ref } from 'vue';
|
||||
import {useDialogPluginComponent} from 'quasar';
|
||||
import {useI18n} from 'vue-i18n';
|
||||
import {computed, ref} from 'vue';
|
||||
import VnInput from 'components/common/VnInput.vue';
|
||||
import axios from 'axios';
|
||||
import useNotify from 'composables/useNotify';
|
||||
import useNotify from "composables/useNotify";
|
||||
|
||||
const MESSAGE_MAX_LENGTH = 160;
|
||||
|
||||
const { t } = useI18n();
|
||||
const { notify } = useNotify();
|
||||
const {t} = useI18n();
|
||||
const {notify} = useNotify();
|
||||
const props = defineProps({
|
||||
title: {
|
||||
type: String,
|
||||
|
@ -34,7 +34,7 @@ const props = defineProps({
|
|||
});
|
||||
|
||||
const emit = defineEmits([...useDialogPluginComponent.emits, 'sent']);
|
||||
const { dialogRef, onDialogHide } = useDialogPluginComponent();
|
||||
const {dialogRef, onDialogHide} = useDialogPluginComponent();
|
||||
|
||||
const smsRules = [
|
||||
(val) => (val && val.length > 0) || t("The message can't be empty"),
|
||||
|
@ -43,10 +43,10 @@ const smsRules = [
|
|||
t("The message it's too long"),
|
||||
];
|
||||
|
||||
const message = ref(t('routeDelay'));
|
||||
const message = ref('');
|
||||
|
||||
const charactersRemaining = computed(
|
||||
() => MESSAGE_MAX_LENGTH - new Blob([message.value]).size,
|
||||
() => MESSAGE_MAX_LENGTH - new Blob([message.value]).size
|
||||
);
|
||||
|
||||
const charactersChipColor = computed(() => {
|
||||
|
@ -114,7 +114,7 @@ const onSubmit = async () => {
|
|||
<QTooltip>
|
||||
{{
|
||||
t(
|
||||
'Special characters like accents counts as a multiple',
|
||||
'Special characters like accents counts as a multiple'
|
||||
)
|
||||
}}
|
||||
</QTooltip>
|
||||
|
@ -144,10 +144,7 @@ const onSubmit = async () => {
|
|||
max-width: 450px;
|
||||
}
|
||||
</style>
|
||||
|
||||
<i18n>
|
||||
en:
|
||||
routeDelay: "Your order has been delayed in transit.\nDelivery will take place throughout the day.\nWe apologize for the inconvenience and appreciate your patience."
|
||||
es:
|
||||
Message: Mensaje
|
||||
Send: Enviar
|
||||
|
@ -156,5 +153,4 @@ es:
|
|||
The destination can't be empty: El destinatario no puede estar vacio
|
||||
The message can't be empty: El mensaje no puede estar vacio
|
||||
The message it's too long: El mensaje es demasiado largo
|
||||
routeDelay: "Retraso en ruta.\nInformamos que la ruta que lleva su pedido ha sufrido un retraso y la entrega se hará a lo largo del día.\nDisculpe las molestias."
|
||||
</i18n>
|
||||
</i18n>
|
||||
|
|
|
@ -1,14 +1,35 @@
|
|||
<script setup>
|
||||
import { nextTick, ref } from 'vue';
|
||||
import VnInput from './VnInput.vue';
|
||||
import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
|
||||
|
||||
const $props = defineProps({
|
||||
insertable: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(['update:modelValue', 'accountShortToStandard']);
|
||||
const model = defineModel({ prop: 'modelValue' });
|
||||
const inputRef = ref(false);
|
||||
|
||||
function setCursorPosition(pos) {
|
||||
const input = inputRef.value.vnInputRef.$el.querySelector('input');
|
||||
input.focus();
|
||||
input.setSelectionRange(pos, pos);
|
||||
}
|
||||
|
||||
async function handleUpdateModel(val) {
|
||||
model.value = val?.at(-1) === '.' ? useAccountShortToStandard(val) : val;
|
||||
await nextTick(() => setCursorPosition(0));
|
||||
}
|
||||
</script>
|
||||
<template>
|
||||
<VnInput
|
||||
v-model="model"
|
||||
ref="inputRef"
|
||||
@keydown.tab="model = useAccountShortToStandard($event.target.value) ?? model"
|
||||
@input="model = $event.target.value.replace(/[^\d.]/g, '')"
|
||||
:insertable
|
||||
@update:model-value="handleUpdateModel"
|
||||
/>
|
||||
</template>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<script setup>
|
||||
import { onBeforeMount, computed, markRaw } from 'vue';
|
||||
import { onBeforeMount, computed } from 'vue';
|
||||
import { useRoute, useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
|
||||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
import { useStateStore } from 'stores/useStateStore';
|
||||
|
@ -26,14 +26,18 @@ const route = useRoute();
|
|||
const stateStore = useStateStore();
|
||||
const router = useRouter();
|
||||
const entityId = computed(() => props.id || route?.params?.id);
|
||||
let arrayData = getArrayData(entityId.value, props.url);
|
||||
const arrayData = useArrayData(props.dataKey, {
|
||||
url: props.url,
|
||||
userFilter: props.filter,
|
||||
oneRecord: true,
|
||||
});
|
||||
|
||||
onBeforeRouteLeave(() => {
|
||||
stateStore.cardDescriptorChangeValue(null);
|
||||
});
|
||||
|
||||
onBeforeMount(async () => {
|
||||
stateStore.cardDescriptorChangeValue(markRaw(props.descriptor));
|
||||
stateStore.cardDescriptorChangeValue(props.descriptor);
|
||||
|
||||
const route = router.currentRoute.value;
|
||||
try {
|
||||
|
@ -57,31 +61,16 @@ onBeforeRouteUpdate(async (to, from) => {
|
|||
});
|
||||
|
||||
async function fetch(id, append = false) {
|
||||
const regex = /\/(\d+)/;
|
||||
if (props.idInWhere) arrayData.store.filter.where = { id };
|
||||
else {
|
||||
arrayData = getArrayData(id);
|
||||
}
|
||||
else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
|
||||
else arrayData.store.url = props.url.replace(regex, `/${id}`);
|
||||
await arrayData.fetch({ append, updateRouter: false });
|
||||
emit('onFetch', arrayData.store.data);
|
||||
}
|
||||
function hasRouteParam(params, valueToCheck = ':addressId') {
|
||||
return Object.values(params).includes(valueToCheck);
|
||||
}
|
||||
|
||||
function formatUrl(id) {
|
||||
const newId = id || entityId.value;
|
||||
const regex = /\/(\d+)/;
|
||||
if (!regex.test(props.url)) return `${props.url}/${newId}`;
|
||||
return props.url.replace(regex, `/${newId}`);
|
||||
}
|
||||
|
||||
function getArrayData(id, url) {
|
||||
return useArrayData(props.dataKey, {
|
||||
url: url ?? formatUrl(id),
|
||||
userFilter: props.filter,
|
||||
oneRecord: true,
|
||||
});
|
||||
}
|
||||
</script>
|
||||
<template>
|
||||
<template v-if="visual">
|
||||
|
|
|
@ -35,10 +35,6 @@ const $props = defineProps({
|
|||
type: String,
|
||||
default: null,
|
||||
},
|
||||
hasFile: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
});
|
||||
|
||||
const warehouses = ref();
|
||||
|
@ -94,7 +90,6 @@ function defaultData() {
|
|||
if ($props.formInitialData) return (dms.value = $props.formInitialData);
|
||||
return addDefaultData({
|
||||
reference: route.params.id,
|
||||
hasFile: $props.hasFile,
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -1,166 +0,0 @@
|
|||
<script setup>
|
||||
import VnConfirm from '../ui/VnConfirm.vue';
|
||||
import VnInput from './VnInput.vue';
|
||||
import VnDms from './VnDms.vue';
|
||||
import axios from 'axios';
|
||||
import { useQuasar } from 'quasar';
|
||||
import { ref } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { downloadFile } from 'src/composables/downloadFile';
|
||||
|
||||
const { t } = useI18n();
|
||||
const quasar = useQuasar();
|
||||
const documentDialogRef = ref({});
|
||||
const editDownloadDisabled = ref(false);
|
||||
const $props = defineProps({
|
||||
defaultDmsCode: {
|
||||
type: String,
|
||||
default: 'invoiceIn',
|
||||
},
|
||||
disable: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
data: {
|
||||
type: Object,
|
||||
default: null,
|
||||
},
|
||||
formRef: {
|
||||
type: Object,
|
||||
default: null,
|
||||
},
|
||||
});
|
||||
|
||||
function deleteFile(dmsFk) {
|
||||
quasar
|
||||
.dialog({
|
||||
component: VnConfirm,
|
||||
componentProps: {
|
||||
title: t('globals.confirmDeletion'),
|
||||
message: t('globals.confirmDeletionMessage'),
|
||||
},
|
||||
})
|
||||
.onOk(async () => {
|
||||
await axios.post(`dms/${dmsFk}/removeFile`);
|
||||
$props.formRef.formData.dmsFk = null;
|
||||
$props.formRef.formData.dms = undefined;
|
||||
$props.formRef.hasChanges = true;
|
||||
$props.formRef.save();
|
||||
});
|
||||
}
|
||||
</script>
|
||||
<template>
|
||||
<div class="row no-wrap">
|
||||
<VnInput
|
||||
:label="t('Document')"
|
||||
v-model="data.dmsFk"
|
||||
clearable
|
||||
clear-icon="close"
|
||||
class="full-width"
|
||||
:disable="disable"
|
||||
/>
|
||||
<div
|
||||
v-if="data.dmsFk"
|
||||
class="row no-wrap q-pa-xs q-gutter-x-xs"
|
||||
data-cy="dms-buttons"
|
||||
>
|
||||
<QBtn
|
||||
:disable="editDownloadDisabled"
|
||||
@click="downloadFile(data.dmsFk)"
|
||||
icon="cloud_download"
|
||||
color="primary"
|
||||
flat
|
||||
:class="{
|
||||
'no-pointer-events': editDownloadDisabled,
|
||||
}"
|
||||
padding="xs"
|
||||
round
|
||||
>
|
||||
<QTooltip>{{ t('Download file') }}</QTooltip>
|
||||
</QBtn>
|
||||
<QBtn
|
||||
:disable="editDownloadDisabled"
|
||||
@click="
|
||||
() => {
|
||||
documentDialogRef.show = true;
|
||||
documentDialogRef.dms = data.dms;
|
||||
}
|
||||
"
|
||||
icon="edit"
|
||||
color="primary"
|
||||
flat
|
||||
:class="{
|
||||
'no-pointer-events': editDownloadDisabled,
|
||||
}"
|
||||
padding="xs"
|
||||
round
|
||||
>
|
||||
<QTooltip>{{ t('Edit document') }}</QTooltip>
|
||||
</QBtn>
|
||||
<QBtn
|
||||
:disable="editDownloadDisabled"
|
||||
@click="deleteFile(data.dmsFk)"
|
||||
icon="delete"
|
||||
color="primary"
|
||||
flat
|
||||
round
|
||||
:class="{
|
||||
'no-pointer-events': editDownloadDisabled,
|
||||
}"
|
||||
padding="xs"
|
||||
>
|
||||
<QTooltip>{{ t('Delete file') }}</QTooltip>
|
||||
</QBtn>
|
||||
</div>
|
||||
<QBtn
|
||||
v-else
|
||||
icon="add_circle"
|
||||
color="primary"
|
||||
flat
|
||||
round
|
||||
v-shortcut="'+'"
|
||||
padding="xs"
|
||||
@click="
|
||||
() => {
|
||||
documentDialogRef.show = true;
|
||||
delete documentDialogRef.dms;
|
||||
}
|
||||
"
|
||||
data-cy="dms-create"
|
||||
>
|
||||
<QTooltip>{{ t('Create document') }}</QTooltip>
|
||||
</QBtn>
|
||||
</div>
|
||||
<QDialog v-model="documentDialogRef.show">
|
||||
<VnDms
|
||||
model="dms"
|
||||
:default-dms-code="defaultDmsCode"
|
||||
:form-initial-data="documentDialogRef.dms"
|
||||
:url="
|
||||
documentDialogRef.dms
|
||||
? `Dms/${documentDialogRef.dms.id}/updateFile`
|
||||
: 'Dms/uploadFile'
|
||||
"
|
||||
:description="documentDialogRef.supplierName"
|
||||
@on-data-saved="
|
||||
(_, { data }) => {
|
||||
let dmsData = data;
|
||||
if (Array.isArray(data)) dmsData = data[0];
|
||||
formRef.formData.dmsFk = dmsData.id;
|
||||
formRef.formData.dms = dmsData;
|
||||
formRef.hasChanges = true;
|
||||
formRef.save();
|
||||
}
|
||||
"
|
||||
/>
|
||||
</QDialog>
|
||||
</template>
|
||||
<i18n>
|
||||
es:
|
||||
Document: Documento
|
||||
Download file: Descargar archivo
|
||||
Edit document: Editar documento
|
||||
Delete file: Eliminar archivo
|
||||
Create document: Crear documento
|
||||
|
||||
</i18n>
|
|
@ -1,53 +0,0 @@
|
|||
<script setup>
|
||||
import { ref } from 'vue';
|
||||
import VnSelect from './VnSelect.vue';
|
||||
|
||||
const stateBtnDropdownRef = ref();
|
||||
|
||||
const emit = defineEmits(['changeState']);
|
||||
|
||||
const $props = defineProps({
|
||||
disable: {
|
||||
type: Boolean,
|
||||
default: null,
|
||||
},
|
||||
options: {
|
||||
type: Array,
|
||||
default: null,
|
||||
},
|
||||
optionLabel: {
|
||||
type: String,
|
||||
default: 'name',
|
||||
},
|
||||
optionValue: {
|
||||
type: String,
|
||||
default: 'id',
|
||||
},
|
||||
});
|
||||
|
||||
async function changeState(value) {
|
||||
stateBtnDropdownRef.value?.hide();
|
||||
emit('changeState', value);
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<QBtnDropdown
|
||||
ref="stateBtnDropdownRef"
|
||||
color="black"
|
||||
text-color="white"
|
||||
:label="$t('globals.changeState')"
|
||||
:disable="$props.disable"
|
||||
>
|
||||
<VnSelect
|
||||
:options="$props.options"
|
||||
:option-label="$props.optionLabel"
|
||||
:option-value="$props.optionValue"
|
||||
hide-selected
|
||||
hide-dropdown-icon
|
||||
focus-on-mount
|
||||
@update:model-value="changeState"
|
||||
>
|
||||
</VnSelect>
|
||||
</QBtnDropdown>
|
||||
</template>
|
|
@ -84,7 +84,7 @@ const mixinRules = [
|
|||
...($attrs.rules ?? []),
|
||||
(val) => {
|
||||
const maxlength = $props.maxlength;
|
||||
if (maxlength && +val?.length > maxlength)
|
||||
if (maxlength && +val.length > maxlength)
|
||||
return t(`maxLength`, { value: maxlength });
|
||||
const { min, max } = vnInputRef.value.$attrs;
|
||||
if (!min) return null;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<script setup>
|
||||
import { ref, onMounted, onUnmounted, watch, computed } from 'vue';
|
||||
import { ref, onUnmounted, watch } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useRoute, useRouter } from 'vue-router';
|
||||
import axios from 'axios';
|
||||
|
@ -11,11 +11,11 @@ import { useCapitalize } from 'src/composables/useCapitalize';
|
|||
import { useValidator } from 'src/composables/useValidator';
|
||||
import VnAvatar from '../ui/VnAvatar.vue';
|
||||
import VnLogValue from './VnLogValue.vue';
|
||||
import FetchData from '../FetchData.vue';
|
||||
import VnSelect from './VnSelect.vue';
|
||||
import VnUserLink from '../ui/VnUserLink.vue';
|
||||
import VnPaginate from '../ui/VnPaginate.vue';
|
||||
import VnLogFilter from 'src/components/common/VnLogFilter.vue';
|
||||
import RightMenu from './RightMenu.vue';
|
||||
import { useFilterParams } from 'src/composables/useFilterParams';
|
||||
|
||||
const stateStore = useStateStore();
|
||||
const validationsStore = useValidator();
|
||||
|
@ -72,8 +72,39 @@ const filter = {
|
|||
};
|
||||
|
||||
const paginate = ref();
|
||||
const dataKey = computed(() => `${props.model}Log`);
|
||||
const userParams = ref(useFilterParams(dataKey.value).params);
|
||||
const actions = ref();
|
||||
const changeInput = ref();
|
||||
const searchInput = ref();
|
||||
const userRadio = ref();
|
||||
const userSelect = ref();
|
||||
const dateFrom = ref();
|
||||
const dateFromDialog = ref(false);
|
||||
const dateTo = ref();
|
||||
const dateToDialog = ref(false);
|
||||
const selectedFilters = ref({});
|
||||
const userTypes = [
|
||||
{ label: 'All', value: undefined },
|
||||
{ label: 'User', value: { neq: null } },
|
||||
{ label: 'System', value: null },
|
||||
];
|
||||
const checkboxOptions = ref({
|
||||
insert: {
|
||||
label: 'Creates',
|
||||
selected: false,
|
||||
},
|
||||
update: {
|
||||
label: 'Edits',
|
||||
selected: false,
|
||||
},
|
||||
delete: {
|
||||
label: 'Deletes',
|
||||
selected: false,
|
||||
},
|
||||
select: {
|
||||
label: 'Accesses',
|
||||
selected: false,
|
||||
},
|
||||
});
|
||||
|
||||
let validations = models;
|
||||
let pointRecord = ref(null);
|
||||
|
@ -215,55 +246,131 @@ async function setLogTree(data) {
|
|||
function filterByRecord(modelLog) {
|
||||
byRecord.value = true;
|
||||
const { id, model } = modelLog;
|
||||
applyFilter({ changedModelId: id, changedModel: model });
|
||||
|
||||
searchInput.value = id;
|
||||
selectedFilters.value.changedModelId = id;
|
||||
selectedFilters.value.changedModel = model;
|
||||
applyFilter();
|
||||
}
|
||||
|
||||
async function applyFilter(params = {}) {
|
||||
paginate.value.arrayData.resetPagination();
|
||||
paginate.value.arrayData.applyFilter({
|
||||
filter: {},
|
||||
params: { originFk: route.params.id, ...params },
|
||||
});
|
||||
async function applyFilter() {
|
||||
filter.where = { and: [] };
|
||||
if (
|
||||
!selectedFilters.value.changedModel ||
|
||||
(!selectedFilters.value.changedModelValue &&
|
||||
!selectedFilters.value.changedModelId)
|
||||
)
|
||||
byRecord.value = false;
|
||||
|
||||
if (!byRecord.value) filter.where.and.push({ originFk: route.params.id });
|
||||
|
||||
if (Object.keys(selectedFilters.value).length) {
|
||||
filter.where.and.push(selectedFilters.value);
|
||||
}
|
||||
|
||||
paginate.value.fetch({ filter });
|
||||
}
|
||||
|
||||
function exprBuilder(param, value) {
|
||||
switch (param) {
|
||||
case 'changedModelValue':
|
||||
return { [param]: { like: `%${value}%` } };
|
||||
case 'change':
|
||||
if (value)
|
||||
return {
|
||||
or: [
|
||||
{ oldJson: { like: `%${value}%` } },
|
||||
{ newJson: { like: `%${value}%` } },
|
||||
{ description: { like: `%${value}%` } },
|
||||
],
|
||||
};
|
||||
break;
|
||||
case 'action':
|
||||
if (value?.length) return { [param]: { inq: value } };
|
||||
break;
|
||||
function setDate(type) {
|
||||
let from = dateFrom.value
|
||||
? date.formatDate(dateFrom.value.split('-').reverse().join('-'), 'YYYY-MM-DD')
|
||||
: undefined;
|
||||
from = date.adjustDate(from, { hour: 0, minute: 0, second: 0, millisecond: 0 }, true);
|
||||
|
||||
let to = dateTo.value
|
||||
? date.formatDate(dateTo.value.split('-').reverse().join('-'), 'YYYY-MM-DD')
|
||||
: date.formatDate(dateFrom.value.split('-').reverse().join('-'), 'YYYY-MM-DD');
|
||||
to = date.adjustDate(
|
||||
to,
|
||||
{ hour: 21, minute: 59, second: 59, millisecond: 999 },
|
||||
true,
|
||||
);
|
||||
|
||||
switch (type) {
|
||||
case 'from':
|
||||
return { creationDate: { gte: value } };
|
||||
case 'to':
|
||||
return { creationDate: { lte: value } };
|
||||
case 'userType':
|
||||
if (value === 'User') return { userFk: { neq: null } };
|
||||
if (value === 'System') return { userFk: null };
|
||||
break;
|
||||
default:
|
||||
return { [param]: value };
|
||||
return { between: [from, to] };
|
||||
case 'to': {
|
||||
if (dateFrom.value) {
|
||||
return {
|
||||
between: [from, to],
|
||||
};
|
||||
}
|
||||
return { lte: to };
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function selectFilter(type, dateType) {
|
||||
const filter = {};
|
||||
const actions = { inq: [] };
|
||||
let reload = true;
|
||||
|
||||
if (type === 'search') {
|
||||
if (/^\s*[0-9]+\s*$/.test(searchInput.value) || props.byRecord) {
|
||||
selectedFilters.value.changedModelId = searchInput.value.trim();
|
||||
} else if (!searchInput.value) {
|
||||
selectedFilters.value.changedModelId = undefined;
|
||||
selectedFilters.value.changedModelValue = undefined;
|
||||
} else {
|
||||
selectedFilters.value.changedModelValue = { like: `%${searchInput.value}%` };
|
||||
}
|
||||
}
|
||||
if (type === 'action' && selectedFilters.value.changedModel === null) {
|
||||
selectedFilters.value.changedModel = undefined;
|
||||
}
|
||||
if (type === 'userRadio') {
|
||||
selectedFilters.value.userFk = userRadio.value;
|
||||
}
|
||||
if (type === 'change') {
|
||||
if (changeInput.value)
|
||||
selectedFilters.value.or = [
|
||||
{ oldJson: { like: `%${changeInput.value}%` } },
|
||||
{ newJson: { like: `%${changeInput.value}%` } },
|
||||
{ description: { like: `%${changeInput.value}%` } },
|
||||
];
|
||||
else selectedFilters.value.or = undefined;
|
||||
}
|
||||
if (type === 'userSelect') {
|
||||
selectedFilters.value.userFk =
|
||||
userSelect.value !== null ? userSelect.value : undefined;
|
||||
}
|
||||
if (type === 'date') {
|
||||
if (!dateFrom.value && !dateTo.value) {
|
||||
selectedFilters.value.creationDate = undefined;
|
||||
} else if (dateType === 'to') {
|
||||
selectedFilters.value.creationDate = setDate('to');
|
||||
} else if (dateType === 'from') {
|
||||
selectedFilters.value.creationDate = setDate('from');
|
||||
}
|
||||
}
|
||||
|
||||
Object.keys(checkboxOptions.value).forEach((key) => {
|
||||
if (checkboxOptions.value[key].selected) actions.inq.push(key);
|
||||
});
|
||||
selectedFilters.value.action = actions.inq.length ? actions : undefined;
|
||||
|
||||
Object.keys(selectedFilters.value).forEach((key) => {
|
||||
if (selectedFilters.value[key]) filter[key] = selectedFilters.value[key];
|
||||
});
|
||||
|
||||
if (reload) applyFilter(filter);
|
||||
}
|
||||
|
||||
async function clearFilter() {
|
||||
selectedFilters.value = {};
|
||||
byRecord.value = false;
|
||||
userSelect.value = undefined;
|
||||
searchInput.value = undefined;
|
||||
changeInput.value = undefined;
|
||||
dateFrom.value = undefined;
|
||||
dateTo.value = undefined;
|
||||
userRadio.value = undefined;
|
||||
Object.keys(checkboxOptions.value).forEach(
|
||||
(opt) => (checkboxOptions.value[opt].selected = false),
|
||||
);
|
||||
await applyFilter();
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
stateStore.rightDrawerChangeValue(true);
|
||||
});
|
||||
onUnmounted(() => {
|
||||
stateStore.rightDrawer = false;
|
||||
});
|
||||
|
@ -276,18 +383,32 @@ watch(
|
|||
);
|
||||
</script>
|
||||
<template>
|
||||
<FetchData
|
||||
:url="`${props.model}Logs/${route.params.id}/models`"
|
||||
:filter="{ order: ['changedModel'] }"
|
||||
@on-fetch="
|
||||
(data) =>
|
||||
(actions = data.map((item) => {
|
||||
const changedModel = item.changedModel;
|
||||
return {
|
||||
locale: useCapitalize(
|
||||
validations[changedModel]?.locale?.name ?? changedModel,
|
||||
),
|
||||
value: changedModel,
|
||||
};
|
||||
}))
|
||||
"
|
||||
auto-load
|
||||
/>
|
||||
<VnPaginate
|
||||
ref="paginate"
|
||||
:data-key
|
||||
:url="dataKey + 's'"
|
||||
:data-key="`${model}Log`"
|
||||
:url="`${model}Logs`"
|
||||
:user-filter="filter"
|
||||
:skeleton="false"
|
||||
auto-load
|
||||
@on-fetch="setLogTree"
|
||||
@on-change="setLogTree"
|
||||
search-url="logs"
|
||||
:exprBuilder
|
||||
:order="['creationDate DESC', 'id DESC']"
|
||||
>
|
||||
<template #body>
|
||||
<div
|
||||
|
@ -346,7 +467,6 @@ watch(
|
|||
backgroundColor: useColor(modelLog.model),
|
||||
}"
|
||||
:title="`${modelLog.model} #${modelLog.id}`"
|
||||
data-cy="vnLog-model-chip"
|
||||
>
|
||||
{{ t(modelLog.modelI18n) }}
|
||||
</QChip>
|
||||
|
@ -441,7 +561,9 @@ watch(
|
|||
}}:
|
||||
</span>
|
||||
<VnLogValue
|
||||
:value="value.val"
|
||||
:value="
|
||||
value.val.val
|
||||
"
|
||||
:name="value.name"
|
||||
/>
|
||||
</QItem>
|
||||
|
@ -460,7 +582,6 @@ watch(
|
|||
}`,
|
||||
)
|
||||
"
|
||||
data-cy="vnLog-action-icon"
|
||||
/>
|
||||
</div>
|
||||
</QItem>
|
||||
|
@ -495,7 +616,7 @@ watch(
|
|||
{{ prop.nameI18n }}:
|
||||
</span>
|
||||
<VnLogValue
|
||||
:value="prop.val"
|
||||
:value="prop.val.val"
|
||||
:name="prop.name"
|
||||
/>
|
||||
<span
|
||||
|
@ -526,7 +647,7 @@ watch(
|
|||
</span>
|
||||
<span v-if="log.action == 'update'">
|
||||
<VnLogValue
|
||||
:value="prop.old"
|
||||
:value="prop.old.val"
|
||||
:name="prop.name"
|
||||
/>
|
||||
<span
|
||||
|
@ -537,7 +658,7 @@ watch(
|
|||
</span>
|
||||
→
|
||||
<VnLogValue
|
||||
:value="prop.val"
|
||||
:value="prop.val.val"
|
||||
:name="prop.name"
|
||||
/>
|
||||
<span
|
||||
|
@ -549,7 +670,7 @@ watch(
|
|||
</span>
|
||||
<span v-else="prop.old.val">
|
||||
<VnLogValue
|
||||
:value="prop.val"
|
||||
:value="prop.val.val"
|
||||
:name="prop.name"
|
||||
/>
|
||||
<span
|
||||
|
@ -578,12 +699,181 @@ watch(
|
|||
</VnPaginate>
|
||||
<RightMenu>
|
||||
<template #right-panel>
|
||||
<VnLogFilter :data-key />
|
||||
<QList dense>
|
||||
<QSeparator />
|
||||
<QItem class="q-mt-sm">
|
||||
<QInput
|
||||
:label="t('globals.search')"
|
||||
v-model="searchInput"
|
||||
class="full-width"
|
||||
clearable
|
||||
filled
|
||||
clear-icon="close"
|
||||
@keyup.enter="() => selectFilter('search')"
|
||||
@focusout="() => selectFilter('search')"
|
||||
@clear="() => selectFilter('search')"
|
||||
>
|
||||
<template #append>
|
||||
<QIcon name="info" class="cursor-pointer">
|
||||
<QTooltip>{{ t('tooltips.search') }}</QTooltip>
|
||||
</QIcon>
|
||||
</template>
|
||||
</QInput>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<VnSelect
|
||||
class="full-width"
|
||||
:label="t('globals.entity')"
|
||||
v-model="selectedFilters.changedModel"
|
||||
option-label="locale"
|
||||
option-value="value"
|
||||
filled
|
||||
:options="actions"
|
||||
@update:model-value="selectFilter('action')"
|
||||
hide-selected
|
||||
/>
|
||||
</QItem>
|
||||
<QItem class="q-mt-sm">
|
||||
<QOptionGroup
|
||||
size="sm"
|
||||
v-model="userRadio"
|
||||
:options="userTypes"
|
||||
color="primary"
|
||||
@update:model-value="selectFilter('userRadio')"
|
||||
right-label
|
||||
>
|
||||
<template #label="{ label }">
|
||||
{{ t(`Users.${label}`) }}
|
||||
</template>
|
||||
</QOptionGroup>
|
||||
</QItem>
|
||||
<QItem class="q-mt-sm">
|
||||
<QItemSection v-if="userRadio !== null">
|
||||
<VnSelect
|
||||
class="full-width"
|
||||
:label="t('globals.user')"
|
||||
v-model="userSelect"
|
||||
filled
|
||||
:url="`${model}Logs/${route.params.id}/editors`"
|
||||
:fields="['id', 'nickname', 'name', 'image']"
|
||||
sort-by="nickname"
|
||||
@update:model-value="selectFilter('userSelect')"
|
||||
hide-selected
|
||||
>
|
||||
<template #option="{ opt, itemProps }">
|
||||
<QItem
|
||||
v-bind="itemProps"
|
||||
class="q-pa-xs row items-center"
|
||||
>
|
||||
<QItemSection class="col-3 items-center">
|
||||
<VnAvatar :worker-id="opt.id" />
|
||||
</QItemSection>
|
||||
<QItemSection class="col-9 justify-center">
|
||||
<span>{{ opt.name }}</span>
|
||||
<span class="text-grey">{{ opt.nickname }}</span>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
</template>
|
||||
</VnSelect>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem class="q-mt-sm">
|
||||
<QInput
|
||||
:label="t('globals.changes')"
|
||||
v-model="changeInput"
|
||||
class="full-width"
|
||||
filled
|
||||
clearable
|
||||
clear-icon="close"
|
||||
@keyup.enter="selectFilter('change')"
|
||||
@focusout="selectFilter('change')"
|
||||
@clear="selectFilter('change')"
|
||||
>
|
||||
<template #append>
|
||||
<QIcon name="info" class="cursor-pointer">
|
||||
<QTooltip max-width="250px">{{
|
||||
t('tooltips.changes')
|
||||
}}</QTooltip>
|
||||
</QIcon>
|
||||
</template>
|
||||
</QInput>
|
||||
</QItem>
|
||||
<QItem
|
||||
:class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
|
||||
v-for="(checkboxOption, index) in checkboxOptions"
|
||||
:key="index"
|
||||
>
|
||||
<QCheckbox
|
||||
size="sm"
|
||||
v-model="checkboxOption.selected"
|
||||
:label="t(`actions.${checkboxOption.label}`)"
|
||||
@update:model-value="selectFilter"
|
||||
/>
|
||||
</QItem>
|
||||
<QItem class="q-mt-sm">
|
||||
<QInput
|
||||
class="full-width"
|
||||
:label="t('globals.date')"
|
||||
@click="dateFromDialog = true"
|
||||
@focus="(evt) => evt.target.blur()"
|
||||
@clear="selectFilter('date', 'to')"
|
||||
v-model="dateFrom"
|
||||
clearable
|
||||
filled
|
||||
clear-icon="close"
|
||||
/>
|
||||
</QItem>
|
||||
<QItem class="q-mt-sm">
|
||||
<QInput
|
||||
class="full-width"
|
||||
:label="t('globals.to')"
|
||||
@click="dateToDialog = true"
|
||||
@focus="(evt) => evt.target.blur()"
|
||||
@clear="selectFilter('date', 'from')"
|
||||
v-model="dateTo"
|
||||
clearable
|
||||
filled
|
||||
clear-icon="close"
|
||||
/>
|
||||
</QItem>
|
||||
</QList>
|
||||
</template>
|
||||
</RightMenu>
|
||||
<QDialog v-model="dateFromDialog">
|
||||
<QDate
|
||||
:years-in-month-view="false"
|
||||
v-model="dateFrom"
|
||||
dense
|
||||
flat
|
||||
minimal
|
||||
filled
|
||||
@update:model-value="
|
||||
(value) => {
|
||||
dateFromDialog = false;
|
||||
dateFrom = date.formatDate(value, 'DD-MM-YYYY');
|
||||
selectFilter('date', 'from');
|
||||
}
|
||||
"
|
||||
/>
|
||||
</QDialog>
|
||||
<QDialog v-model="dateToDialog">
|
||||
<QDate
|
||||
v-model="dateTo"
|
||||
dense
|
||||
flat
|
||||
minimal
|
||||
@update:model-value="
|
||||
(value) => {
|
||||
dateToDialog = false;
|
||||
dateTo = date.formatDate(value, 'DD-MM-YYYY');
|
||||
selectFilter('date', 'to');
|
||||
}
|
||||
"
|
||||
/>
|
||||
</QDialog>
|
||||
<QPageSticky position="bottom-right" :offset="[25, 25]">
|
||||
<QBtn
|
||||
v-if="Object.keys(userParams).some((filter) => filter !== 'originFk')"
|
||||
v-if="Object.values(selectedFilters).some((filter) => filter !== undefined)"
|
||||
color="primary"
|
||||
icon="filter_alt_off"
|
||||
size="md"
|
||||
|
|
|
@ -1,249 +1,77 @@
|
|||
<script setup>
|
||||
import { ref } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import VnTableFilter from '../VnTable/VnTableFilter.vue';
|
||||
import VnSelect from './VnSelect.vue';
|
||||
import { useRoute } from 'vue-router';
|
||||
import VnInput from './VnInput.vue';
|
||||
import { ref, computed, watch } from 'vue';
|
||||
import VnInputDate from './VnInputDate.vue';
|
||||
import { useFilterParams } from 'src/composables/useFilterParams';
|
||||
import FetchData from '../FetchData.vue';
|
||||
import { useValidator } from 'src/composables/useValidator';
|
||||
import { useCapitalize } from 'src/composables/useCapitalize';
|
||||
import VnAvatar from '../ui/VnAvatar.vue';
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
|
||||
|
||||
const $props = defineProps({
|
||||
const { t } = useI18n();
|
||||
const props = defineProps({
|
||||
dataKey: {
|
||||
type: String,
|
||||
default: null,
|
||||
required: true,
|
||||
},
|
||||
});
|
||||
|
||||
const { t } = useI18n();
|
||||
const route = useRoute();
|
||||
const validationsStore = useValidator();
|
||||
const { models } = validationsStore;
|
||||
const entities = ref([]);
|
||||
const editors = ref([]);
|
||||
const userParams = ref(useFilterParams($props.dataKey).params);
|
||||
let validations = models;
|
||||
const userTypes = [
|
||||
{ value: 'All', label: t(`Users.All`) },
|
||||
{ value: 'User', label: t(`Users.User`) },
|
||||
{ value: 'System', label: t(`Users.System`) },
|
||||
];
|
||||
const checkboxOptions = ref([
|
||||
{ name: 'insert', label: 'Creates', selected: false },
|
||||
{ name: 'update', label: 'Edits', selected: false },
|
||||
{ name: 'delete', label: 'Deletes', selected: false },
|
||||
{ name: 'select', label: 'Accesses', selected: false },
|
||||
]);
|
||||
const columns = computed(() => [
|
||||
{ name: 'changedModelValue' },
|
||||
{ name: 'changedModel' },
|
||||
{ name: 'userType', orderBy: false },
|
||||
{ name: 'userFk' },
|
||||
{ name: 'change', orderBy: false },
|
||||
{ name: 'action' },
|
||||
{ name: 'from', orderBy: 'creationDate' },
|
||||
{ name: 'to', orderBy: 'creationDate' },
|
||||
]);
|
||||
|
||||
const userParamsWatcher = watch(
|
||||
() => userParams.value,
|
||||
(params) => {
|
||||
if (params.action) {
|
||||
params.action.forEach((option) => {
|
||||
checkboxOptions.value.find((o) => o.name === option).selected = true;
|
||||
});
|
||||
userParamsWatcher();
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
function getActions() {
|
||||
const actions = checkboxOptions.value
|
||||
.filter((option) => option.selected)
|
||||
?.map((o) => o.name);
|
||||
return actions.length ? actions : null;
|
||||
}
|
||||
const workers = ref();
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<FetchData
|
||||
:url="`${dataKey}s/${route.params.id}/models`"
|
||||
:filter="{ order: ['changedModel'] }"
|
||||
@on-fetch="
|
||||
(data) =>
|
||||
(entities = data.map((item) => {
|
||||
const changedModel = item.changedModel;
|
||||
return {
|
||||
locale: useCapitalize(
|
||||
validations[changedModel]?.locale?.name ?? changedModel,
|
||||
),
|
||||
value: changedModel,
|
||||
};
|
||||
}))
|
||||
"
|
||||
url="Workers/activeWithInheritedRole"
|
||||
:filter="{ where: { role: 'salesPerson' } }"
|
||||
@on-fetch="(data) => (workers = data)"
|
||||
auto-load
|
||||
/>
|
||||
<FetchData
|
||||
:url="`${dataKey}s/${route.params.id}/editors`"
|
||||
:filter="{ fields: ['id', 'nickname', 'name', 'image'] }"
|
||||
sort-by="nickname"
|
||||
@on-fetch="(data) => (editors = data)"
|
||||
auto-load
|
||||
/>
|
||||
<VnTableFilter
|
||||
v-if="dataKey"
|
||||
:data-key
|
||||
:columns="columns"
|
||||
:redirect="false"
|
||||
:hiddenTags="['originFk', 'creationDate']"
|
||||
search-url="logs"
|
||||
:showTagChips="false"
|
||||
>
|
||||
<template #filter-changedModelValue="{ params, columnName, searchFn }">
|
||||
<VnInput
|
||||
:label="t('globals.search')"
|
||||
v-model="params[columnName]"
|
||||
@keyup.enter="searchFn"
|
||||
@blur="searchFn"
|
||||
@remove="searchFn"
|
||||
:info="t('tooltips.search')"
|
||||
dense
|
||||
filled
|
||||
data-cy="vnLog-search"
|
||||
/>
|
||||
</template>
|
||||
<template #filter-changedModel="{ params, columnName, searchFn }">
|
||||
<VnSelect
|
||||
:label="t('globals.entity')"
|
||||
v-model="params[columnName]"
|
||||
option-label="locale"
|
||||
option-value="value"
|
||||
:options="entities"
|
||||
@update:model-value="() => searchFn()"
|
||||
dense
|
||||
filled
|
||||
data-cy="vnLog-entity"
|
||||
/>
|
||||
</template>
|
||||
<template #filter-userType="{ params, columnName, searchFn }">
|
||||
<QOptionGroup
|
||||
class="text-left"
|
||||
size="sm"
|
||||
v-model="params[columnName]"
|
||||
:options="userTypes"
|
||||
color="primary"
|
||||
@update:model-value="
|
||||
() => {
|
||||
params.userFk = null;
|
||||
searchFn();
|
||||
}
|
||||
"
|
||||
/>
|
||||
</template>
|
||||
<template #filter-userFk="{ params, columnName, searchFn }">
|
||||
<VnSelect
|
||||
:label="t('globals.user')"
|
||||
v-model="params[columnName]"
|
||||
:options="editors"
|
||||
@update:modelValue="() => searchFn()"
|
||||
:disable="params.userType === 'System'"
|
||||
dense
|
||||
filled
|
||||
>
|
||||
<template #option="{ opt, itemProps }">
|
||||
<QItem v-bind="itemProps" class="q-pa-xs row items-center">
|
||||
<QItemSection class="col-3 items-center">
|
||||
<VnAvatar :worker-id="opt.id" />
|
||||
</QItemSection>
|
||||
<QItemSection class="col-9 justify-center">
|
||||
<span>{{ opt.name }}</span>
|
||||
<span class="text-grey">{{ opt.nickname }}</span>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
</template>
|
||||
</VnSelect>
|
||||
</template>
|
||||
<template #filter-change="{ params, columnName, searchFn }">
|
||||
<VnInput
|
||||
:label="t('globals.changes')"
|
||||
v-model="params[columnName]"
|
||||
@keyup.enter="searchFn"
|
||||
@blur="searchFn"
|
||||
@remove="searchFn"
|
||||
:info="t('tooltips.changes')"
|
||||
dense
|
||||
filled
|
||||
/>
|
||||
</template>
|
||||
<template #filter-action="{ searchFn }">
|
||||
<div class="column">
|
||||
<QCheckbox
|
||||
v-for="checkboxOption in checkboxOptions"
|
||||
:key="checkboxOption"
|
||||
size="sm"
|
||||
v-model="checkboxOption.selected"
|
||||
:label="t(`actions.${checkboxOption.label}`)"
|
||||
@update:model-value="
|
||||
() => searchFn(undefined, 'action', getActions())
|
||||
"
|
||||
data-cy="vnLog-checkbox"
|
||||
/>
|
||||
<VnFilterPanel :data-key="props.dataKey" :search-button="true">
|
||||
<template #tags="{ tag, formatFn }">
|
||||
<div class="q-gutter-x-xs">
|
||||
<strong>{{ t(`params.${tag.label}`) }}: </strong>
|
||||
<span>{{ formatFn(tag.value) }}</span>
|
||||
</div>
|
||||
</template>
|
||||
<template #filter-from="{ params, columnName, searchFn }">
|
||||
<VnInputDate
|
||||
:label="t('globals.from')"
|
||||
v-model="params[columnName]"
|
||||
<template #body="{ params, searchFn }">
|
||||
<QDate
|
||||
v-model="params.created"
|
||||
@update:model-value="searchFn()"
|
||||
dense
|
||||
filled
|
||||
@update:modelValue="() => searchFn()"
|
||||
/>
|
||||
flat
|
||||
minimal
|
||||
>
|
||||
</QDate>
|
||||
<QSeparator />
|
||||
<QItem>
|
||||
<QItemSection v-if="!workers">
|
||||
<QSkeleton type="QInput" class="full-width" />
|
||||
</QItemSection>
|
||||
<QItemSection v-if="workers">
|
||||
<QSelect
|
||||
:label="t('User')"
|
||||
v-model="params.userFk"
|
||||
@update:model-value="searchFn()"
|
||||
:options="workers"
|
||||
option-value="id"
|
||||
option-label="name"
|
||||
emit-value
|
||||
map-options
|
||||
use-input
|
||||
:input-debounce="0"
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
</template>
|
||||
<template #filter-to="{ params, columnName, searchFn }">
|
||||
<VnInputDate
|
||||
:label="t('globals.to')"
|
||||
v-model="params[columnName]"
|
||||
dense
|
||||
filled
|
||||
@update:modelValue="() => searchFn()"
|
||||
/>
|
||||
</template>
|
||||
</VnTableFilter>
|
||||
</VnFilterPanel>
|
||||
</template>
|
||||
<i18n>
|
||||
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:
|
||||
changedModel: Entity
|
||||
|
||||
<i18n>
|
||||
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
|
||||
search: Contains
|
||||
userFk: User
|
||||
created: Created
|
||||
es:
|
||||
params:
|
||||
search: Contiene
|
||||
userFk: Usuario
|
||||
created: Creada
|
||||
User: Usuario
|
||||
</i18n>
|
||||
|
|
|
@ -5,24 +5,18 @@ import { computed } from 'vue';
|
|||
const descriptorStore = useDescriptorStore();
|
||||
|
||||
const $props = defineProps({
|
||||
value: { type: Object, default: () => {} },
|
||||
name: { type: String, default: undefined },
|
||||
name: { type: [String], default: undefined },
|
||||
});
|
||||
|
||||
const descriptor = computed(() => descriptorStore.has($props.name));
|
||||
</script>
|
||||
<template>
|
||||
<VnJsonValue :value="value.val" />
|
||||
<span
|
||||
v-if="(value.id || typeof value.val == 'number') && descriptor"
|
||||
style="margin-left: 2px"
|
||||
>
|
||||
<QIcon
|
||||
name="launch"
|
||||
class="link"
|
||||
:data-cy="'iconLaunch-' + $props.name"
|
||||
style="padding-bottom: 2px"
|
||||
/>
|
||||
<component :is="descriptor" :id="value.id ?? value.val" />
|
||||
</span>
|
||||
<VnJsonValue v-bind="$attrs" />
|
||||
<QIcon
|
||||
name="launch"
|
||||
class="link"
|
||||
v-if="$attrs.value && descriptor"
|
||||
:data-cy="'iconLaunch-' + $props.name"
|
||||
/>
|
||||
<component :is="descriptor" :id="$attrs.value" v-if="$attrs.value && descriptor" />
|
||||
</template>
|
||||
|
|
|
@ -40,6 +40,10 @@ const $props = defineProps({
|
|||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
keepData: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
});
|
||||
|
||||
const route = useRoute();
|
||||
|
@ -57,6 +61,7 @@ onBeforeMount(() => {
|
|||
if ($props.dataKey)
|
||||
arrayData = useArrayData($props.dataKey, {
|
||||
searchUrl: 'table',
|
||||
keepData: $props.keepData,
|
||||
...$props.arrayDataProps,
|
||||
navigate: $props.redirect,
|
||||
});
|
||||
|
|
|
@ -152,10 +152,6 @@ const value = computed({
|
|||
},
|
||||
});
|
||||
|
||||
const computedSortBy = computed(() => {
|
||||
return $props.sortBy || $props.optionLabel + ' ASC';
|
||||
});
|
||||
|
||||
watch(options, (newValue) => {
|
||||
setOptions(newValue);
|
||||
});
|
||||
|
@ -190,7 +186,7 @@ function findKeyInOptions() {
|
|||
}
|
||||
|
||||
function setOptions(data) {
|
||||
data = dataByOrder(data, computedSortBy.value);
|
||||
data = dataByOrder(data, $props.sortBy);
|
||||
myOptions.value = JSON.parse(JSON.stringify(data));
|
||||
myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
|
||||
emit('update:options', data);
|
||||
|
@ -220,8 +216,7 @@ function filter(val, options) {
|
|||
async function fetchFilter(val) {
|
||||
if (!$props.url) return;
|
||||
|
||||
const { fields, include, limit } = $props;
|
||||
const sortBy = computedSortBy.value;
|
||||
const { fields, include, sortBy, limit } = $props;
|
||||
const key =
|
||||
optionFilterValue.value ??
|
||||
(new RegExp(/\d/g).test(val)
|
||||
|
|
|
@ -108,4 +108,27 @@ 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'),
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
|
|
@ -1,28 +0,0 @@
|
|||
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']);
|
||||
});
|
||||
});
|
|
@ -1,6 +1,16 @@
|
|||
import { describe, it, expect, vi, afterEach, beforeEach, afterAll } from 'vitest';
|
||||
import {
|
||||
describe,
|
||||
it,
|
||||
expect,
|
||||
vi,
|
||||
beforeAll,
|
||||
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;
|
||||
|
@ -8,7 +18,6 @@ describe('VnNotes', () => {
|
|||
let spyFetch;
|
||||
let postMock;
|
||||
let patchMock;
|
||||
let deleteMock;
|
||||
let expectedInsertBody;
|
||||
let expectedUpdateBody;
|
||||
const defaultOptions = {
|
||||
|
@ -48,7 +57,6 @@ describe('VnNotes', () => {
|
|||
beforeEach(() => {
|
||||
postMock = vi.spyOn(axios, 'post');
|
||||
patchMock = vi.spyOn(axios, 'patch');
|
||||
deleteMock = vi.spyOn(axios, 'delete');
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
|
@ -145,16 +153,4 @@ 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();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
@ -159,7 +159,6 @@ async function fetch() {
|
|||
display: flex;
|
||||
flex-direction: row;
|
||||
margin-top: 2px;
|
||||
align-items: start;
|
||||
.label {
|
||||
color: var(--vn-label-color);
|
||||
width: 9em;
|
||||
|
@ -170,15 +169,9 @@ 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 {
|
||||
|
@ -208,23 +201,6 @@ 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;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<style lang="scss" scoped>
|
||||
.summaryHeader .vn-label-value {
|
||||
|
|
|
@ -30,7 +30,7 @@ const $props = defineProps({
|
|||
default: null,
|
||||
},
|
||||
toModule: {
|
||||
type: Object,
|
||||
type: String,
|
||||
default: null,
|
||||
},
|
||||
});
|
||||
|
@ -252,10 +252,6 @@ const toModule = computed(() => {
|
|||
content: ':';
|
||||
}
|
||||
}
|
||||
&.ellipsis > .value {
|
||||
text-overflow: ellipsis;
|
||||
white-space: pre;
|
||||
}
|
||||
.value {
|
||||
color: var(--vn-text-color);
|
||||
font-size: 14px;
|
||||
|
|
|
@ -61,10 +61,6 @@ const $props = defineProps({
|
|||
type: Object,
|
||||
default: null,
|
||||
},
|
||||
showTagChips: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits([
|
||||
|
@ -92,14 +88,13 @@ const userOrders = ref(useFilterParams($props.dataKey).orders);
|
|||
defineExpose({ search, params: userParams, remove });
|
||||
|
||||
const isLoading = ref(false);
|
||||
async function search(evt, name, value) {
|
||||
async function search(evt) {
|
||||
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,
|
||||
|
@ -219,7 +214,7 @@ const getLocale = (label) => {
|
|||
</QTooltip>
|
||||
</QBtn>
|
||||
<QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
|
||||
<QList dense v-if="showTagChips">
|
||||
<QList dense>
|
||||
<QItem class="q-mt-xs">
|
||||
<QItemSection top>
|
||||
<QItemLabel header lines="1" class="text-uppercase q-py-xs q-px-none">
|
||||
|
|
|
@ -1,11 +1,8 @@
|
|||
<script setup>
|
||||
import { dashIfEmpty } from 'src/filters';
|
||||
|
||||
defineProps({ email: { type: [String], default: null } });
|
||||
</script>
|
||||
<template>
|
||||
<QBtn
|
||||
class="q-pr-xs"
|
||||
v-if="email"
|
||||
flat
|
||||
round
|
||||
|
@ -16,5 +13,4 @@ defineProps({ email: { type: [String], default: null } });
|
|||
:href="`mailto:${email}`"
|
||||
@click.stop
|
||||
/>
|
||||
<span>{{ dashIfEmpty(email) }}</span>
|
||||
</template>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<script setup>
|
||||
import { ref, reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
|
||||
import axios from 'axios';
|
||||
import { dashIfEmpty, parsePhone } from 'src/filters';
|
||||
import { parsePhone } from 'src/filters';
|
||||
import useOpenURL from 'src/composables/useOpenURL';
|
||||
|
||||
const props = defineProps({
|
||||
|
@ -12,65 +12,49 @@ const props = defineProps({
|
|||
|
||||
const phone = ref(props.phoneNumber);
|
||||
const config = reactive({
|
||||
sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
|
||||
'say-simple': {
|
||||
icon: 'vn:saysimple',
|
||||
url: null,
|
||||
channel: props.channel,
|
||||
},
|
||||
sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
|
||||
});
|
||||
|
||||
const attrs = useAttrs();
|
||||
const types = Object.keys(config)
|
||||
.filter((key) => key in attrs)
|
||||
.sort();
|
||||
const activeTypes = types.length ? types : ['sip'];
|
||||
const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
|
||||
|
||||
onBeforeMount(async () => {
|
||||
if (!phone.value) return;
|
||||
let { channel } = config[type];
|
||||
|
||||
for (const type of activeTypes) {
|
||||
if (type === 'say-simple') {
|
||||
let { channel } = config[type];
|
||||
const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
|
||||
.data;
|
||||
if (!channel) channel = defaultChannel;
|
||||
if (type === 'say-simple') {
|
||||
const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
|
||||
.data;
|
||||
if (!channel) channel = defaultChannel;
|
||||
|
||||
phone.value = await parsePhone(
|
||||
props.phoneNumber,
|
||||
props.country?.toLowerCase(),
|
||||
);
|
||||
config[type].url =
|
||||
`${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
|
||||
}
|
||||
phone.value = await parsePhone(props.phoneNumber, props.country?.toLowerCase());
|
||||
config[
|
||||
type
|
||||
].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
|
||||
}
|
||||
});
|
||||
|
||||
function handleClick(type) {
|
||||
function handleClick() {
|
||||
if (config[type].url) useOpenURL(config[type].url);
|
||||
else if (config[type].href) window.location.href = config[type].href;
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex items-center gap-2">
|
||||
<template v-for="type in activeTypes">
|
||||
<QBtn
|
||||
:key="type"
|
||||
v-if="phone"
|
||||
flat
|
||||
round
|
||||
:icon="config[type].icon"
|
||||
size="sm"
|
||||
color="primary"
|
||||
padding="none"
|
||||
@click.stop="() => handleClick(type)"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ capitalize(type).replace('-', '') }}
|
||||
</QTooltip>
|
||||
</QBtn></template
|
||||
>
|
||||
<span>{{ dashIfEmpty(phone) }}</span>
|
||||
</div>
|
||||
<QBtn
|
||||
v-if="phone"
|
||||
flat
|
||||
round
|
||||
:icon="config[type].icon"
|
||||
size="sm"
|
||||
color="primary"
|
||||
padding="none"
|
||||
@click.stop="handleClick"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ capitalize(type).replace('-', '') }}
|
||||
</QTooltip>
|
||||
</QBtn>
|
||||
</template>
|
||||
|
|
|
@ -35,7 +35,6 @@ const val = computed(() => $props.value);
|
|||
:label="label"
|
||||
disable
|
||||
dense
|
||||
size="sm"
|
||||
/>
|
||||
<template v-else>
|
||||
<div v-if="label || $slots.label" class="label">
|
||||
|
@ -43,9 +42,9 @@ const val = computed(() => $props.value);
|
|||
<span style="color: var(--vn-label-color)">{{ label }}</span>
|
||||
</slot>
|
||||
</div>
|
||||
<div class="value" v-if="value || $slots.value">
|
||||
<div class="value">
|
||||
<slot name="value">
|
||||
<span :title="value" style="text-overflow: ellipsis">
|
||||
<span :title="value">
|
||||
{{ dash ? dashIfEmpty(value) : value }}
|
||||
</span>
|
||||
</slot>
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
data-cy="descriptor-more-opts"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ $t('components.vnDescriptor.moreOptions') }}
|
||||
{{ $t('components.cardDescriptor.moreOptions') }}
|
||||
</QTooltip>
|
||||
<QMenu ref="menuRef" data-cy="descriptor-more-opts-menu">
|
||||
<QList data-cy="descriptor-more-opts_list">
|
||||
|
|
|
@ -18,10 +18,10 @@ import VnInput from 'components/common/VnInput.vue';
|
|||
|
||||
const emit = defineEmits(['onFetch']);
|
||||
|
||||
const originalAttrs = useAttrs();
|
||||
const $attrs = computed(() => {
|
||||
const { required, deletable, ...rest } = originalAttrs;
|
||||
return rest;
|
||||
const $attrs = useAttrs();
|
||||
|
||||
const isRequired = computed(() => {
|
||||
return Object.keys($attrs).includes('required');
|
||||
});
|
||||
|
||||
const $props = defineProps({
|
||||
|
@ -40,11 +40,6 @@ 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) {
|
||||
|
@ -53,11 +48,6 @@ 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;
|
||||
|
||||
|
@ -121,22 +111,14 @@ function fetchData([data]) {
|
|||
originalText = data?.notes;
|
||||
emit('onFetch', data);
|
||||
}
|
||||
|
||||
const handleObservationTypes = (data) => {
|
||||
observationTypes.value = data;
|
||||
if(defaultObservationType.value) {
|
||||
newNote.observationTypeFk = defaultObservationType.value;
|
||||
}
|
||||
};
|
||||
|
||||
</script>
|
||||
<template>
|
||||
<FetchData
|
||||
v-if="selectType"
|
||||
url="ObservationTypes"
|
||||
:filter="{ fields: ['id', 'description', 'code'] }"
|
||||
:filter="{ fields: ['id', 'description'] }"
|
||||
auto-load
|
||||
@on-fetch="handleObservationTypes"
|
||||
@on-fetch="(data) => (observationTypes = data)"
|
||||
/>
|
||||
<FetchData
|
||||
v-if="justInput"
|
||||
|
@ -162,7 +144,7 @@ const handleObservationTypes = (data) => {
|
|||
v-model="newNote.observationTypeFk"
|
||||
option-label="description"
|
||||
style="flex: 0.15"
|
||||
:required="'required' in originalAttrs"
|
||||
:required="isRequired"
|
||||
@keyup.enter.stop="insert"
|
||||
/>
|
||||
<VnInput
|
||||
|
@ -170,10 +152,10 @@ const handleObservationTypes = (data) => {
|
|||
type="textarea"
|
||||
:label="$props.justInput && newNote.text ? '' : t('Add note here...')"
|
||||
filled
|
||||
size="lg"
|
||||
autogrow
|
||||
autofocus
|
||||
@keyup.enter.stop="handleClick"
|
||||
:required="'required' in originalAttrs"
|
||||
:required="isRequired"
|
||||
clearable
|
||||
>
|
||||
<template #append>
|
||||
|
@ -207,6 +189,7 @@ const handleObservationTypes = (data) => {
|
|||
:search-url="false"
|
||||
@on-fetch="
|
||||
newNote.text = '';
|
||||
newNote.observationTypeFk = null;
|
||||
"
|
||||
>
|
||||
<template #body="{ rows }">
|
||||
|
@ -243,21 +226,6 @@ const handleObservationTypes = (data) => {
|
|||
</QBadge>
|
||||
</div>
|
||||
<span v-text="toDateHourMin(note.created)" />
|
||||
<div>
|
||||
<QIcon
|
||||
v-if="'deletable' in originalAttrs"
|
||||
name="delete"
|
||||
size="sm"
|
||||
class="cursor-pointer"
|
||||
color="primary"
|
||||
@click="deleteNote(note)"
|
||||
data-cy="notesRemoveNoteBtn"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ t('ticketNotes.removeNote') }}
|
||||
</QTooltip>
|
||||
</QIcon>
|
||||
</div>
|
||||
</div>
|
||||
</QCardSection>
|
||||
<QCardSection class="q-pa-xs q-my-none q-py-none">
|
||||
|
|
|
@ -115,7 +115,7 @@ onMounted(async () => {
|
|||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
arrayData.reset(['data']);
|
||||
if (!store.keepData) arrayData.reset(['data']);
|
||||
arrayData.resetPagination();
|
||||
});
|
||||
|
||||
|
@ -215,7 +215,6 @@ defineExpose({
|
|||
paginate,
|
||||
userParams: arrayData.store.userParams,
|
||||
currentFilter: arrayData.store.currentFilter,
|
||||
arrayData,
|
||||
});
|
||||
</script>
|
||||
|
||||
|
|
|
@ -23,19 +23,18 @@ describe('useRole', () => {
|
|||
name: `T'Challa`,
|
||||
nickname: 'Black Panther',
|
||||
lang: 'en',
|
||||
worker: { department: { departmentFk: 155 } },
|
||||
};
|
||||
const expectedUser = {
|
||||
id: 999,
|
||||
name: `T'Challa`,
|
||||
nickname: 'Black Panther',
|
||||
lang: 'en',
|
||||
departmentFk: 155,
|
||||
};
|
||||
const expectedRoles = ['salesPerson', 'admin'];
|
||||
vi.spyOn(axios, 'get').mockResolvedValueOnce({
|
||||
vi.spyOn(axios, 'get')
|
||||
.mockResolvedValueOnce({
|
||||
data: { roles: rolesData, user: fetchedUser },
|
||||
});
|
||||
})
|
||||
|
||||
vi.spyOn(role.state, 'setUser');
|
||||
vi.spyOn(role.state, 'setRoles');
|
||||
|
|
|
@ -75,7 +75,6 @@ describe('session', () => {
|
|||
userConfig: {
|
||||
darkMode: false,
|
||||
},
|
||||
worker: { department: { departmentFk: 155 } },
|
||||
};
|
||||
const rolesData = [
|
||||
{
|
||||
|
@ -144,7 +143,7 @@ describe('session', () => {
|
|||
await session.destroy(); // this clears token and user for any other test
|
||||
});
|
||||
},
|
||||
{},
|
||||
{}
|
||||
);
|
||||
|
||||
describe('RenewToken', () => {
|
||||
|
@ -176,7 +175,7 @@ describe('session', () => {
|
|||
await session.checkValidity();
|
||||
expect(sessionStorage.getItem('token')).toEqual(expectedToken);
|
||||
expect(sessionStorage.getItem('tokenMultimedia')).toEqual(
|
||||
expectedTokenMultimedia,
|
||||
expectedTokenMultimedia
|
||||
);
|
||||
});
|
||||
it('Should renewToken', async () => {
|
||||
|
@ -205,7 +204,7 @@ describe('session', () => {
|
|||
await session.checkValidity();
|
||||
expect(sessionStorage.getItem('token')).not.toEqual(expectedToken);
|
||||
expect(sessionStorage.getItem('tokenMultimedia')).not.toEqual(
|
||||
expectedTokenMultimedia,
|
||||
expectedTokenMultimedia
|
||||
);
|
||||
});
|
||||
});
|
||||
|
|
|
@ -5,19 +5,18 @@ import { exportFile } from 'quasar';
|
|||
|
||||
const { getTokenMultimedia } = useSession();
|
||||
const token = getTokenMultimedia();
|
||||
const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
|
||||
|
||||
export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
|
||||
const appUrl = await getAppUrl();
|
||||
const response = await axios.get(
|
||||
url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`,
|
||||
{ responseType: 'blob' },
|
||||
{ responseType: 'blob' }
|
||||
);
|
||||
|
||||
download(response);
|
||||
}
|
||||
|
||||
export async function downloadDocuware(url, params) {
|
||||
const appUrl = await getAppUrl();
|
||||
const response = await axios.get(`${appUrl}/api/` + url, {
|
||||
responseType: 'blob',
|
||||
params,
|
||||
|
@ -33,7 +32,3 @@ function download(response) {
|
|||
|
||||
exportFile(filename, response.data);
|
||||
}
|
||||
|
||||
async function getAppUrl() {
|
||||
return (await getUrl('', 'lilium')).replace('/#/', '');
|
||||
}
|
||||
|
|
|
@ -30,16 +30,9 @@ export function useAcl() {
|
|||
return false;
|
||||
}
|
||||
|
||||
function hasAcl(model, prop, accessType) {
|
||||
const modelAcl = state.getAcls().value[model];
|
||||
const propAcl = modelAcl?.[prop] || modelAcl?.['*'];
|
||||
return !!(propAcl?.[accessType] || propAcl?.['*']);
|
||||
}
|
||||
|
||||
return {
|
||||
fetch,
|
||||
hasAny,
|
||||
state,
|
||||
hasAcl,
|
||||
};
|
||||
}
|
||||
|
|
|
@ -56,6 +56,7 @@ export function useArrayData(key, userOptions) {
|
|||
'searchUrl',
|
||||
'navigate',
|
||||
'mapKey',
|
||||
'keepData',
|
||||
'oneRecord',
|
||||
];
|
||||
if (typeof userOptions === 'object') {
|
||||
|
@ -107,7 +108,7 @@ export function useArrayData(key, userOptions) {
|
|||
store.hasMoreData = limit && response.data.length >= limit;
|
||||
|
||||
if (!append && !isDialogOpened() && updateRouter) {
|
||||
if (updateStateParams(response.data)?.redirect) return;
|
||||
if (updateStateParams(response.data)?.redirect && !store.keepData) return;
|
||||
}
|
||||
store.isLoading = false;
|
||||
canceller = null;
|
||||
|
@ -188,7 +189,7 @@ export function useArrayData(key, userOptions) {
|
|||
|
||||
store.order = order;
|
||||
resetPagination();
|
||||
await fetch({});
|
||||
fetch({});
|
||||
index++;
|
||||
|
||||
return { index, order };
|
||||
|
|
|
@ -14,7 +14,7 @@ export function useFilterParams(key) {
|
|||
watch(
|
||||
() => arrayData.value.store?.currentFilter,
|
||||
(val, oldValue) => (val || oldValue) && setUserParams(val),
|
||||
{ immediate: true, deep: true },
|
||||
{ immediate: true, deep: true }
|
||||
);
|
||||
|
||||
function parseOrder(urlOrders) {
|
||||
|
@ -54,7 +54,7 @@ export function useFilterParams(key) {
|
|||
Object.assign(params, item);
|
||||
});
|
||||
delete params[key];
|
||||
} else if (value && typeof value === 'object' && !Array.isArray(value)) {
|
||||
} else if (value && typeof value === 'object') {
|
||||
const param = Object.values(value)[0];
|
||||
if (typeof param == 'string') params[key] = param.replaceAll('%', '');
|
||||
}
|
||||
|
|
|
@ -13,7 +13,6 @@ export function useRole() {
|
|||
name: data.user.name,
|
||||
nickname: data.user.nickname,
|
||||
lang: data.user.lang || 'es',
|
||||
departmentFk: data.user?.worker?.department?.departmentFk,
|
||||
};
|
||||
state.setUser(userData);
|
||||
state.setRoles(roles);
|
||||
|
|
|
@ -325,6 +325,7 @@ input::-webkit-inner-spin-button {
|
|||
min-height: auto !important;
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
padding-bottom: 2px;
|
||||
.q-field__native.row {
|
||||
min-height: auto !important;
|
||||
}
|
||||
|
|
|
@ -370,11 +370,6 @@ globals:
|
|||
countryCodeFk: Country
|
||||
companyFk: Company
|
||||
nickname: Alias
|
||||
changedModel: Entity
|
||||
changedModelValue: Search
|
||||
changedModelId: Entity id
|
||||
userFk: User
|
||||
action: Action
|
||||
model: Model
|
||||
fuel: Fuel
|
||||
active: Active
|
||||
|
@ -822,7 +817,6 @@ travel:
|
|||
search: Search travel
|
||||
searchInfo: You can search by travel id or name
|
||||
id: Id
|
||||
awbFk: AWB
|
||||
travelList:
|
||||
tableVisibleColumns:
|
||||
ref: Reference
|
||||
|
@ -847,7 +841,6 @@ travel:
|
|||
availabledHour: Availabled hour
|
||||
thermographs: Thermographs
|
||||
hb: HB
|
||||
roundedCc: Rounded CC
|
||||
basicData:
|
||||
daysInForward: Automatic movement (Raid)
|
||||
isRaid: Raid
|
||||
|
@ -890,7 +883,7 @@ components:
|
|||
openCard: View
|
||||
openSummary: Summary
|
||||
viewSummary: Summary
|
||||
vnDescriptor:
|
||||
cardDescriptor:
|
||||
mainList: Main list
|
||||
summary: Summary
|
||||
moreOptions: More options
|
||||
|
|
|
@ -371,11 +371,6 @@ globals:
|
|||
countryCodeFk: País
|
||||
companyFk: Empresa
|
||||
nickname: Alias
|
||||
changedModel: Entidad
|
||||
changedModelValue: Buscar
|
||||
changedModelId: Id de entidad
|
||||
userFk: Usuario
|
||||
action: Acción
|
||||
errors:
|
||||
statusUnauthorized: Acceso denegado
|
||||
statusInternalServerError: Ha ocurrido un error interno del servidor
|
||||
|
@ -905,7 +900,6 @@ travel:
|
|||
search: Buscar envío
|
||||
searchInfo: Buscar envío por id o nombre
|
||||
id: Id
|
||||
awbFk: Guía aérea
|
||||
travelList:
|
||||
tableVisibleColumns:
|
||||
ref: Referencia
|
||||
|
@ -930,7 +924,6 @@ travel:
|
|||
availabled: F. Disponible
|
||||
availabledHour: Hora Disponible
|
||||
hb: HB
|
||||
roundedCc: CC redondeado
|
||||
basicData:
|
||||
daysInForward: Desplazamiento automatico (redada)
|
||||
isRaid: Redada
|
||||
|
@ -974,7 +967,7 @@ components:
|
|||
openCard: Ficha
|
||||
openSummary: Detalles
|
||||
viewSummary: Vista previa
|
||||
vnDescriptor:
|
||||
cardDescriptor:
|
||||
mainList: Listado principal
|
||||
summary: Resumen
|
||||
moreOptions: Más opciones
|
||||
|
|
|
@ -100,8 +100,12 @@ const onChangePass = (oldPass) => {
|
|||
};
|
||||
|
||||
onMounted(() => {
|
||||
hasitManagementAccess.value = useAcl().hasAcl('VnUser', 'higherPrivileges', 'WRITE');
|
||||
hasSysadminAccess.value = useAcl().hasAcl('VnUser', 'adminUser', 'WRITE');
|
||||
hasitManagementAccess.value = useAcl().hasAny([
|
||||
{ model: 'VnUser', props: 'higherPrivileges', accessType: 'WRITE' },
|
||||
]);
|
||||
hasSysadminAccess.value = useAcl().hasAny([
|
||||
{ model: 'VnUser', props: 'adminUser', accessType: 'WRITE' },
|
||||
]);
|
||||
});
|
||||
</script>
|
||||
<template>
|
||||
|
@ -223,7 +227,7 @@ onMounted(() => {
|
|||
<QItemSection>{{ t('account.card.actions.deactivateUser.name') }}</QItemSection>
|
||||
</QItem>
|
||||
<QItem
|
||||
v-if="useAcl().hasAcl('VnRole', '*', 'WRITE')"
|
||||
v-if="useAcl().hasAny([{ model: 'VnRole', props: '*', accessType: 'WRITE' }])"
|
||||
v-ripple
|
||||
clickable
|
||||
@click="showSyncDialog = true"
|
||||
|
|
|
@ -6,7 +6,7 @@ import AccountSummary from './AccountSummary.vue';
|
|||
<QPopupProxy style="max-width: 10px">
|
||||
<AccountDescriptor
|
||||
v-if="$attrs.id"
|
||||
v-bind="$attrs"
|
||||
v-bind="$attrs.id"
|
||||
:summary="AccountSummary"
|
||||
:proxy-render="true"
|
||||
/>
|
||||
|
|
|
@ -18,7 +18,7 @@ const entityId = computed(() => $props.id || route.params.id);
|
|||
data-key="Account"
|
||||
ref="AccountSummary"
|
||||
url="VnUsers/preview"
|
||||
:filter="{ ...filter, where: { id: entityId } }"
|
||||
:filter="filter"
|
||||
>
|
||||
<template #header="{ entity }">{{ entity.id }} - {{ entity.nickname }}</template>
|
||||
<template #menu>
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
import { ref } from 'vue';
|
||||
import { useRoute } from 'vue-router';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { getDifferences, getUpdatedValues } from 'src/filters';
|
||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||
import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
|
@ -10,18 +9,12 @@ import FormModel from 'components/FormModel.vue';
|
|||
import VnRow from 'components/ui/VnRow.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
import VnInputDate from 'components/common/VnInputDate.vue';
|
||||
|
||||
import VnAvatar from 'src/components/ui/VnAvatar.vue';
|
||||
|
||||
const route = useRoute();
|
||||
const { t } = useI18n();
|
||||
const workersOptions = ref([]);
|
||||
|
||||
function onBeforeSave(formData, originalData) {
|
||||
return getUpdatedValues(
|
||||
Object.keys(getDifferences(formData, originalData)),
|
||||
formData,
|
||||
);
|
||||
}
|
||||
</script>
|
||||
<template>
|
||||
<FetchData
|
||||
|
@ -34,7 +27,6 @@ function onBeforeSave(formData, originalData) {
|
|||
<FormModel
|
||||
model="Claim"
|
||||
:url-update="`Claims/updateClaim/${route.params.id}`"
|
||||
:mapper="onBeforeSave"
|
||||
auto-load
|
||||
>
|
||||
<template #form="{ data, validate }">
|
||||
|
|
|
@ -21,7 +21,6 @@ import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorP
|
|||
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
||||
import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
|
||||
import ClaimDescriptorMenu from './ClaimDescriptorMenu.vue';
|
||||
import VnDropdown from 'src/components/common/VnDropdown.vue';
|
||||
|
||||
const route = useRoute();
|
||||
const router = useRouter();
|
||||
|
@ -37,7 +36,7 @@ const $props = defineProps({
|
|||
});
|
||||
|
||||
const entityId = computed(() => $props.id || route.params.id);
|
||||
const claimStates = ref([]);
|
||||
const ClaimStates = ref([]);
|
||||
const claimDmsRef = ref();
|
||||
const claimDms = ref([]);
|
||||
const multimediaDialog = ref();
|
||||
|
@ -174,9 +173,7 @@ function openDialog(dmsId) {
|
|||
}
|
||||
|
||||
async function changeState(value) {
|
||||
await axios.patch(`Claims/updateClaim/${entityId.value}`, {
|
||||
claimStateFk: value,
|
||||
});
|
||||
await axios.patch(`Claims/updateClaim/${entityId.value}`, { claimStateFk: value });
|
||||
router.go(route.fullPath);
|
||||
}
|
||||
|
||||
|
@ -186,18 +183,13 @@ function claimUrl(section) {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<FetchData
|
||||
url="ClaimStates"
|
||||
:filter="{ fields: ['id', 'description'] }"
|
||||
@on-fetch="(data) => (claimStates = data)"
|
||||
auto-load
|
||||
/>
|
||||
<FetchData
|
||||
url="ClaimDms"
|
||||
:filter="claimDmsFilter"
|
||||
@on-fetch="(data) => setClaimDms(data)"
|
||||
ref="claimDmsRef"
|
||||
/>
|
||||
<FetchData url="ClaimStates" @on-fetch="(data) => (ClaimStates = data)" auto-load />
|
||||
<CardSummary
|
||||
ref="summary"
|
||||
:url="`Claims/${entityId}/getSummary`"
|
||||
|
@ -209,11 +201,34 @@ function claimUrl(section) {
|
|||
{{ claim.id }} - {{ claim.client.name }} ({{ claim.client.id }})
|
||||
</template>
|
||||
<template #header-right>
|
||||
<VnDropdown
|
||||
:options="claimStates"
|
||||
option-label="description"
|
||||
@change-state="changeState"
|
||||
/>
|
||||
<QBtnDropdown
|
||||
side
|
||||
top
|
||||
color="black"
|
||||
text-color="white"
|
||||
:label="t('globals.changeState')"
|
||||
>
|
||||
<QList>
|
||||
<QVirtualScroll
|
||||
class="max-container-height"
|
||||
:items="ClaimStates"
|
||||
separator
|
||||
v-slot="{ item, index }"
|
||||
>
|
||||
<QItem
|
||||
:key="index"
|
||||
dense
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="changeState(item.id)"
|
||||
>
|
||||
<QItemSection>
|
||||
<QItemLabel>{{ item.description }}</QItemLabel>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
</QVirtualScroll>
|
||||
</QList>
|
||||
</QBtnDropdown>
|
||||
</template>
|
||||
<template #menu="{ entity }">
|
||||
<ClaimDescriptorMenu :claim="entity.claim" />
|
||||
|
|
|
@ -115,7 +115,6 @@ const props = defineProps({
|
|||
<i18n>
|
||||
en:
|
||||
params:
|
||||
departmentFk: Department
|
||||
search: Contains
|
||||
clientFk: Customer
|
||||
clientName: Customer
|
||||
|
@ -128,7 +127,6 @@ en:
|
|||
zoneFk: Zone
|
||||
es:
|
||||
params:
|
||||
departmentFk: Departamento
|
||||
search: Contiene
|
||||
clientFk: Cliente
|
||||
clientName: Cliente
|
||||
|
|
|
@ -134,7 +134,7 @@ const columns = computed(() => [
|
|||
|
||||
const STATE_COLOR = {
|
||||
pending: 'bg-warning',
|
||||
loses: 'bg-negative',
|
||||
managed: 'bg-info',
|
||||
resolved: 'bg-positive',
|
||||
};
|
||||
</script>
|
||||
|
|
|
@ -20,12 +20,11 @@ import VnFilter from 'components/VnTable/VnFilter.vue';
|
|||
|
||||
import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
|
||||
import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
|
||||
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
||||
|
||||
const { openConfirmationModal } = useVnConfirm();
|
||||
const { sendEmail, openReport } = usePrintService();
|
||||
const { t } = useI18n();
|
||||
const { hasAcl } = useAcl();
|
||||
const { hasAny } = useAcl();
|
||||
|
||||
const quasar = useQuasar();
|
||||
const route = useRoute();
|
||||
|
@ -90,7 +89,15 @@ const columns = computed(() => [
|
|||
{
|
||||
align: 'left',
|
||||
label: t('Employee'),
|
||||
name: 'workerFk',
|
||||
columnField: {
|
||||
component: 'userLink',
|
||||
attrs: ({ row }) => {
|
||||
return {
|
||||
workerId: row.workerFk,
|
||||
name: row.userName,
|
||||
};
|
||||
},
|
||||
},
|
||||
cardVisible: true,
|
||||
},
|
||||
{
|
||||
|
@ -124,6 +131,7 @@ const columns = computed(() => [
|
|||
align: 'left',
|
||||
name: 'balance',
|
||||
label: t('Balance'),
|
||||
format: ({ balance }) => toCurrency(balance),
|
||||
cardVisible: true,
|
||||
},
|
||||
{
|
||||
|
@ -138,14 +146,12 @@ const columns = computed(() => [
|
|||
actions: [
|
||||
{
|
||||
title: t('globals.downloadPdf'),
|
||||
isPrimary: true,
|
||||
icon: 'cloud_download',
|
||||
show: (row) => row.isInvoice,
|
||||
action: (row) => showBalancePdf(row),
|
||||
},
|
||||
{
|
||||
title: t('Send compensation'),
|
||||
isPrimary: true,
|
||||
icon: 'outgoing_mail',
|
||||
show: (row) => !!row.isCompensation,
|
||||
action: ({ id }) =>
|
||||
|
@ -250,12 +256,6 @@ const showBalancePdf = ({ id }) => {
|
|||
<template #column-balance="{ rowIndex }">
|
||||
{{ toCurrency(balances[rowIndex]?.balance) }}
|
||||
</template>
|
||||
<template #column-workerFk="{ row }">
|
||||
<span class="link" @click.stop>
|
||||
{{ row.userName }}
|
||||
<WorkerDescriptorProxy :id="row.workerFk" />
|
||||
</span>
|
||||
</template>
|
||||
<template #column-description="{ row }">
|
||||
<span class="link" v-if="row.isInvoice" @click.stop>
|
||||
{{ t('bill', { ref: row.description }) }}
|
||||
|
@ -276,7 +276,9 @@ const showBalancePdf = ({ id }) => {
|
|||
>
|
||||
<VnInput
|
||||
v-model="scope.value"
|
||||
:disable="!hasAcl('Receipt', '*', 'WRITE')"
|
||||
:disable="
|
||||
!hasAny([{ model: 'Receipt', props: '*', accessType: 'WRITE' }])
|
||||
"
|
||||
@keypress.enter="scope.set"
|
||||
autofocus
|
||||
/>
|
||||
|
|
|
@ -105,6 +105,15 @@ const debtWarning = computed(() => {
|
|||
>
|
||||
<QTooltip>{{ t('customer.card.isDisabled') }}</QTooltip>
|
||||
</QIcon>
|
||||
|
||||
<QIcon
|
||||
v-if="entity?.substitutionAllowed"
|
||||
name="help"
|
||||
size="xs"
|
||||
color="primary"
|
||||
>
|
||||
<QTooltip>{{ t('Allowed substitution') }}</QTooltip>
|
||||
</QIcon>
|
||||
<QIcon
|
||||
v-if="!entity.account?.active"
|
||||
color="primary"
|
||||
|
|
|
@ -61,6 +61,16 @@ const openCreateForm = (type) => {
|
|||
.join('&');
|
||||
useOpenURL(`/#/${type}/list?${params}`);
|
||||
};
|
||||
const updateSubstitutionAllowed = async () => {
|
||||
try {
|
||||
await axios.patch(`Clients/${route.params.id}`, {
|
||||
substitutionAllowed: !$props.customer.substitutionAllowed,
|
||||
});
|
||||
notify('globals.notificationSent', 'positive');
|
||||
} catch (error) {
|
||||
notify(error.message, 'positive');
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
@ -69,6 +79,13 @@ const openCreateForm = (type) => {
|
|||
{{ t('globals.pageTitles.createTicket') }}
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem v-ripple clickable>
|
||||
<QItemSection @click="updateSubstitutionAllowed()">{{
|
||||
$props.customer.substitutionAllowed
|
||||
? t('Disable substitution')
|
||||
: t('Allow substitution')
|
||||
}}</QItemSection>
|
||||
</QItem>
|
||||
<QItem v-ripple clickable>
|
||||
<QItemSection @click="showSmsDialog()">{{ t('Send SMS') }}</QItemSection>
|
||||
</QItem>
|
||||
|
|
|
@ -84,31 +84,29 @@ const sumRisk = ({ clientRisks }) => {
|
|||
<VnLv :label="t('customer.summary.customerId')" :value="entity.id" />
|
||||
<VnLv :label="t('globals.name')" :value="entity.name" />
|
||||
<VnLv :label="t('customer.summary.contact')" :value="entity.contact" />
|
||||
<VnLv :label="t('customer.extendedList.tableVisibleColumns.phone')">
|
||||
<template #value>
|
||||
<VnLv :value="entity.phone">
|
||||
<template #label>
|
||||
{{ t('customer.extendedList.tableVisibleColumns.phone') }}
|
||||
<VnLinkPhone :phone-number="entity.phone" />
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :label="t('customer.summary.mobile')">
|
||||
<template #value>
|
||||
<VnLv :value="entity.mobile">
|
||||
<template #label>
|
||||
{{ t('customer.summary.mobile') }}
|
||||
<VnLinkPhone :phone-number="entity.mobile" />
|
||||
<VnLinkPhone
|
||||
sip
|
||||
say-simple
|
||||
:phone-number="entity.mobile"
|
||||
:channel="entity.country?.saySimpleCountry?.channel"
|
||||
class="q-ml-xs"
|
||||
/>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv
|
||||
:label="t('globals.params.email')"
|
||||
:value="entity.email"
|
||||
class="ellipsis"
|
||||
copy
|
||||
>
|
||||
<template #value>
|
||||
<VnLinkMail :email="entity.email" />
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :value="entity.email" copy
|
||||
><template #label>
|
||||
{{ t('globals.params.email') }}
|
||||
<VnLinkMail email="entity.email"></VnLinkMail> </template
|
||||
></VnLv>
|
||||
<VnLv :label="t('globals.department')">
|
||||
<template #value>
|
||||
<span class="link" v-text="entity.department?.name" />
|
||||
|
|
|
@ -72,7 +72,6 @@ const exprBuilder = (param, value) => {
|
|||
option-value="id"
|
||||
option-label="name"
|
||||
url="Departments"
|
||||
no-one="true"
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
@ -155,7 +154,6 @@ en:
|
|||
city: City
|
||||
phone: Phone
|
||||
email: Email
|
||||
departmentFk: Department
|
||||
isToBeMailed: Mailed
|
||||
isEqualizated: Equailized
|
||||
businessTypeFk: Business type
|
||||
|
@ -168,7 +166,6 @@ en:
|
|||
postcode: Postcode
|
||||
es:
|
||||
params:
|
||||
departmentFk: Departamento
|
||||
search: Contiene
|
||||
fi: NIF
|
||||
isActive: Activo
|
||||
|
|
|
@ -192,10 +192,8 @@ en:
|
|||
date: L. O. Date
|
||||
credit: Credit I.
|
||||
defaulterSinced: From
|
||||
departmentFk: Department
|
||||
es:
|
||||
params:
|
||||
departmentFk: Departamento
|
||||
clientFk: Cliente
|
||||
countryFk: País
|
||||
paymentMethod: F. Pago
|
||||
|
|
|
@ -127,7 +127,6 @@ es:
|
|||
Identifier: Identificador
|
||||
Social name: Razón social
|
||||
Phone: Teléfono
|
||||
Postcode: Código postal
|
||||
City: Población
|
||||
Email: Email
|
||||
Campaign consumption: Consumo campaña
|
||||
|
|
|
@ -93,26 +93,10 @@ const updateAddressTicket = async () => {
|
|||
};
|
||||
|
||||
const updateObservations = async (payload) => {
|
||||
await axios.post('AddressObservations/crud', cleanPayload(payload));
|
||||
await axios.post('AddressObservations/crud', payload);
|
||||
notes.value = [];
|
||||
deletes.value = [];
|
||||
};
|
||||
|
||||
function cleanPayload(payload) {
|
||||
['creates', 'deletes', 'updates'].forEach((prop) => {
|
||||
if (prop === 'creates' || prop === 'updates') {
|
||||
payload[prop] = payload[prop].filter(
|
||||
(item) => item.description !== '' && item.observationTypeFk !== '',
|
||||
);
|
||||
} else {
|
||||
payload[prop] = payload[prop].filter(
|
||||
(item) => item !== null && item !== undefined,
|
||||
);
|
||||
}
|
||||
});
|
||||
return payload;
|
||||
}
|
||||
|
||||
async function updateAll({ data, payload }) {
|
||||
await updateObservations(payload);
|
||||
await updateAddress(data);
|
||||
|
|
|
@ -3,20 +3,18 @@ import { onBeforeMount, reactive, ref } from 'vue';
|
|||
import { useI18n } from 'vue-i18n';
|
||||
import { useRoute } from 'vue-router';
|
||||
import axios from 'axios';
|
||||
import { useDialogPluginComponent } from 'quasar';
|
||||
|
||||
import { getClientRisk } from '../composables/getClientRisk';
|
||||
import { useDialogPluginComponent } from 'quasar';
|
||||
import FormModelPopup from 'components/FormModelPopup.vue';
|
||||
import { usePrintService } from 'composables/usePrintService';
|
||||
import useNotify from 'src/composables/useNotify.js';
|
||||
|
||||
import FormModelPopup from 'components/FormModelPopup.vue';
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
import FormModel from 'components/FormModel.vue';
|
||||
import VnRow from 'components/ui/VnRow.vue';
|
||||
import VnInputDate from 'components/common/VnInputDate.vue';
|
||||
import VnInputNumber from 'components/common/VnInputNumber.vue';
|
||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
import VnAccountNumber from 'src/components/common/VnAccountNumber.vue';
|
||||
|
||||
const { t } = useI18n();
|
||||
const route = useRoute();
|
||||
|
@ -50,7 +48,7 @@ const maxAmount = ref();
|
|||
const accountingType = ref({});
|
||||
const isCash = ref(false);
|
||||
const formModelRef = ref(false);
|
||||
const amountToReturn = ref();
|
||||
|
||||
const filterBanks = {
|
||||
fields: ['id', 'bank', 'accountingTypeFk'],
|
||||
include: { relation: 'accountingType' },
|
||||
|
@ -92,7 +90,7 @@ function setPaymentType(data, accounting) {
|
|||
let descriptions = [];
|
||||
if (accountingType.value.receiptDescription)
|
||||
descriptions.push(accountingType.value.receiptDescription);
|
||||
if (data.description > 0) descriptions.push(data.description);
|
||||
if (data.description) descriptions.push(data.description);
|
||||
data.description = descriptions.join(', ');
|
||||
}
|
||||
|
||||
|
@ -102,7 +100,7 @@ const calculateFromAmount = (event) => {
|
|||
};
|
||||
|
||||
const calculateFromDeliveredAmount = (event) => {
|
||||
amountToReturn.value = event - initialData.amountPaid;
|
||||
initialData.amountToReturn = parseFloat(event) - initialData.amountPaid;
|
||||
};
|
||||
|
||||
function onBeforeSave(data) {
|
||||
|
@ -123,16 +121,17 @@ async function onDataSaved(formData, { id }) {
|
|||
recipient: formData.email,
|
||||
});
|
||||
|
||||
if (viewReceipt.value) openReport(`Receipts/${id}/receipt-pdf`, {}, '_blank');
|
||||
if (viewReceipt.value) openReport(`Receipts/${id}/receipt-pdf`);
|
||||
} finally {
|
||||
if ($props.promise) $props.promise();
|
||||
if (closeButton.value) closeButton.value.click();
|
||||
}
|
||||
}
|
||||
|
||||
async function getSupplierClientReferences(value) {
|
||||
async function accountShortToStandard({ target: { value } }) {
|
||||
if (!value) return (initialData.description = '');
|
||||
const params = { bankAccount: value };
|
||||
initialData.compensationAccount = value.replace('.', '0'.repeat(11 - value.length));
|
||||
const params = { bankAccount: initialData.compensationAccount };
|
||||
const { data } = await axios(`Clients/getClientOrSupplierReference`, { params });
|
||||
if (!data.clientId) {
|
||||
initialData.description = t('Supplier Compensation Reference', {
|
||||
|
@ -242,16 +241,17 @@ async function getAmountPaid() {
|
|||
@update:model-value="getAmountPaid()"
|
||||
/>
|
||||
</VnRow>
|
||||
<div v-if="accountingType.code == 'compensation'">
|
||||
|
||||
<div v-if="data.bankFk?.accountingType?.code == 'compensation'">
|
||||
<div class="text-h6">
|
||||
{{ t('Compensation') }}
|
||||
</div>
|
||||
<VnRow>
|
||||
<VnAccountNumber
|
||||
<VnInputNumber
|
||||
:label="t('Compensation account')"
|
||||
clearable
|
||||
v-model="data.compensationAccount"
|
||||
@blur="getSupplierClientReferences(data.compensationAccount)"
|
||||
@blur="accountShortToStandard"
|
||||
/>
|
||||
</VnRow>
|
||||
</div>
|
||||
|
@ -261,7 +261,8 @@ async function getAmountPaid() {
|
|||
clearable
|
||||
v-model="data.description"
|
||||
/>
|
||||
<div v-if="accountingType.code == 'cash'">
|
||||
|
||||
<div v-if="data.bankFk?.accountingType?.code == 'cash'">
|
||||
<div class="text-h6">{{ t('Cash') }}</div>
|
||||
<VnRow>
|
||||
<VnInputNumber
|
||||
|
@ -273,7 +274,7 @@ async function getAmountPaid() {
|
|||
<VnInputNumber
|
||||
:label="t('Amount to return')"
|
||||
disable
|
||||
v-model="amountToReturn"
|
||||
v-model="data.amountToReturn"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnRow>
|
||||
|
|
|
@ -191,7 +191,7 @@ const getItemPackagingType = (ticketSales) => {
|
|||
:without-header="true"
|
||||
auto-load
|
||||
:row-click="rowClick"
|
||||
order="shipped DESC, id DESC"
|
||||
order="shipped DESC, id"
|
||||
:disable-option="{ card: true, table: true }"
|
||||
class="full-width"
|
||||
:disable-infinite-scroll="true"
|
||||
|
|
|
@ -14,8 +14,6 @@ import VnInputNumber from 'src/components/common/VnInputNumber.vue';
|
|||
import VnSelectTravelExtended from 'src/components/common/VnSelectTravelExtended.vue';
|
||||
import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
|
||||
import VnCheckbox from 'src/components/common/VnCheckbox.vue';
|
||||
import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
|
||||
import VnDmsInput from 'src/components/common/VnDmsInput.vue';
|
||||
|
||||
const route = useRoute();
|
||||
const { t } = useI18n();
|
||||
|
@ -26,7 +24,6 @@ const user = state.getUser().fn();
|
|||
|
||||
const companiesOptions = ref([]);
|
||||
const currenciesOptions = ref([]);
|
||||
const entryRef = ref({});
|
||||
|
||||
onMounted(() => {
|
||||
checkEntryLock(route.params.id, user.id);
|
||||
|
@ -51,11 +48,10 @@ onMounted(() => {
|
|||
auto-load
|
||||
/>
|
||||
<FormModel
|
||||
ref="entryRef"
|
||||
model="Entry"
|
||||
:url-update="`Entries/${route.params.id}`"
|
||||
:clear-store-on-unmount="false"
|
||||
model="Entry"
|
||||
auto-load
|
||||
:clear-store-on-unmount="false"
|
||||
>
|
||||
<template #form="{ data }">
|
||||
<VnRow class="q-py-sm">
|
||||
|
@ -71,18 +67,11 @@ onMounted(() => {
|
|||
/>
|
||||
</VnRow>
|
||||
<VnRow class="q-py-sm">
|
||||
<VnInput
|
||||
v-model="data.reference"
|
||||
:label="t('entry.list.tableVisibleColumns.reference')"
|
||||
/>
|
||||
<VnSelect
|
||||
v-model="data.typeFk"
|
||||
url="entryTypes"
|
||||
:fields="['code', 'description']"
|
||||
option-value="code"
|
||||
optionLabel="description"
|
||||
sortBy="description"
|
||||
:label="t('entry.list.tableVisibleColumns.entryTypeDescription')"
|
||||
<VnInput v-model="data.reference" :label="t('globals.reference')" />
|
||||
<VnInputNumber
|
||||
v-model="data.invoiceAmount"
|
||||
:label="t('entry.summary.invoiceAmount')"
|
||||
:positive="false"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnRow class="q-py-sm">
|
||||
|
@ -124,6 +113,7 @@ onMounted(() => {
|
|||
name="initialTemperature"
|
||||
:label="t('entry.basicData.initialTemperature')"
|
||||
:step="0.5"
|
||||
:decimal-places="2"
|
||||
:positive="false"
|
||||
/>
|
||||
<VnInputNumber
|
||||
|
@ -131,21 +121,20 @@ onMounted(() => {
|
|||
name="finalTemperature"
|
||||
:label="t('entry.basicData.finalTemperature')"
|
||||
:step="0.5"
|
||||
:decimal-places="2"
|
||||
:positive="false"
|
||||
/>
|
||||
<VnSelect
|
||||
v-model="data.typeFk"
|
||||
url="entryTypes"
|
||||
:fields="['code', 'description']"
|
||||
option-value="code"
|
||||
optionLabel="description"
|
||||
sortBy="description"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnRow class="q-py-sm">
|
||||
<VnInputNumber
|
||||
v-model="data.invoiceAmount"
|
||||
:label="t('entry.list.tableVisibleColumns.invoiceAmount')"
|
||||
:positive="false"
|
||||
@update:model-value="data.buyerFk = user.id"
|
||||
/>
|
||||
<VnSelectWorker v-model="data.buyerFk" hide-selected />
|
||||
<VnDmsInput :data="data" :formRef="entryRef" :disable="false" />
|
||||
</VnRow>
|
||||
<VnRow class="q-py-sm">
|
||||
<VnInputNumber
|
||||
<QInput
|
||||
:label="t('entry.basicData.observation')"
|
||||
type="textarea"
|
||||
v-model="data.observation"
|
||||
|
|
|
@ -18,7 +18,6 @@ import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
|
|||
import { checkEntryLock } from 'src/composables/checkEntryLock';
|
||||
import VnRow from 'src/components/ui/VnRow.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
import VnInputNumber from 'src/components/common/VnInputNumber.vue';
|
||||
|
||||
const $props = defineProps({
|
||||
id: {
|
||||
|
@ -45,8 +44,6 @@ const entityId = ref($props.id ?? route.params.id);
|
|||
const entryBuysRef = ref();
|
||||
const footerFetchDataRef = ref();
|
||||
const footer = ref({});
|
||||
const dialogRef = ref(false);
|
||||
const newEntryRef = ref(null);
|
||||
const columns = [
|
||||
{
|
||||
align: 'center',
|
||||
|
@ -253,7 +250,6 @@ const columns = [
|
|||
component: 'number',
|
||||
attrs: {
|
||||
positive: false,
|
||||
decimalPlaces: 3,
|
||||
},
|
||||
cellEvent: {
|
||||
'update:modelValue': async (value, oldValue, row) => {
|
||||
|
@ -501,23 +497,6 @@ async function setBuyUltimate(itemFk, data) {
|
|||
});
|
||||
}
|
||||
|
||||
async function transferBuys(rows, newEntry) {
|
||||
if (!newEntry) return;
|
||||
|
||||
const promises = rows.map((row) => {
|
||||
return axios.patch('Buys', { id: row.id, entryFk: newEntry });
|
||||
});
|
||||
|
||||
await Promise.all(promises);
|
||||
|
||||
await axios.post(`Entries/${newEntry}/recalcEntryPrices`);
|
||||
await axios.post(`Entries/${entityId.value}/recalcEntryPrices`);
|
||||
|
||||
entryBuysRef.value.reload();
|
||||
newEntryRef.value = null;
|
||||
dialogRef.value = false;
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
stateStore.rightDrawer = false;
|
||||
if ($props.editableMode) checkEntryLock(entityId.value, user.id);
|
||||
|
@ -592,47 +571,6 @@ onMounted(() => {
|
|||
</QItem>
|
||||
</QList>
|
||||
</QBtnDropdown>
|
||||
<QBtn
|
||||
icon="move_group"
|
||||
color="primary"
|
||||
:title="t('Transfer buys')"
|
||||
data-cy="transferBuys"
|
||||
flat
|
||||
@click="dialogRef = true"
|
||||
:disable="!selectedRows.length"
|
||||
/>
|
||||
<QDialog v-model="dialogRef">
|
||||
<QCard>
|
||||
<QCardSection>
|
||||
<span>{{ t('Transfer buys') }}</span>
|
||||
</QCardSection>
|
||||
<QCardSection>
|
||||
<VnInputNumber
|
||||
v-model="newEntryRef"
|
||||
:label="t('Entry')"
|
||||
type="number"
|
||||
data-cy="entryDestinyInput"
|
||||
/>
|
||||
</QCardSection>
|
||||
<QCardSection>
|
||||
<QCardActions>
|
||||
<QBtn
|
||||
label="Cancel"
|
||||
flat
|
||||
color="primary"
|
||||
@click="dialogRef = false"
|
||||
/>
|
||||
<QBtn
|
||||
label="Transfer"
|
||||
data-cy="transferBuysBtn"
|
||||
flat
|
||||
color="primary"
|
||||
@click="transferBuys(selectedRows, newEntryRef)"
|
||||
/>
|
||||
</QCardActions>
|
||||
</QCardSection>
|
||||
</QCard>
|
||||
</QDialog>
|
||||
</QBtnGroup>
|
||||
</Teleport>
|
||||
<FetchData
|
||||
|
@ -648,7 +586,7 @@ onMounted(() => {
|
|||
:url="`Entries/${entityId}/getBuyList`"
|
||||
search-url="EntryBuys"
|
||||
save-url="Buys/crud"
|
||||
:filter="editableMode ? filter : {}"
|
||||
:filter="filter"
|
||||
:disable-option="{ card: true }"
|
||||
v-model:selected="selectedRows"
|
||||
@on-fetch="() => footerFetchDataRef.fetch()"
|
||||
|
@ -682,7 +620,7 @@ onMounted(() => {
|
|||
},
|
||||
columnGridStyle: {
|
||||
'max-width': '50%',
|
||||
'margin-right': '5%',
|
||||
'margin-right': '30px',
|
||||
flex: 1,
|
||||
},
|
||||
previousStyle: {
|
||||
|
@ -714,7 +652,6 @@ onMounted(() => {
|
|||
:fields="['id', 'nickname']"
|
||||
option-label="nickname"
|
||||
sort-by="nickname ASC"
|
||||
:use-like="false"
|
||||
/>
|
||||
<VnSelect
|
||||
:label="t('Family')"
|
||||
|
@ -879,8 +816,6 @@ es:
|
|||
Create buy: Crear compra
|
||||
Invert quantity value: Invertir valor de cantidad
|
||||
Check buy amount: Marcar como correcta la cantidad de compra
|
||||
Transfer buys: Transferir compras
|
||||
Entry: Entrada
|
||||
</i18n>
|
||||
<style lang="scss" scoped>
|
||||
.centered-container {
|
||||
|
|
|
@ -8,6 +8,6 @@ import filter from './EntryFilter.js';
|
|||
data-key="Entry"
|
||||
url="Entries"
|
||||
:descriptor="EntryDescriptor"
|
||||
:filter="{ ...filter, where: { id: $route.params.id } }"
|
||||
:filter="filter"
|
||||
/>
|
||||
</template>
|
||||
|
|
|
@ -92,7 +92,7 @@ const getEntryRedirectionFilter = (entry) => {
|
|||
};
|
||||
|
||||
function showEntryReport() {
|
||||
openReport(`Entries/${entityId.value}/entry-order-pdf`, {}, true);
|
||||
openReport(`Entries/${entityId.value}/entry-order-pdf`);
|
||||
}
|
||||
|
||||
function showNotification(type, message) {
|
||||
|
|
|
@ -70,8 +70,8 @@ onMounted(async () => {
|
|||
:url="`#/entry/${entityId}/basic-data`"
|
||||
:text="t('globals.summary.basicData')"
|
||||
/>
|
||||
<div class="vn-card-group">
|
||||
<div class="vn-card-content">
|
||||
<div class="card-group">
|
||||
<div class="card-content">
|
||||
<VnLv
|
||||
:label="t('entry.summary.commission')"
|
||||
:value="entry?.commission"
|
||||
|
@ -84,16 +84,13 @@ onMounted(async () => {
|
|||
:label="t('globals.company')"
|
||||
:value="entry?.company?.code"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('entry.list.tableVisibleColumns.reference')"
|
||||
:value="entry?.reference"
|
||||
/>
|
||||
<VnLv :label="t('globals.reference')" :value="entry?.reference" />
|
||||
<VnLv
|
||||
:label="t('entry.summary.invoiceNumber')"
|
||||
:value="entry?.invoiceNumber"
|
||||
/>
|
||||
</div>
|
||||
<div class="vn-card-content">
|
||||
<div class="card-content">
|
||||
<VnCheckbox
|
||||
:label="t('entry.list.tableVisibleColumns.isOrdered')"
|
||||
v-model="entry.isOrdered"
|
||||
|
@ -130,8 +127,8 @@ onMounted(async () => {
|
|||
:url="`#/travel/${entry.travel.id}/summary`"
|
||||
:text="t('Travel')"
|
||||
/>
|
||||
<div class="vn-card-group">
|
||||
<div class="vn-card-content">
|
||||
<div class="card-group">
|
||||
<div class="card-content">
|
||||
<VnLv :label="t('entry.summary.travelReference')">
|
||||
<template #value>
|
||||
<span class="link">
|
||||
|
@ -161,8 +158,7 @@ onMounted(async () => {
|
|||
:value="entry.travel.warehouseIn?.name"
|
||||
/>
|
||||
</div>
|
||||
<div class="vn-card-content">
|
||||
<VnLv :label="t('travel.awbFk')" :value="entry.travel.awbFk" />
|
||||
<div class="card-content">
|
||||
<VnCheckbox
|
||||
:label="t('entry.summary.travelDelivered')"
|
||||
v-model="entry.travel.isDelivered"
|
||||
|
@ -193,6 +189,31 @@ onMounted(async () => {
|
|||
</template>
|
||||
</CardSummary>
|
||||
</template>
|
||||
<style lang="scss" scoped>
|
||||
.card-group {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.card-content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
text-overflow: ellipsis;
|
||||
> div {
|
||||
max-height: 24px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 1010px) {
|
||||
.card-group {
|
||||
flex-direction: row;
|
||||
}
|
||||
.card-content {
|
||||
flex: 1;
|
||||
margin-right: 16px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<i18n>
|
||||
es:
|
||||
Travel: Envío
|
||||
|
|
|
@ -248,6 +248,7 @@ function getBadgeAttrs(row) {
|
|||
|
||||
let timeDiff = today - timeTicket;
|
||||
|
||||
if (timeDiff > 0) return { color: 'info', 'text-color': 'black' };
|
||||
if (timeDiff < 0) return { color: 'warning', 'text-color': 'black' };
|
||||
switch (row.entryTypeCode) {
|
||||
case 'regularization':
|
||||
|
@ -273,7 +274,6 @@ function getBadgeAttrs(row) {
|
|||
default:
|
||||
break;
|
||||
}
|
||||
if (timeDiff > 0) return { color: 'info', 'text-color': 'black' };
|
||||
return { color: 'transparent' };
|
||||
}
|
||||
|
||||
|
|
|
@ -116,7 +116,6 @@ const filter = computed(() => ({
|
|||
hour: 0,
|
||||
minute: 0,
|
||||
second: 0,
|
||||
milliseconds: 0,
|
||||
}),
|
||||
m3: { neq: null },
|
||||
},
|
||||
|
@ -163,8 +162,8 @@ async function beforeSave(data, getChanges) {
|
|||
}
|
||||
|
||||
await Promise.all(patchPromises);
|
||||
data.creates = [];
|
||||
return data;
|
||||
const filteredChanges = changes.filter((change) => change?.isReal !== false);
|
||||
data.creates = filteredChanges;
|
||||
}
|
||||
</script>
|
||||
<template>
|
||||
|
@ -204,7 +203,7 @@ async function beforeSave(data, getChanges) {
|
|||
</VnRow>
|
||||
</template>
|
||||
</VnSubToolbar>
|
||||
<QDialog v-model="travelDialogRef" :class="['vn-row', 'wrap']">
|
||||
<QDialog v-model="travelDialogRef" :maximized="true" :class="['vn-row', 'wrap']">
|
||||
<FormModelPopup
|
||||
:url-update="`Travels/${travel?.id}`"
|
||||
model="travel"
|
||||
|
@ -253,15 +252,12 @@ async function beforeSave(data, getChanges) {
|
|||
</span>
|
||||
</template>
|
||||
<template #column-footer-reserve>
|
||||
<span class="q-pr-xs">
|
||||
<span>
|
||||
{{ round(footer.reserve) }}
|
||||
</span>
|
||||
</template>
|
||||
<template #column-footer-bought>
|
||||
<span
|
||||
:style="boughtStyle(footer?.bought, footer?.reserve)"
|
||||
class="q-pr-xs"
|
||||
>
|
||||
<span :style="boughtStyle(footer?.bought, footer?.reserve)">
|
||||
{{ round(footer.bought) }}
|
||||
</span>
|
||||
</template>
|
||||
|
@ -279,7 +275,7 @@ async function beforeSave(data, getChanges) {
|
|||
}
|
||||
.column {
|
||||
min-width: 35%;
|
||||
margin-top: 1%;
|
||||
margin-top: 5%;
|
||||
}
|
||||
.text-negative {
|
||||
color: $negative !important;
|
||||
|
|
|
@ -25,7 +25,7 @@ entry:
|
|||
entryTypeDescription: Tipo entrada
|
||||
invoiceAmount: Importe
|
||||
dated: Fecha
|
||||
inventoryEntry: Es inventario
|
||||
inventoryEntry: Es inventario
|
||||
summary:
|
||||
commission: Comisión
|
||||
currency: Moneda
|
||||
|
@ -33,8 +33,7 @@ entry:
|
|||
invoiceAmount: Importe
|
||||
ordered: Pedida
|
||||
booked: Contabilizada
|
||||
excludedFromAvailable: Excluir del disponible
|
||||
isConfirmed: Lista para etiquetar
|
||||
excludedFromAvailable: Excluido
|
||||
travelReference: Referencia
|
||||
travelAgency: Agencia
|
||||
travelShipped: F. envio
|
||||
|
@ -57,7 +56,7 @@ entry:
|
|||
observation: Observación
|
||||
commission: Comisión
|
||||
booked: Contabilizada
|
||||
excludedFromAvailable: Excluir del disponible
|
||||
excludedFromAvailable: Excluido
|
||||
initialTemperature: Ini °C
|
||||
finalTemperature: Fin °C
|
||||
buys:
|
||||
|
@ -120,9 +119,9 @@ entry:
|
|||
supplierName: Proveedor
|
||||
entryFilter:
|
||||
params:
|
||||
isExcludedFromAvailable: Excluir del disponible
|
||||
isExcludedFromAvailable: Excluido
|
||||
isOrdered: Pedida
|
||||
isConfirmed: Lista para etiquetar
|
||||
isConfirmed: Confirmado
|
||||
isReceived: Recibida
|
||||
isRaid: Raid
|
||||
landed: Fecha
|
||||
|
|
|
@ -158,12 +158,20 @@ function deleteFile(dmsFk) {
|
|||
</VnRow>
|
||||
<VnRow>
|
||||
<VnSelect
|
||||
:label="t('invoiceIn.summary.sage')"
|
||||
v-model="data.withholdingSageFk"
|
||||
:options="sageWithholdings"
|
||||
:label="t('Undeductible VAT')"
|
||||
v-model="data.deductibleExpenseFk"
|
||||
:options="expenses"
|
||||
option-value="id"
|
||||
option-label="withholding"
|
||||
/>
|
||||
option-label="id"
|
||||
:filter-options="['id', 'name']"
|
||||
data-cy="invoiceInBasicDataDeductibleExpenseFk"
|
||||
>
|
||||
<template #option="scope">
|
||||
<QItem v-bind="scope.itemProps">
|
||||
{{ `${scope.opt.id}: ${scope.opt.name}` }}
|
||||
</QItem>
|
||||
</template>
|
||||
</VnSelect>
|
||||
|
||||
<div class="row no-wrap">
|
||||
<VnInput
|
||||
|
@ -263,6 +271,16 @@ function deleteFile(dmsFk) {
|
|||
data-cy="invoiceInBasicDataCompanyFk"
|
||||
/>
|
||||
</VnRow>
|
||||
<VnRow>
|
||||
<VnSelect
|
||||
:label="t('invoiceIn.summary.sage')"
|
||||
v-model="data.withholdingSageFk"
|
||||
:options="sageWithholdings"
|
||||
option-value="id"
|
||||
option-label="withholding"
|
||||
data-cy="invoiceInBasicDataWithholdingSageFk"
|
||||
/>
|
||||
</VnRow>
|
||||
</template>
|
||||
</FormModel>
|
||||
<QDialog v-model="documentDialogRef.show">
|
||||
|
@ -314,6 +332,7 @@ 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
|
||||
|
|
|
@ -22,7 +22,7 @@ const routes = reactive({
|
|||
getSupplier: (id) => {
|
||||
return { name: 'SupplierCard', params: { id } };
|
||||
},
|
||||
getInvoices: (id) => {
|
||||
getTickets: (id) => {
|
||||
return {
|
||||
name: 'InvoiceInList',
|
||||
query: {
|
||||
|
@ -131,11 +131,11 @@ async function setInvoiceCorrection(id) {
|
|||
</QBtn>
|
||||
<QBtn
|
||||
size="md"
|
||||
icon="vn:invoice-in"
|
||||
icon="vn:ticket"
|
||||
color="primary"
|
||||
:to="routes.getInvoices(entity.supplierFk)"
|
||||
:to="routes.getTickets(entity.supplierFk)"
|
||||
>
|
||||
<QTooltip>{{ t('invoiceIn.descriptor.invoices') }}</QTooltip>
|
||||
<QTooltip>{{ t('globals.ticketList') }}</QTooltip>
|
||||
</QBtn>
|
||||
<QBtn
|
||||
v-if="
|
||||
|
|
|
@ -25,8 +25,7 @@ const invoiceInFormRef = ref();
|
|||
const invoiceId = +route.params.id;
|
||||
const filter = { where: { invoiceInFk: invoiceId } };
|
||||
const areRows = ref(false);
|
||||
const totalTaxableBase = ref();
|
||||
const noMatch = computed(() => totalAmount.value != totalTaxableBase.value);
|
||||
const totals = ref();
|
||||
const columns = computed(() => [
|
||||
{
|
||||
name: 'duedate',
|
||||
|
@ -75,12 +74,9 @@ async function insert() {
|
|||
notify(t('globals.dataSaved'), 'positive');
|
||||
}
|
||||
|
||||
async function setTaxableBase() {
|
||||
const { data } = await axios.get(`InvoiceIns/${invoiceId}/getTotals`);
|
||||
totalTaxableBase.value = data.totalTaxableBase;
|
||||
}
|
||||
|
||||
onBeforeMount(async () => await setTaxableBase());
|
||||
onBeforeMount(async () => {
|
||||
totals.value = (await axios.get(`InvoiceIns/${invoiceId}/getTotals`)).data;
|
||||
});
|
||||
</script>
|
||||
<template>
|
||||
<CrudModel
|
||||
|
@ -93,14 +89,13 @@ onBeforeMount(async () => await setTaxableBase());
|
|||
:data-required="{ invoiceInFk: invoiceId }"
|
||||
v-model:selected="rowsSelected"
|
||||
@on-fetch="(data) => (areRows = !!data.length)"
|
||||
@save-changes="setTaxableBase"
|
||||
>
|
||||
<template #body="{ rows }">
|
||||
<QTable
|
||||
v-model:selected="rowsSelected"
|
||||
selection="multiple"
|
||||
:columns
|
||||
:rows
|
||||
:columns="columns"
|
||||
:rows="rows"
|
||||
row-key="$index"
|
||||
:grid="$q.screen.lt.sm"
|
||||
>
|
||||
|
@ -156,18 +151,7 @@ onBeforeMount(async () => await setTaxableBase());
|
|||
<QTd />
|
||||
<QTd />
|
||||
<QTd>
|
||||
<QChip
|
||||
dense
|
||||
:color="noMatch ? 'negative' : 'transparent'"
|
||||
class="q-pa-xs"
|
||||
:title="
|
||||
noMatch
|
||||
? t('invoiceIn.noMatch', { totalTaxableBase })
|
||||
: ''
|
||||
"
|
||||
>
|
||||
{{ toCurrency(totalAmount) }}
|
||||
</QChip>
|
||||
{{ toCurrency(totalAmount) }}
|
||||
</QTd>
|
||||
<QTd>
|
||||
<template v-if="isNotEuro(invoiceIn.currency.code)">
|
||||
|
@ -253,7 +237,7 @@ onBeforeMount(async () => await setTaxableBase());
|
|||
if (!areRows) insert();
|
||||
else
|
||||
invoiceInFormRef.insert({
|
||||
amount: (totalTaxableBase - totalAmount).toFixed(2),
|
||||
amount: (totals.totalTaxableBase - totalAmount).toFixed(2),
|
||||
invoiceInFk: invoiceId,
|
||||
});
|
||||
}
|
||||
|
@ -265,10 +249,6 @@ onBeforeMount(async () => await setTaxableBase());
|
|||
.bg {
|
||||
background-color: var(--vn-light-gray);
|
||||
}
|
||||
|
||||
.q-chip {
|
||||
color: var(--vn-text-color);
|
||||
}
|
||||
</style>
|
||||
<i18n>
|
||||
es:
|
||||
|
|
|
@ -40,13 +40,6 @@ 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',
|
||||
|
@ -214,109 +207,113 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
|
|||
<InvoiceInDescriptorMenu :invoice="entity" />
|
||||
</template>
|
||||
<template #body="{ entity }">
|
||||
<QCard class="max-width">
|
||||
<VnTitle
|
||||
:url="getLink('basic-data')"
|
||||
:text="t('globals.pageTitles.basicData')"
|
||||
<!--Basic Data-->
|
||||
<QCard class="vn-one">
|
||||
<QCardSection class="q-pa-none">
|
||||
<VnTitle
|
||||
:url="getLink('basic-data')"
|
||||
:text="t('globals.pageTitles.basicData')"
|
||||
/>
|
||||
</QCardSection>
|
||||
<VnLv
|
||||
:label="t('invoiceIn.list.supplier')"
|
||||
:value="entity.supplier?.name"
|
||||
>
|
||||
<template #value>
|
||||
<span class="link" data-cy="invoiceInSummary_supplier">
|
||||
{{ entity.supplier?.name }}
|
||||
<SupplierDescriptorProxy :id="entity.supplierFk" />
|
||||
</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :label="t('invoiceIn.supplierRef')" :value="entity.supplierRef" />
|
||||
<VnLv
|
||||
:label="t('invoiceIn.summary.currency')"
|
||||
:value="entity.currency?.code"
|
||||
/>
|
||||
<div class="vn-card-group">
|
||||
<div class="vn-card-content">
|
||||
<VnLv
|
||||
:label="t('invoiceIn.list.supplier')"
|
||||
:value="entity.supplier?.name"
|
||||
>
|
||||
<template #value>
|
||||
<span class="link" data-cy="invoiceInSummary_supplier">
|
||||
{{ entity.supplier?.name }}
|
||||
<SupplierDescriptorProxy :id="entity.supplierFk" />
|
||||
</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv
|
||||
:label="t('invoiceIn.supplierRef')"
|
||||
:value="entity.supplierRef"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('invoiceIn.summary.currency')"
|
||||
:value="entity.currency?.code"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('invoiceIn.serial')"
|
||||
:value="`${entity.serial}`"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('globals.country')"
|
||||
:value="entity.supplier?.country?.code"
|
||||
/>
|
||||
</div>
|
||||
<div class="vn-card-content">
|
||||
<VnLv
|
||||
:ellipsis-value="false"
|
||||
:label="t('invoiceIn.summary.issued')"
|
||||
:value="toDate(entity.issued)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('invoiceIn.summary.operated')"
|
||||
:value="toDate(entity.operated)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('invoiceIn.summary.bookEntried')"
|
||||
:value="toDate(entity.bookEntried)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('invoiceIn.summary.bookedDate')"
|
||||
:value="toDate(entity.booked)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('globals.isVies')"
|
||||
:value="entity.supplier?.isVies"
|
||||
/>
|
||||
</div>
|
||||
<div class="vn-card-content">
|
||||
<VnLv
|
||||
:label="t('invoiceIn.summary.sage')"
|
||||
:value="entity.sageWithholding?.withholding"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('invoiceIn.summary.vat')"
|
||||
:value="entity.expenseDeductible?.name"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('invoiceIn.card.company')"
|
||||
:value="entity.company?.code"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('invoiceIn.isBooked')"
|
||||
:value="invoiceIn?.isBooked"
|
||||
/>
|
||||
</div>
|
||||
<div class="vn-card-content">
|
||||
<VnLv
|
||||
:label="t('invoiceIn.summary.taxableBase')"
|
||||
:value="toCurrency(entity.totals.totalTaxableBase)"
|
||||
/>
|
||||
<VnLv label="Total" :value="toCurrency(entity.totals.totalVat)" />
|
||||
<VnLv :label="t('invoiceIn.summary.dueTotal')">
|
||||
<template #value>
|
||||
<QChip
|
||||
dense
|
||||
class="q-pa-xs"
|
||||
:color="amountsNotMatch ? 'negative' : 'transparent'"
|
||||
:title="
|
||||
amountsNotMatch
|
||||
? t('invoiceIn.noMatch', {
|
||||
totalTaxableBase:
|
||||
entity.totals.totalTaxableBase,
|
||||
})
|
||||
: t('invoiceIn.summary.dueTotal')
|
||||
"
|
||||
>
|
||||
{{ toCurrency(entity.totals.totalDueDay) }}
|
||||
</QChip>
|
||||
</template>
|
||||
</VnLv>
|
||||
</div>
|
||||
</div>
|
||||
<VnLv :label="t('invoiceIn.serial')" :value="`${entity.serial}`" />
|
||||
<VnLv
|
||||
:label="t('globals.country')"
|
||||
:value="entity.supplier?.country?.code"
|
||||
/>
|
||||
</QCard>
|
||||
<QCard class="vn-one">
|
||||
<QCardSection class="q-pa-none">
|
||||
<VnTitle
|
||||
:url="getLink('basic-data')"
|
||||
:text="t('globals.pageTitles.basicData')"
|
||||
/>
|
||||
</QCardSection>
|
||||
<VnLv
|
||||
:ellipsis-value="false"
|
||||
:label="t('invoiceIn.summary.issued')"
|
||||
:value="toDate(entity.issued)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('invoiceIn.summary.operated')"
|
||||
:value="toDate(entity.operated)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('invoiceIn.summary.bookEntried')"
|
||||
:value="toDate(entity.bookEntried)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('invoiceIn.summary.bookedDate')"
|
||||
:value="toDate(entity.booked)"
|
||||
/>
|
||||
<VnLv :label="t('globals.isVies')" :value="entity.supplier?.isVies" />
|
||||
</QCard>
|
||||
<QCard class="vn-one">
|
||||
<QCardSection class="q-pa-none">
|
||||
<VnTitle
|
||||
:url="getLink('basic-data')"
|
||||
:text="t('globals.pageTitles.basicData')"
|
||||
/>
|
||||
</QCardSection>
|
||||
<VnLv
|
||||
:label="t('invoiceIn.summary.sage')"
|
||||
:value="entity.sageWithholding?.withholding"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('invoiceIn.summary.vat')"
|
||||
:value="entity.expenseDeductible?.name"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('invoiceIn.card.company')"
|
||||
:value="entity.company?.code"
|
||||
/>
|
||||
<VnLv :label="t('invoiceIn.isBooked')" :value="invoiceIn?.isBooked" />
|
||||
</QCard>
|
||||
<QCard class="vn-one">
|
||||
<QCardSection class="q-pa-none">
|
||||
<VnTitle
|
||||
:url="getLink('basic-data')"
|
||||
:text="t('globals.pageTitles.basicData')"
|
||||
/>
|
||||
</QCardSection>
|
||||
<QCardSection class="q-pa-none">
|
||||
<VnLv
|
||||
:label="t('invoiceIn.summary.taxableBase')"
|
||||
:value="toCurrency(entity.totals.totalTaxableBase)"
|
||||
/>
|
||||
<VnLv label="Total" :value="toCurrency(entity.totals.totalVat)" />
|
||||
<VnLv :label="t('invoiceIn.summary.dueTotal')">
|
||||
<template #value>
|
||||
<QChip
|
||||
dense
|
||||
class="q-pa-xs"
|
||||
:color="amountsNotMatch ? 'negative' : 'transparent'"
|
||||
:title="
|
||||
amountsNotMatch
|
||||
? t('invoiceIn.summary.noMatch')
|
||||
: t('invoiceIn.summary.dueTotal')
|
||||
"
|
||||
>
|
||||
{{ toCurrency(entity.totals.totalDueDay) }}
|
||||
</QChip>
|
||||
</template>
|
||||
</VnLv>
|
||||
</QCardSection>
|
||||
</QCard>
|
||||
<!--Vat-->
|
||||
<QCard v-if="entity.invoiceInTax.length" class="vat">
|
||||
|
@ -338,15 +335,6 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
|
|||
</QTh>
|
||||
</QTr>
|
||||
</template>
|
||||
<template #body-cell-isDeductible="{ row }">
|
||||
<QTd align="center">
|
||||
<QCheckbox
|
||||
v-model="row.isDeductible"
|
||||
disable
|
||||
data-cy="isDeductible_checkbox"
|
||||
/>
|
||||
</QTd>
|
||||
</template>
|
||||
<template #body-cell-vat="{ value: vatCell }">
|
||||
<QTd :title="vatCell" shrink>
|
||||
{{ vatCell }}
|
||||
|
|
|
@ -53,13 +53,6 @@ const columns = computed(() => [
|
|||
sortable: true,
|
||||
align: 'left',
|
||||
},
|
||||
{
|
||||
name: 'isDeductible',
|
||||
label: t('invoiceIn.isDeductible'),
|
||||
field: (row) => row.isDeductible,
|
||||
model: 'isDeductible',
|
||||
align: 'center',
|
||||
},
|
||||
{
|
||||
name: 'sageiva',
|
||||
label: t('Sage iva'),
|
||||
|
@ -126,7 +119,6 @@ const filter = {
|
|||
'foreignValue',
|
||||
'taxTypeSageFk',
|
||||
'transactionTypeSageFk',
|
||||
'isDeductible',
|
||||
],
|
||||
where: {
|
||||
invoiceInFk: route.params.id,
|
||||
|
@ -238,14 +230,6 @@ function setCursor(ref) {
|
|||
</VnSelectDialog>
|
||||
</QTd>
|
||||
</template>
|
||||
<template #body-cell-isDeductible="{ row }">
|
||||
<QTd align="center">
|
||||
<QCheckbox
|
||||
v-model="row.isDeductible"
|
||||
data-cy="isDeductible_checkbox"
|
||||
/>
|
||||
</QTd>
|
||||
</template>
|
||||
<template #body-cell-taxablebase="{ row }">
|
||||
<QTd shrink>
|
||||
<VnInputNumber
|
||||
|
@ -340,7 +324,6 @@ function setCursor(ref) {
|
|||
</QTd>
|
||||
<QTd />
|
||||
<QTd />
|
||||
<QTd />
|
||||
<QTd>
|
||||
{{ toCurrency(taxRateTotal) }}
|
||||
</QTd>
|
||||
|
|
|
@ -119,7 +119,7 @@ const cols = computed(() => [
|
|||
icon: 'preview',
|
||||
type: 'submit',
|
||||
isPrimary: true,
|
||||
action: (row) => viewSummary(row.id, InvoiceInSummary, 'lg-width'),
|
||||
action: (row) => viewSummary(row.id, InvoiceInSummary),
|
||||
},
|
||||
{
|
||||
title: t('globals.download'),
|
||||
|
@ -156,7 +156,7 @@ const cols = computed(() => [
|
|||
:create="{
|
||||
urlCreate: 'InvoiceIns',
|
||||
title: t('globals.createInvoiceIn'),
|
||||
onDataSaved: ({ id }) => tableRef.redirect(`${id}/basic-data`),
|
||||
onDataSaved: ({ id }) => tableRef.redirect(id),
|
||||
formInitialData: { companyFk: user.companyFk, issued: Date.vnNew() },
|
||||
}"
|
||||
redirect="invoice-in"
|
||||
|
|
|
@ -56,9 +56,8 @@ async function checkToBook(id) {
|
|||
componentProps: {
|
||||
title: t('Are you sure you want to book this invoice?'),
|
||||
message: messages.reduce((acc, msg) => `${acc}<p>${msg}</p>`, ''),
|
||||
promise: () => toBook(id),
|
||||
},
|
||||
});
|
||||
}).onOk(() => toBook(id));
|
||||
}
|
||||
|
||||
async function toBook(id) {
|
||||
|
|
|
@ -4,7 +4,6 @@ invoiceIn:
|
|||
serial: Serial
|
||||
isBooked: Is booked
|
||||
supplierRef: Invoice nº
|
||||
isDeductible: Deductible
|
||||
list:
|
||||
ref: Reference
|
||||
supplier: Supplier
|
||||
|
@ -15,7 +14,6 @@ invoiceIn:
|
|||
amount: Amount
|
||||
descriptor:
|
||||
ticketList: Ticket list
|
||||
invoices: Supplier invoices
|
||||
descriptorMenu:
|
||||
book: Book
|
||||
unbook: Unbook
|
||||
|
@ -59,6 +57,7 @@ invoiceIn:
|
|||
bank: Bank
|
||||
foreignValue: Foreign value
|
||||
dueTotal: Due day
|
||||
noMatch: Do not match
|
||||
code: Code
|
||||
net: Net
|
||||
stems: Stems
|
||||
|
@ -69,4 +68,3 @@ invoiceIn:
|
|||
isBooked: Is booked
|
||||
account: Ledger account
|
||||
correctingFk: Rectificative
|
||||
noMatch: No match with the vat({totalTaxableBase})
|
||||
|
|
|
@ -4,7 +4,6 @@ invoiceIn:
|
|||
serial: Serie
|
||||
isBooked: Contabilizada
|
||||
supplierRef: Nº factura
|
||||
isDeductible: Deducible
|
||||
list:
|
||||
ref: Referencia
|
||||
supplier: Proveedor
|
||||
|
@ -14,7 +13,7 @@ invoiceIn:
|
|||
awb: AWB
|
||||
amount: Importe
|
||||
descriptor:
|
||||
invoices: Facturas de proveedor
|
||||
ticketList: Listado de tickets
|
||||
descriptorMenu:
|
||||
book: Contabilizar
|
||||
unbook: Descontabilizar
|
||||
|
@ -67,4 +66,3 @@ invoiceIn:
|
|||
isBooked: Contabilizada
|
||||
account: Cuenta contable
|
||||
correctingFk: Rectificativa
|
||||
noMatch: No cuadra con el iva({totalTaxableBase})
|
||||
|
|
|
@ -1,22 +1,19 @@
|
|||
<script setup>
|
||||
import { ref, computed } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import DepartmentDescriptorProxy from '../Worker/Department/Card/DepartmentDescriptorProxy.vue';
|
||||
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
||||
import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
|
||||
import { toDateFormat } from 'src/filters/date.js';
|
||||
import VnTable from 'src/components/VnTable/VnTable.vue';
|
||||
import VnInputDate from 'src/components/common/VnInputDate.vue';
|
||||
import VnRow from 'src/components/ui/VnRow.vue';
|
||||
import { dateRange } from 'src/filters';
|
||||
import useOpenURL from 'src/composables/useOpenURL';
|
||||
import { useState } from 'src/composables/useState';
|
||||
const { t } = useI18n();
|
||||
|
||||
const dates = dateRange(Date.vnNew());
|
||||
const from = ref(dates[0]);
|
||||
const to = ref(dates[1]);
|
||||
|
||||
const state = useState();
|
||||
const filter = computed(() => {
|
||||
const obj = {};
|
||||
const formatFrom = setHours(from.value, 'from');
|
||||
|
@ -26,18 +23,16 @@ const filter = computed(() => {
|
|||
if (!formatFrom && formatTo) stamp = { lte: formatTo };
|
||||
else if (formatFrom && !formatTo) stamp = { gte: formatFrom };
|
||||
else if (formatFrom && formatTo) stamp = { between: [formatFrom, formatTo] };
|
||||
return Object.assign(obj, {
|
||||
where: {
|
||||
'v.stamp': stamp,
|
||||
'c.departmentFk': state.getUser().value.departmentFk,
|
||||
},
|
||||
});
|
||||
|
||||
return Object.assign(obj, { where: { 'v.stamp': stamp } });
|
||||
});
|
||||
|
||||
function exprBuilder(param, value) {
|
||||
switch (param) {
|
||||
case 'clientFk':
|
||||
return { [`c.id`]: value };
|
||||
case 'departmentFk':
|
||||
return { [`c.${param}`]: value };
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -70,13 +65,9 @@ const columns = computed(() => [
|
|||
align: 'left',
|
||||
name: 'departmentFk',
|
||||
label: t('customer.summary.team'),
|
||||
columnFilter: {
|
||||
component: 'select',
|
||||
attrs: {
|
||||
url: 'Departments',
|
||||
},
|
||||
alias: 'c',
|
||||
inWhere: true,
|
||||
component: 'select',
|
||||
attrs: {
|
||||
url: 'Departments',
|
||||
},
|
||||
columnField: {
|
||||
component: null,
|
||||
|
@ -103,7 +94,6 @@ const columns = computed(() => [
|
|||
columnClass: 'no-padding',
|
||||
},
|
||||
]);
|
||||
const openTab = (id) => useOpenURL(`#/customer/${id}/summary`);
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
@ -123,8 +113,6 @@ const openTab = (id) => useOpenURL(`#/customer/${id}/summary`);
|
|||
:disable-option="{ card: true }"
|
||||
dense
|
||||
class="q-px-none"
|
||||
:row-click="({ id }) => openTab(id)"
|
||||
:row-ctrl-click="(_, { id }) => openTab(id)"
|
||||
>
|
||||
<template #top-left>
|
||||
<VnRow>
|
||||
|
@ -133,16 +121,12 @@ const openTab = (id) => useOpenURL(`#/customer/${id}/summary`);
|
|||
</VnRow>
|
||||
</template>
|
||||
<template #column-departmentFk="{ row }">
|
||||
<span @click.stop.prevent class="link" :title="row.department">
|
||||
{{ row.department }}
|
||||
<DepartmentDescriptorProxy :id="row.departmentFk" dense
|
||||
/></span>
|
||||
<span class="link" :title="row.department" v-text="row.department" />
|
||||
<WorkerDescriptorProxy :id="row.departmentFk" dense />
|
||||
</template>
|
||||
<template #column-clientFk="{ row }">
|
||||
<span @click.stop.prevent class="link" :title="row.clientName">
|
||||
{{ row.clientName }}
|
||||
<CustomerDescriptorProxy :id="row.clientFk" dense
|
||||
/></span>
|
||||
<span class="link" :title="row.clientName" v-text="row.clientName" />
|
||||
<CustomerDescriptorProxy :id="row.clientFk" />
|
||||
</template>
|
||||
</VnTable>
|
||||
</template>
|
||||
|
|
|
@ -9,7 +9,6 @@ import { toDateFormat, toDateTimeFormat } from 'src/filters/date.js';
|
|||
import { toCurrency } from 'src/filters';
|
||||
import { useVnConfirm } from 'composables/useVnConfirm';
|
||||
import axios from 'axios';
|
||||
import useOpenURL from 'src/composables/useOpenURL';
|
||||
|
||||
const { t } = useI18n();
|
||||
const { openConfirmationModal } = useVnConfirm();
|
||||
|
@ -109,7 +108,8 @@ const removeOrders = async () => {
|
|||
await table.value.reload();
|
||||
};
|
||||
|
||||
const openTab = (id) => useOpenURL(`#/order/${id}/summary`);
|
||||
const openTab = (id) =>
|
||||
window.open(`#/order/${id}/summary`, '_blank', 'noopener, noreferrer');
|
||||
</script>
|
||||
<template>
|
||||
<VnTable
|
||||
|
@ -129,7 +129,6 @@ const openTab = (id) => useOpenURL(`#/order/${id}/summary`);
|
|||
}"
|
||||
default-mode="table"
|
||||
:row-click="({ id }) => openTab(id)"
|
||||
:row-ctrl-click="(_, { id }) => openTab(id)"
|
||||
v-model:selected="selectedRows"
|
||||
:disable-option="{ card: true }"
|
||||
>
|
||||
|
@ -178,16 +177,16 @@ const openTab = (id) => useOpenURL(`#/order/${id}/summary`);
|
|||
</template>
|
||||
|
||||
<template #column-clientFk="{ row }">
|
||||
<span class="link" @click.stop :title="row.clientName">
|
||||
{{ row.clientName }}
|
||||
<CustomerDescriptorProxy :id="row.clientFk" dense
|
||||
/></span>
|
||||
<QTd @click.stop>
|
||||
<span class="link" v-text="row.clientName" :title="row.clientName" />
|
||||
<CustomerDescriptorProxy :id="row.clientFk" />
|
||||
</QTd>
|
||||
</template>
|
||||
<template #column-departmentFk="{ row }">
|
||||
<span class="link" @click.stop :title="row.departmentName">
|
||||
{{ row.departmentName }}
|
||||
<DepartmentDescriptorProxy :id="row.departmentFk" dense
|
||||
/></span>
|
||||
<QTd @click.stop>
|
||||
<span class="link" v-text="row.departmentName" />
|
||||
<DepartmentDescriptorProxy :id="row.departmentFk" dense />
|
||||
</QTd>
|
||||
</template>
|
||||
</VnTable>
|
||||
</template>
|
||||
|
|
|
@ -194,6 +194,19 @@ const getLocale = (label) => {
|
|||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnSelect
|
||||
dense
|
||||
filled
|
||||
:label="t('globals.params.departmentFk')"
|
||||
v-model="params.department"
|
||||
option-label="name"
|
||||
option-value="name"
|
||||
url="Departments"
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnSelect
|
||||
|
|
|
@ -449,19 +449,21 @@ const openTab = (id) => useOpenURL(`#/ticket/${id}/sale`);
|
|||
<span :title="row.province" v-text="row.province" />
|
||||
</template>
|
||||
<template #column-state="{ row }">
|
||||
<div v-if="row.refFk" @click.stop.prevent>
|
||||
<span class="link">{{ row.refFk }}</span>
|
||||
<InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
|
||||
<div @click.stop.prevent>
|
||||
<div v-if="row.refFk">
|
||||
<span class="link">{{ row.refFk }}</span>
|
||||
<InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
|
||||
</div>
|
||||
<QBadge
|
||||
v-else
|
||||
:color="stateColors[row.classColor] || 'transparent'"
|
||||
:text-color="stateColors[row.classColor] ? 'black' : 'white'"
|
||||
class="q-pa-sm"
|
||||
style="font-size: 14px"
|
||||
>
|
||||
{{ row.state }}
|
||||
</QBadge>
|
||||
</div>
|
||||
<QBadge
|
||||
v-else
|
||||
:color="stateColors[row.classColor] || 'transparent'"
|
||||
:text-color="stateColors[row.classColor] ? 'black' : 'white'"
|
||||
class="q-pa-sm"
|
||||
style="font-size: 14px"
|
||||
>
|
||||
{{ row.state }}
|
||||
</QBadge>
|
||||
</template>
|
||||
<template #column-isFragile="{ row }">
|
||||
<QIcon v-if="row.isFragile" name="local_bar" color="primary" size="sm">
|
||||
|
|
|
@ -130,10 +130,8 @@ en:
|
|||
myTeam: My Team
|
||||
isConfirmed: Order Confirmed
|
||||
showEmpty: Show Empty
|
||||
departmentFk: Department
|
||||
es:
|
||||
params:
|
||||
departmentFk: Departamento
|
||||
search: Búsqueda
|
||||
clientFk: Cliente
|
||||
agencyModeFk: Agencia
|
||||
|
|
|
@ -71,174 +71,180 @@ async function handleConfirm() {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<CardSummary
|
||||
ref="summary"
|
||||
:url="`Orders/${entityId}/summary`"
|
||||
data-key="OrderSummary"
|
||||
>
|
||||
<template #header="{ entity }">
|
||||
{{ t('order.summary.basket') }} #{{ entity?.id }} -
|
||||
{{ entity?.client?.name }} ({{ entity?.clientFk }})
|
||||
</template>
|
||||
<template #header-right>
|
||||
<QBtn
|
||||
flat
|
||||
text-color="white"
|
||||
:disabled="isConfirmed"
|
||||
:label="t('order.summary.confirm')"
|
||||
@click="handleConfirm()"
|
||||
>
|
||||
<QTooltip>{{ t('order.summary.confirmLines') }}</QTooltip>
|
||||
</QBtn>
|
||||
</template>
|
||||
<template #menu="{ entity }">
|
||||
<OrderDescriptorMenu :order="entity" />
|
||||
</template>
|
||||
<template #body="{ entity }">
|
||||
<QCard class="vn-two">
|
||||
<VnTitle
|
||||
:url="`#/order/${entity.id}/basic-data`"
|
||||
:text="t('globals.pageTitles.basicData')"
|
||||
/>
|
||||
<div class="vn-card-group">
|
||||
<div class="vn-card-content">
|
||||
<VnLv label="ID" :value="entity.id" />
|
||||
<VnLv :label="t('globals.alias')" dash>
|
||||
<template #value>
|
||||
<span class="link">
|
||||
{{ dashIfEmpty(entity?.address?.nickname) }}
|
||||
<CustomerDescriptorProxy :id="entity?.clientFk" />
|
||||
</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv
|
||||
:label="t('globals.company')"
|
||||
:value="entity?.address?.companyFk"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('globals.confirmed')"
|
||||
:value="Boolean(entity?.isConfirmed)"
|
||||
/>
|
||||
</div>
|
||||
<div class="vn-card-content">
|
||||
<VnLv
|
||||
:label="t('order.summary.created')"
|
||||
:value="toDateHourMinSec(entity?.created)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('globals.confirmed')"
|
||||
:value="toDateHourMinSec(entity?.confirmed)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('globals.landed')"
|
||||
:value="toDateHourMinSec(entity?.landed)"
|
||||
/>
|
||||
<VnLv :label="t('globals.phone')">
|
||||
<template #value>
|
||||
{{ dashIfEmpty(entity?.address?.phone) }}
|
||||
<a
|
||||
v-if="entity?.address?.phone"
|
||||
:href="`tel:${entity?.address?.phone}`"
|
||||
class="text-primary"
|
||||
>
|
||||
<QIcon name="phone" />
|
||||
</a>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv
|
||||
:label="t('order.summary.createdFrom')"
|
||||
:value="entity?.sourceApp"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('order.summary.address')"
|
||||
:value="`${entity?.address?.street} - ${entity?.address?.city} (${entity?.address?.province?.name})`"
|
||||
class="order-summary-address"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</QCard>
|
||||
<QCard class="vn-one">
|
||||
<VnTitle :text="t('globals.pageTitles.notes')" />
|
||||
<p v-if="entity?.note" class="no-margin">
|
||||
{{ entity?.note }}
|
||||
</p>
|
||||
</QCard>
|
||||
<QCard class="vn-one">
|
||||
<VnTitle :text="t('order.summary.total')" />
|
||||
<VnLv>
|
||||
<template #label>
|
||||
<span class="text-h6">{{ t('globals.subtotal') }}</span>
|
||||
</template>
|
||||
<template #value>
|
||||
<span class="text-h6">{{ toCurrency(entity?.subTotal) }}</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv>
|
||||
<template #label>
|
||||
<span class="text-h6">{{ t('globals.vat') }}</span>
|
||||
</template>
|
||||
<template #value>
|
||||
<span class="text-h6">{{ toCurrency(entity?.VAT) }}</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv>
|
||||
<template #label>
|
||||
<span class="text-h6">{{ t('order.summary.total') }}</span>
|
||||
</template>
|
||||
<template #value>
|
||||
<span class="text-h6">{{ toCurrency(entity?.total) }}</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
</QCard>
|
||||
<QCard>
|
||||
<VnTitle :text="t('globals.details')" />
|
||||
<QTable :columns="detailsColumns" :rows="entity?.rows" flat>
|
||||
<template #header="props">
|
||||
<QTr :props="props">
|
||||
<QTh auto-width>{{ t('globals.item') }}</QTh>
|
||||
<QTh>{{ t('globals.description') }}</QTh>
|
||||
<QTh auto-width>{{ t('globals.quantity') }}</QTh>
|
||||
<QTh auto-width>{{ t('globals.price') }}</QTh>
|
||||
<QTh auto-width>{{ t('order.summary.amount') }}</QTh>
|
||||
</QTr>
|
||||
</template>
|
||||
<template #body="props">
|
||||
<QTr :props="props">
|
||||
<QTd key="item" :props="props" class="item">
|
||||
<span class="link">
|
||||
{{ props.row.item?.id }}
|
||||
<ItemDescriptorProxy :id="props.row.item?.id" />
|
||||
</span>
|
||||
</QTd>
|
||||
<QTd key="description" :props="props">
|
||||
<div class="description">
|
||||
<div class="name">
|
||||
{{ props.row.item.name }}
|
||||
<span
|
||||
v-if="props.row.item.subName"
|
||||
class="subName"
|
||||
>
|
||||
{{ props.row.item.subName }}
|
||||
</span>
|
||||
<div class="q-pa-md">
|
||||
<CardSummary
|
||||
ref="summary"
|
||||
:url="`Orders/${entityId}/summary`"
|
||||
data-key="OrderSummary"
|
||||
>
|
||||
<template #header="{ entity }">
|
||||
{{ t('order.summary.basket') }} #{{ entity?.id }} -
|
||||
{{ entity?.client?.name }} ({{ entity?.clientFk }})
|
||||
</template>
|
||||
<template #header-right>
|
||||
<QBtn
|
||||
flat
|
||||
text-color="white"
|
||||
:disabled="isConfirmed"
|
||||
:label="t('order.summary.confirm')"
|
||||
@click="handleConfirm()"
|
||||
>
|
||||
<QTooltip>{{ t('order.summary.confirmLines') }}</QTooltip>
|
||||
</QBtn>
|
||||
</template>
|
||||
<template #menu="{ entity }">
|
||||
<OrderDescriptorMenu :order="entity" />
|
||||
</template>
|
||||
<template #body="{ entity }">
|
||||
<QCard class="vn-one">
|
||||
<VnTitle
|
||||
:url="`#/order/${entity.id}/basic-data`"
|
||||
:text="t('globals.pageTitles.basicData')"
|
||||
/>
|
||||
<VnLv label="ID" :value="entity.id" />
|
||||
<VnLv :label="t('globals.alias')" dash>
|
||||
<template #value>
|
||||
<span class="link">
|
||||
{{ dashIfEmpty(entity?.address?.nickname) }}
|
||||
<CustomerDescriptorProxy :id="entity?.clientFk" />
|
||||
</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv
|
||||
:label="t('globals.company')"
|
||||
:value="entity?.address?.companyFk"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('globals.confirmed')"
|
||||
:value="Boolean(entity?.isConfirmed)"
|
||||
/>
|
||||
</QCard>
|
||||
<QCard class="vn-one">
|
||||
<VnTitle
|
||||
:url="`#/order/${entity.id}/basic-data`"
|
||||
:text="t('globals.pageTitles.basicData')"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('order.summary.created')"
|
||||
:value="toDateHourMinSec(entity?.created)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('globals.confirmed')"
|
||||
:value="toDateHourMinSec(entity?.confirmed)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('globals.landed')"
|
||||
:value="toDateHourMinSec(entity?.landed)"
|
||||
/>
|
||||
<VnLv :label="t('globals.phone')">
|
||||
<template #value>
|
||||
{{ dashIfEmpty(entity?.address?.phone) }}
|
||||
<a
|
||||
v-if="entity?.address?.phone"
|
||||
:href="`tel:${entity?.address?.phone}`"
|
||||
class="text-primary"
|
||||
>
|
||||
<QIcon name="phone" />
|
||||
</a>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv
|
||||
:label="t('order.summary.createdFrom')"
|
||||
:value="entity?.sourceApp"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('order.summary.address')"
|
||||
:value="`${entity?.address?.street} - ${entity?.address?.city} (${entity?.address?.province?.name})`"
|
||||
class="order-summary-address"
|
||||
/>
|
||||
</QCard>
|
||||
<QCard class="vn-one">
|
||||
<VnTitle :text="t('globals.pageTitles.notes')" />
|
||||
<p v-if="entity?.note" class="no-margin">
|
||||
{{ entity?.note }}
|
||||
</p>
|
||||
</QCard>
|
||||
<QCard class="vn-one">
|
||||
<VnTitle :text="t('order.summary.total')" />
|
||||
<VnLv>
|
||||
<template #label>
|
||||
<span class="text-h6">{{ t('globals.subtotal') }}</span>
|
||||
</template>
|
||||
<template #value>
|
||||
<span class="text-h6">{{
|
||||
toCurrency(entity?.subTotal)
|
||||
}}</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv>
|
||||
<template #label>
|
||||
<span class="text-h6">{{ t('globals.vat') }}</span>
|
||||
</template>
|
||||
<template #value>
|
||||
<span class="text-h6">{{ toCurrency(entity?.VAT) }}</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv>
|
||||
<template #label>
|
||||
<span class="text-h6">{{ t('order.summary.total') }}</span>
|
||||
</template>
|
||||
<template #value>
|
||||
<span class="text-h6">{{ toCurrency(entity?.total) }}</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
</QCard>
|
||||
<QCard>
|
||||
<VnTitle :text="t('globals.details')" />
|
||||
<QTable :columns="detailsColumns" :rows="entity?.rows" flat>
|
||||
<template #header="props">
|
||||
<QTr :props="props">
|
||||
<QTh auto-width>{{ t('globals.item') }}</QTh>
|
||||
<QTh>{{ t('globals.description') }}</QTh>
|
||||
<QTh auto-width>{{ t('globals.quantity') }}</QTh>
|
||||
<QTh auto-width>{{ t('globals.price') }}</QTh>
|
||||
<QTh auto-width>{{ t('order.summary.amount') }}</QTh>
|
||||
</QTr>
|
||||
</template>
|
||||
<template #body="props">
|
||||
<QTr :props="props">
|
||||
<QTd key="item" :props="props" class="item">
|
||||
<span class="link">
|
||||
{{ props.row.item?.id }}
|
||||
<ItemDescriptorProxy :id="props.row.item?.id" />
|
||||
</span>
|
||||
</QTd>
|
||||
<QTd key="description" :props="props">
|
||||
<div class="description">
|
||||
<div class="name">
|
||||
{{ props.row.item.name }}
|
||||
<span
|
||||
v-if="props.row.item.subName"
|
||||
class="subName"
|
||||
>
|
||||
{{ props.row.item.subName }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<FetchedTags :item="props.row.item" :columns="3" />
|
||||
</QTd>
|
||||
<QTd key="quantity" :props="props">
|
||||
{{ props.row.quantity }}
|
||||
</QTd>
|
||||
<QTd key="price" :props="props">
|
||||
{{ toCurrency(props.row.price) }}
|
||||
</QTd>
|
||||
<QTd key="amount" :props="props">
|
||||
{{ toCurrency(props.row?.quantity * props.row?.price) }}
|
||||
</QTd>
|
||||
</QTr>
|
||||
</template>
|
||||
</QTable>
|
||||
</QCard>
|
||||
</template>
|
||||
</CardSummary>
|
||||
<FetchedTags :item="props.row.item" :columns="3" />
|
||||
</QTd>
|
||||
<QTd key="quantity" :props="props">
|
||||
{{ props.row.quantity }}
|
||||
</QTd>
|
||||
<QTd key="price" :props="props">
|
||||
{{ toCurrency(props.row.price) }}
|
||||
</QTd>
|
||||
<QTd key="amount" :props="props">
|
||||
{{
|
||||
toCurrency(props.row?.quantity * props.row?.price)
|
||||
}}
|
||||
</QTd>
|
||||
</QTr>
|
||||
</template>
|
||||
</QTable>
|
||||
</QCard>
|
||||
</template>
|
||||
</CardSummary>
|
||||
</div>
|
||||
</template>
|
||||
<style lang="scss">
|
||||
.cardSummary .summaryBody .vn-label-value.order-summary-address {
|
||||
|
|
|
@ -65,6 +65,7 @@ const columns = computed(() => [
|
|||
attrs: {
|
||||
url: 'Departments',
|
||||
},
|
||||
create: true,
|
||||
columnField: {
|
||||
component: null,
|
||||
},
|
||||
|
@ -141,7 +142,7 @@ const columns = computed(() => [
|
|||
{
|
||||
title: t('globals.pageTitles.summary'),
|
||||
icon: 'preview',
|
||||
action: (row) => viewSummary(row.id, OrderSummary, 'lg-width'),
|
||||
action: (row) => viewSummary(row.id, OrderSummary),
|
||||
isPrimary: true,
|
||||
},
|
||||
],
|
||||
|
|
|
@ -3,5 +3,5 @@ import AgencyDescriptor from 'pages/Route/Agency/Card/AgencyDescriptor.vue';
|
|||
import VnCard from 'src/components/common/VnCard.vue';
|
||||
</script>
|
||||
<template>
|
||||
<VnCard data-key="Agency" url="Agencies" :descriptor="AgencyDescriptor" :filter="{ where: { id: $route.params.id } }" />
|
||||
<VnCard data-key="Agency" url="Agencies" :descriptor="AgencyDescriptor" />
|
||||
</template>
|
||||
|
|
|
@ -138,79 +138,74 @@ const ticketColumns = ref([
|
|||
:url="`#/${route.meta.moduleName.toLowerCase()}/${entityId}/basic-data`"
|
||||
:text="t('globals.pageTitles.basicData')"
|
||||
/>
|
||||
<div class="vn-card-group">
|
||||
<div class="vn-card-content">
|
||||
<VnLv
|
||||
:label="t('route.summary.date')"
|
||||
:value="toDate(entity?.route.dated)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('route.summary.agency')"
|
||||
:value="entity?.route?.agencyMode?.name"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('route.summary.vehicle')"
|
||||
:value="entity.route?.vehicle?.numberPlate"
|
||||
/>
|
||||
<VnLv :label="t('route.summary.driver')">
|
||||
<template #value>
|
||||
<span class="link">
|
||||
{{
|
||||
dashIfEmpty(entity?.route?.worker?.user?.name)
|
||||
}}
|
||||
<WorkerDescriptorProxy
|
||||
:id="entity.route?.workerFk"
|
||||
/>
|
||||
</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv
|
||||
:label="t('route.summary.cost')"
|
||||
:value="toCurrency(entity.route?.cost)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('route.summary.volume')"
|
||||
:value="`${dashIfEmpty(entity?.route?.m3)} / ${dashIfEmpty(
|
||||
entity?.route?.vehicle?.m3,
|
||||
)} m³`"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('route.summary.packages')"
|
||||
:value="getTotalPackages(entity.tickets)"
|
||||
/>
|
||||
<QCheckbox
|
||||
:label="
|
||||
entity.route.isOk
|
||||
? t('route.summary.closed')
|
||||
: t('route.summary.open')
|
||||
"
|
||||
v-model="entity.route.isOk"
|
||||
:disable="true"
|
||||
/>
|
||||
</div>
|
||||
<div class="vn-card-content">
|
||||
<VnLv
|
||||
:label="t('route.summary.started')"
|
||||
:value="toHour(entity?.route.started)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('route.summary.finished')"
|
||||
:value="toHour(entity?.route.finished)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('route.summary.kmStart')"
|
||||
:value="dashIfEmpty(entity?.route?.kmStart)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('route.summary.kmEnd')"
|
||||
:value="dashIfEmpty(entity?.route?.kmEnd)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('globals.description')"
|
||||
:value="dashIfEmpty(entity?.route?.description)"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</QCard>
|
||||
|
||||
<QCard class="vn-one">
|
||||
<VnLv
|
||||
:label="t('route.summary.date')"
|
||||
:value="toDate(entity?.route.dated)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('route.summary.agency')"
|
||||
:value="entity?.route?.agencyMode?.name"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('route.summary.vehicle')"
|
||||
:value="entity.route?.vehicle?.numberPlate"
|
||||
/>
|
||||
<VnLv :label="t('route.summary.driver')">
|
||||
<template #value>
|
||||
<span class="link">
|
||||
{{ dashIfEmpty(entity?.route?.worker?.user?.name) }}
|
||||
<WorkerDescriptorProxy :id="entity.route?.workerFk" />
|
||||
</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv
|
||||
:label="t('route.summary.cost')"
|
||||
:value="toCurrency(entity.route?.cost)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('route.summary.volume')"
|
||||
:value="`${dashIfEmpty(entity?.route?.m3)} / ${dashIfEmpty(
|
||||
entity?.route?.vehicle?.m3,
|
||||
)} m³`"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('route.summary.packages')"
|
||||
:value="getTotalPackages(entity.tickets)"
|
||||
/>
|
||||
<QCheckbox
|
||||
:label="
|
||||
entity.route.isOk
|
||||
? t('route.summary.closed')
|
||||
: t('route.summary.open')
|
||||
"
|
||||
v-model="entity.route.isOk"
|
||||
:disable="true"
|
||||
/>
|
||||
</QCard>
|
||||
<QCard class="vn-one">
|
||||
<VnLv
|
||||
:label="t('route.summary.started')"
|
||||
:value="toHour(entity?.route.started)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('route.summary.finished')"
|
||||
:value="toHour(entity?.route.finished)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('route.summary.kmStart')"
|
||||
:value="dashIfEmpty(entity?.route?.kmStart)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('route.summary.kmEnd')"
|
||||
:value="dashIfEmpty(entity?.route?.kmEnd)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('globals.description')"
|
||||
:value="dashIfEmpty(entity?.route?.description)"
|
||||
/>
|
||||
</QCard>
|
||||
<QCard class="vn-max">
|
||||
<VnTitle
|
||||
|
|
|
@ -112,9 +112,12 @@ const filter = {
|
|||
:label="t('Trailer Plate')"
|
||||
:value="dashIfEmpty(entity?.trailerPlate)"
|
||||
/>
|
||||
<VnLv :label="t('Phone')">
|
||||
<VnLv :label="t('Phone')" :value="dashIfEmpty(entity?.phone)">
|
||||
<template #value>
|
||||
<VnLinkPhone :phone-number="entity?.phone" />
|
||||
<span>
|
||||
{{ dashIfEmpty(entity?.phone) }}
|
||||
<VnLinkPhone :phone-number="entity?.phone" />
|
||||
</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv
|
||||
|
|
|
@ -213,7 +213,7 @@ function exprBuilder(param, value) {
|
|||
}"
|
||||
>
|
||||
<template #advanced-menu>
|
||||
<RoadmapFilter :data-key />
|
||||
<RoadmapFilter :dataKey />
|
||||
</template>
|
||||
<template #body>
|
||||
<VnTable
|
||||
|
|
|
@ -1,35 +0,0 @@
|
|||
<script setup>
|
||||
import { computed } from 'vue';
|
||||
import { useRoute } from 'vue-router';
|
||||
import { useState } from 'src/composables/useState';
|
||||
import VnNotes from 'src/components/ui/VnNotes.vue';
|
||||
|
||||
const route = useRoute();
|
||||
const state = useState();
|
||||
const user = state.getUser();
|
||||
const vehicleId = computed(() => route.params.id);
|
||||
|
||||
const noteFilter = computed(() => {
|
||||
return {
|
||||
order: 'created DESC',
|
||||
where: { vehicleFk: vehicleId.value },
|
||||
};
|
||||
});
|
||||
|
||||
const body = {
|
||||
vehicleFk: vehicleId.value,
|
||||
workerFk: user.value.id,
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<VnNotes
|
||||
url="vehicleObservations"
|
||||
:add-note="true"
|
||||
:filter="noteFilter"
|
||||
:body="body"
|
||||
style="overflow-y: auto"
|
||||
required
|
||||
deletable
|
||||
/>
|
||||
</template>
|
|
@ -50,7 +50,7 @@ route:
|
|||
agencyAgreement: Agency agreement
|
||||
agencyModeName: Agency route
|
||||
isOwn: Own
|
||||
isAnyVolumeAllowed: Any volume allowed
|
||||
isAnyVolumeallowed: Any volume allowed
|
||||
Worker: Worker
|
||||
Agency: Agency
|
||||
Vehicle: Vehicle
|
||||
|
|
|
@ -1,14 +0,0 @@
|
|||
<script setup>
|
||||
import ParkingDescriptor from './ParkingDescriptor.vue';
|
||||
import ParkingSummary from './ParkingSummary.vue';
|
||||
</script>
|
||||
<template>
|
||||
<QPopupProxy style="max-width: 10px">
|
||||
<ParkingDescriptor
|
||||
v-if="$attrs.id"
|
||||
v-bind="$attrs.id"
|
||||
:summary="ParkingSummary"
|
||||
:proxy-render="true"
|
||||
/>
|
||||
</QPopupProxy>
|
||||
</template>
|
|
@ -106,7 +106,7 @@ const getEntryQueryParams = (supplier) => {
|
|||
<QBtn
|
||||
:to="{
|
||||
name: 'EntryList',
|
||||
query: { table: JSON.stringify(getEntryQueryParams(entity)) },
|
||||
query: { params: JSON.stringify(getEntryQueryParams(entity)) },
|
||||
}"
|
||||
size="md"
|
||||
icon="vn:entry"
|
||||
|
|
|
@ -25,7 +25,9 @@ const { validate } = useValidator();
|
|||
const { notify } = useNotify();
|
||||
const router = useRouter();
|
||||
const { t } = useI18n();
|
||||
const canEditZone = useAcl().hasAcl('Ticket', 'editZone', 'WRITE');
|
||||
const canEditZone = useAcl().hasAny([
|
||||
{ model: 'Ticket', props: 'editZone', accessType: 'WRITE' },
|
||||
]);
|
||||
|
||||
const agencyFetchRef = ref();
|
||||
const warehousesOptions = ref([]);
|
||||
|
|
|
@ -44,7 +44,7 @@ const getPriceDifference = async () => {
|
|||
shipped: ticket.value.shipped,
|
||||
};
|
||||
const { data } = await axios.post(
|
||||
`tickets/${ticket.value.id}/priceDifference`,
|
||||
`tickets/${formData.value.id}/priceDifference`,
|
||||
params,
|
||||
);
|
||||
ticket.value.sale = data;
|
||||
|
@ -71,7 +71,7 @@ const submit = async () => {
|
|||
};
|
||||
|
||||
const { data } = await axios.post(
|
||||
`tickets/${ticket.value.id}/componentUpdate`,
|
||||
`tickets/${formData.value.id}/componentUpdate`,
|
||||
params,
|
||||
);
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<script setup>
|
||||
import { onMounted, ref, computed, watch, inject } from 'vue';
|
||||
import { onMounted, ref, computed, watch } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useRouter, useRoute } from 'vue-router';
|
||||
import { useQuasar } from 'quasar';
|
||||
|
@ -25,7 +25,7 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
|
|||
import VnConfirm from 'src/components/ui/VnConfirm.vue';
|
||||
import TicketProblems from 'src/components/TicketProblems.vue';
|
||||
import RightMenu from 'src/components/common/RightMenu.vue';
|
||||
const app = inject('app');
|
||||
|
||||
const route = useRoute();
|
||||
const router = useRouter();
|
||||
const { t } = useI18n();
|
||||
|
@ -187,26 +187,20 @@ const getRowUpdateInputEvents = (sale) => {
|
|||
|
||||
const resetChanges = async () => {
|
||||
arrayData.fetch({ append: false });
|
||||
tableRef.value.CrudModelRef.hasChanges = false;
|
||||
await tableRef.value.reload();
|
||||
|
||||
tableRef.value.reload();
|
||||
selectedRows.value = [];
|
||||
};
|
||||
const changeQuantity = async (sale) => {
|
||||
if (!sale.itemFk || sale.quantity == null || sale?.originalQuantity === sale.quantity)
|
||||
return;
|
||||
else sale.originalQuantity = sale.quantity;
|
||||
try {
|
||||
if (!sale.id) await addSale(sale);
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
return;
|
||||
}
|
||||
if (!sale.id) return addSale(sale);
|
||||
|
||||
if (await isSalePrepared(sale)) {
|
||||
await confirmUpdate(() => updateQuantity(sale));
|
||||
} else await updateQuantity(sale);
|
||||
};
|
||||
|
||||
const updateQuantity = async (sale) => {
|
||||
try {
|
||||
let { quantity, id } = sale;
|
||||
|
@ -219,7 +213,7 @@ const updateQuantity = async (sale) => {
|
|||
(s) => s.id === sale.id,
|
||||
);
|
||||
sale.quantity = quantity;
|
||||
app.config.errorHandler(e);
|
||||
throw e;
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -228,27 +222,24 @@ const addSale = async (sale) => {
|
|||
barcode: sale.itemFk,
|
||||
quantity: sale.quantity,
|
||||
};
|
||||
try {
|
||||
const { data } = await axios.post(`tickets/${route.params.id}/addSale`, params);
|
||||
|
||||
if (!data) return;
|
||||
const { data } = await axios.post(`tickets/${route.params.id}/addSale`, params);
|
||||
|
||||
const newSale = data;
|
||||
sale.id = newSale.id;
|
||||
sale.image = newSale.item.image;
|
||||
sale.subName = newSale.item.subName;
|
||||
sale.concept = newSale.concept;
|
||||
sale.quantity = newSale.quantity;
|
||||
sale.discount = newSale.discount;
|
||||
sale.price = newSale.price;
|
||||
sale.item = newSale.item;
|
||||
if (!data) return;
|
||||
|
||||
notify('globals.dataSaved', 'positive');
|
||||
sale.isNew = false;
|
||||
resetChanges();
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
}
|
||||
const newSale = data;
|
||||
sale.id = newSale.id;
|
||||
sale.image = newSale.item.image;
|
||||
sale.subName = newSale.item.subName;
|
||||
sale.concept = newSale.concept;
|
||||
sale.quantity = newSale.quantity;
|
||||
sale.discount = newSale.discount;
|
||||
sale.price = newSale.price;
|
||||
sale.item = newSale.item;
|
||||
|
||||
notify('globals.dataSaved', 'positive');
|
||||
sale.isNew = false;
|
||||
resetChanges();
|
||||
};
|
||||
const changeConcept = async (sale) => {
|
||||
if (await isSalePrepared(sale)) {
|
||||
|
@ -257,14 +248,10 @@ const changeConcept = async (sale) => {
|
|||
};
|
||||
|
||||
const updateConcept = async (sale) => {
|
||||
try {
|
||||
const data = { newConcept: sale.concept };
|
||||
await axios.post(`Sales/${sale.id}/updateConcept`, data);
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
}
|
||||
const data = { newConcept: sale.concept };
|
||||
await axios.post(`Sales/${sale.id}/updateConcept`, data);
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
};
|
||||
|
||||
const DEFAULT_EDIT = {
|
||||
|
@ -275,6 +262,18 @@ const DEFAULT_EDIT = {
|
|||
oldQuantity: null,
|
||||
};
|
||||
const edit = ref({ ...DEFAULT_EDIT });
|
||||
const usesMana = ref(null);
|
||||
|
||||
const getUsesMana = async () => {
|
||||
const { data } = await axios.get('Sales/usesMana');
|
||||
usesMana.value = data;
|
||||
};
|
||||
|
||||
const getMana = async () => {
|
||||
const { data } = await axios.get(`Tickets/${route.params.id}/getDepartmentMana`);
|
||||
mana.value = data;
|
||||
await getUsesMana();
|
||||
};
|
||||
|
||||
const selectedValidSales = computed(() => {
|
||||
if (!sales.value) return;
|
||||
|
@ -311,15 +310,11 @@ const changePrice = async (sale) => {
|
|||
}
|
||||
};
|
||||
const updatePrice = async (sale, newPrice) => {
|
||||
try {
|
||||
await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
|
||||
sale.price = newPrice;
|
||||
edit.value = { ...DEFAULT_EDIT };
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
}
|
||||
await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
|
||||
sale.price = newPrice;
|
||||
edit.value = { ...DEFAULT_EDIT };
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
};
|
||||
|
||||
const changeDiscount = async (sale) => {
|
||||
|
@ -342,20 +337,15 @@ const updateDiscounts = async (sales, newDiscount) => {
|
|||
};
|
||||
|
||||
const updateDiscount = async (sales, newDiscount = 0) => {
|
||||
try {
|
||||
const salesIds = sales.map(({ id }) => id);
|
||||
const params = {
|
||||
salesIds,
|
||||
newDiscount,
|
||||
manaCode: manaCode.value,
|
||||
};
|
||||
await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
return;
|
||||
}
|
||||
const salesIds = sales.map(({ id }) => id);
|
||||
const params = {
|
||||
salesIds,
|
||||
newDiscount,
|
||||
manaCode: manaCode.value,
|
||||
};
|
||||
await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
};
|
||||
|
||||
const getNewPrice = computed(() => {
|
||||
|
@ -377,40 +367,30 @@ const getNewPrice = computed(() => {
|
|||
});
|
||||
|
||||
const newOrderFromTicket = async () => {
|
||||
try {
|
||||
const { data } = await axios.post(`Orders/newFromTicket`, {
|
||||
ticketFk: Number(route.params.id),
|
||||
});
|
||||
const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
|
||||
window.open(routeData.href, '_blank');
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
}
|
||||
const { data } = await axios.post(`Orders/newFromTicket`, {
|
||||
ticketFk: Number(route.params.id),
|
||||
});
|
||||
const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
|
||||
window.open(routeData.href, '_blank');
|
||||
};
|
||||
|
||||
const goToLog = (saleId) => {
|
||||
router.push({
|
||||
name: 'TicketLog',
|
||||
query: {
|
||||
logs: JSON.stringify({
|
||||
originFk: route.params.id,
|
||||
changedModel: 'Sale',
|
||||
changedModelId: saleId,
|
||||
}),
|
||||
params: {
|
||||
originId: route.params.id,
|
||||
changedModel: 'Sale',
|
||||
changedModelId: saleId,
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
const changeTicketState = async (val) => {
|
||||
try {
|
||||
stateBtnDropdownRef.value.hide();
|
||||
const params = { ticketFk: route.params.id, code: val };
|
||||
await axios.post('Tickets/state', params);
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
}
|
||||
stateBtnDropdownRef.value.hide();
|
||||
const params = { ticketFk: route.params.id, code: val };
|
||||
await axios.post('Tickets/state', params);
|
||||
notify('globals.dataSaved', 'positive');
|
||||
await resetChanges();
|
||||
};
|
||||
|
||||
const removeSelectedSales = () => {
|
||||
|
@ -430,14 +410,10 @@ const removeSales = async () => {
|
|||
.forEach((sale) => tableRef.value.CrudModelRef.formData.splice(sale.$index, 1));
|
||||
|
||||
if (params.sales.length == 0) return;
|
||||
try {
|
||||
await axios.post('Sales/deleteSales', params);
|
||||
removeSelectedSales();
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
} catch (e) {
|
||||
app.config.errorHandler(e);
|
||||
}
|
||||
await axios.post('Sales/deleteSales', params);
|
||||
removeSelectedSales();
|
||||
notify('globals.dataSaved', 'positive');
|
||||
resetChanges();
|
||||
};
|
||||
|
||||
const setTransferParams = async () => {
|
||||
|
|
|
@ -55,12 +55,13 @@ const isClaimable = computed(() => {
|
|||
if (ticket.value) {
|
||||
const landedPlusWeek = new Date(ticket.value.landed);
|
||||
landedPlusWeek.setDate(landedPlusWeek.getDate() + 7);
|
||||
const createAfterDeadline = acl.hasAcl('Claim', 'createAfterDeadline', 'WRITE');
|
||||
const createAfterDeadline = acl.hasAny([
|
||||
{ model: 'Claim', props: 'createAfterDeadline', accessType: 'WRITE' },
|
||||
]);
|
||||
return landedPlusWeek >= Date.vnNew() || createAfterDeadline;
|
||||
}
|
||||
return false;
|
||||
});
|
||||
|
||||
const sendSms = async (params) => {
|
||||
await axios.post(`Tickets/${ticket.value.id}/sendSms`, params);
|
||||
notify(t('SMS sent'), 'positive');
|
||||
|
@ -229,6 +230,18 @@ const createRefund = async (withWarehouse) => {
|
|||
<QItemLabel>{{ t('Add claim') }}</QItemLabel>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem
|
||||
v-if="isTicketEditable"
|
||||
clickable
|
||||
v-close-popup
|
||||
v-ripple
|
||||
@click="setReserved(true)"
|
||||
data-cy="markAsReservedItem"
|
||||
>
|
||||
<QItemSection>
|
||||
<QItemLabel>{{ t('Mark as reserved') }}</QItemLabel>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem clickable v-ripple data-cy="ticketSaleRefundItem">
|
||||
<QItemSection>
|
||||
<QItemLabel>{{ t('Refund') }}</QItemLabel>
|
||||
|
@ -274,6 +287,8 @@ es:
|
|||
Recalculate price: Recalcular precio
|
||||
Update discount: Actualizar descuento
|
||||
Add claim: Crear reclamación
|
||||
Mark as reserved: Marcar como reservado
|
||||
Unmark as reserved: Desmarcar como reservado
|
||||
Refund: Abono
|
||||
with warehouse: con almacén
|
||||
without warehouse: sin almacén
|
||||
|
|
|
@ -21,7 +21,6 @@ import VnSelect from 'src/components/common/VnSelect.vue';
|
|||
import VnToSummary from 'src/components/ui/VnToSummary.vue';
|
||||
import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
|
||||
import TicketProblems from 'src/components/TicketProblems.vue';
|
||||
import VnDropdown from 'src/components/common/VnDropdown.vue';
|
||||
|
||||
const route = useRoute();
|
||||
const { notify } = useNotify();
|
||||
|
@ -41,7 +40,7 @@ const ticket = computed(() => summary.value?.entity);
|
|||
const editableStates = ref([]);
|
||||
const ticketUrl = ref();
|
||||
const grafanaUrl = 'https://grafana.verdnatura.es';
|
||||
|
||||
const stateBtnDropdownRef = ref();
|
||||
const descriptorData = useArrayData('Ticket');
|
||||
|
||||
onMounted(async () => {
|
||||
|
@ -68,6 +67,7 @@ function isEditable() {
|
|||
}
|
||||
|
||||
async function changeState(value) {
|
||||
stateBtnDropdownRef.value?.hide();
|
||||
const formData = {
|
||||
ticketFk: entityId.value,
|
||||
code: value,
|
||||
|
@ -113,139 +113,144 @@ onMounted(async () => {
|
|||
</div>
|
||||
</template>
|
||||
<template #header-right>
|
||||
<VnDropdown
|
||||
:disable="!isEditable()"
|
||||
:options="editableStates"
|
||||
option-value="code"
|
||||
@change-state="changeState"
|
||||
/>
|
||||
<div>
|
||||
<QBtnDropdown
|
||||
ref="stateBtnDropdownRef"
|
||||
color="black"
|
||||
text-color="white"
|
||||
:label="t('globals.changeState')"
|
||||
:disable="!isEditable()"
|
||||
>
|
||||
<VnSelect
|
||||
:options="editableStates"
|
||||
hide-selected
|
||||
option-label="name"
|
||||
option-value="code"
|
||||
hide-dropdown-icon
|
||||
focus-on-mount
|
||||
@update:model-value="changeState"
|
||||
/>
|
||||
</QBtnDropdown>
|
||||
</div>
|
||||
</template>
|
||||
<template #menu="{ entity }">
|
||||
<TicketDescriptorMenu :ticket="entity" />
|
||||
</template>
|
||||
<template #body="{ entity }">
|
||||
<QCard class="vn-two">
|
||||
<QCard class="vn-one">
|
||||
<VnTitle
|
||||
:url="toTicketUrl('basic-data')"
|
||||
:text="t('globals.summary.basicData')"
|
||||
/>
|
||||
<div class="vn-card-group">
|
||||
<div class="vn-card-content">
|
||||
<VnLv v-if="entity.ticketState" :label="t('globals.state')">
|
||||
<template #value>
|
||||
<QBadge
|
||||
text-color="black"
|
||||
:color="entity.ticketState.state.classColor"
|
||||
>
|
||||
{{ entity.ticketState.state.name }}
|
||||
</QBadge>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :label="t('customer.summary.team')">
|
||||
<template #value>
|
||||
<span class="link">
|
||||
{{ entity?.client?.department?.name || '-' }}
|
||||
<DepartmentDescriptorProxy
|
||||
:id="entity?.client?.departmentFk"
|
||||
/>
|
||||
</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv
|
||||
:label="t('globals.agency')"
|
||||
:value="entity.agencyMode?.name"
|
||||
/>
|
||||
<VnLv :label="t('ticket.summary.zone')">
|
||||
<template #value>
|
||||
<span class="link" @click.stop>
|
||||
{{ entity?.zone?.name }}
|
||||
<ZoneDescriptorProxy :id="entity.zoneFk" />
|
||||
</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv
|
||||
:label="t('globals.warehouse')"
|
||||
:value="entity.warehouse?.name"
|
||||
/>
|
||||
<VnLv
|
||||
v-if="ticket?.ticketCollections?.length > 0"
|
||||
:label="t('ticket.summary.collection')"
|
||||
:value="ticket?.ticketCollections[0]?.collectionFk"
|
||||
<VnLv v-if="entity.ticketState" :label="t('globals.state')">
|
||||
<template #value>
|
||||
<QBadge
|
||||
text-color="black"
|
||||
:color="entity.ticketState.state.classColor"
|
||||
>
|
||||
<template #value>
|
||||
<a
|
||||
:href="`${grafanaUrl}/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-collectionFk=${entity.ticketCollections[0]?.collectionFk}`"
|
||||
target="_blank"
|
||||
class="grafana"
|
||||
>
|
||||
{{ entity.ticketCollections[0]?.collectionFk }}
|
||||
</a>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :label="t('ticket.summary.route')">
|
||||
<template #value>
|
||||
<span class="link">
|
||||
{{ entity.routeFk }}
|
||||
<RouteDescriptorProxy :id="entity.routeFk" />
|
||||
</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :label="t('ticket.summary.invoice')">
|
||||
<template #value>
|
||||
<span :class="{ link: entity.refFk }">
|
||||
{{ dashIfEmpty(entity.refFk) }}
|
||||
<InvoiceOutDescriptorProxy
|
||||
:id="entity.invoiceOut.id"
|
||||
v-if="entity.refFk"
|
||||
/>
|
||||
</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv
|
||||
:label="t('globals.weight')"
|
||||
:value="dashIfEmpty(entity.weight)"
|
||||
/>
|
||||
</div>
|
||||
<div class="vn-card-content">
|
||||
<VnLv
|
||||
:label="t('ticket.summary.shipped')"
|
||||
:value="toDate(entity.shipped)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('globals.landed')"
|
||||
:value="toDate(entity.landed)"
|
||||
/>
|
||||
<VnLv :label="t('globals.packages')" :value="entity.packages" />
|
||||
<VnLv :label="t('ticket.summary.consigneePhone')">
|
||||
<template #value>
|
||||
<VnLinkPhone :phone-number="entity.address.phone" />
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :label="t('ticket.summary.consigneeMobile')">
|
||||
<template #value>
|
||||
<VnLinkPhone :phone-number="entity.address.mobile" />
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :label="t('ticket.summary.clientPhone')">
|
||||
<template #value>
|
||||
<VnLinkPhone :phone-number="entity.client.phone" />
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :label="t('ticket.summary.clientMobile')">
|
||||
<template #value>
|
||||
<VnLinkPhone :phone-number="entity.client.mobile" />
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv
|
||||
:label="t('ticket.summary.consignee')"
|
||||
:value="`${entity.address?.nickname} #${entity.address?.id}`"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('ticket.summary.consigneeStreet')"
|
||||
:value="formattedAddress"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
{{ entity.ticketState.state.name }}
|
||||
</QBadge>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :label="t('customer.summary.team')">
|
||||
<template #value>
|
||||
<span class="link">
|
||||
{{ entity?.client?.department?.name || '-' }}
|
||||
<DepartmentDescriptorProxy
|
||||
:id="entity?.client?.departmentFk"
|
||||
/>
|
||||
</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :label="t('globals.agency')" :value="entity.agencyMode?.name" />
|
||||
<VnLv :label="t('ticket.summary.zone')">
|
||||
<template #value>
|
||||
<span class="link" @click.stop>
|
||||
{{ entity?.zone?.name }}
|
||||
<ZoneDescriptorProxy :id="entity.zoneFk" />
|
||||
</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :label="t('globals.warehouse')" :value="entity.warehouse?.name" />
|
||||
<VnLv
|
||||
v-if="ticket?.ticketCollections?.length > 0"
|
||||
:label="t('ticket.summary.collection')"
|
||||
:value="ticket?.ticketCollections[0]?.collectionFk"
|
||||
>
|
||||
<template #value>
|
||||
<a
|
||||
:href="`${grafanaUrl}/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-collectionFk=${entity.ticketCollections[0]?.collectionFk}`"
|
||||
target="_blank"
|
||||
class="grafana"
|
||||
>
|
||||
{{ entity.ticketCollections[0]?.collectionFk }}
|
||||
</a>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :label="t('ticket.summary.route')">
|
||||
<template #value>
|
||||
<span class="link">
|
||||
{{ entity.routeFk }}
|
||||
<RouteDescriptorProxy :id="entity.routeFk" />
|
||||
</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :label="t('ticket.summary.invoice')">
|
||||
<template #value>
|
||||
<span :class="{ link: entity.refFk }">
|
||||
{{ dashIfEmpty(entity.refFk) }}
|
||||
<InvoiceOutDescriptorProxy
|
||||
:id="entity.invoiceOut.id"
|
||||
v-if="entity.refFk"
|
||||
/>
|
||||
</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :label="t('globals.weight')" :value="dashIfEmpty(entity.weight)" />
|
||||
</QCard>
|
||||
<QCard class="vn-one">
|
||||
<VnTitle
|
||||
:url="toTicketUrl('basic-data')"
|
||||
:text="t('globals.summary.basicData')"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('ticket.summary.shipped')"
|
||||
:value="toDate(entity.shipped)"
|
||||
/>
|
||||
<VnLv :label="t('globals.landed')" :value="toDate(entity.landed)" />
|
||||
<VnLv :label="t('globals.packages')" :value="entity.packages" />
|
||||
<VnLv :value="entity.address.phone">
|
||||
<template #label>
|
||||
{{ t('ticket.summary.consigneePhone') }}
|
||||
<VnLinkPhone :phone-number="entity.address.phone" />
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :value="entity.address.mobile">
|
||||
<template #label>
|
||||
{{ t('ticket.summary.consigneeMobile') }}
|
||||
<VnLinkPhone :phone-number="entity.address.mobile" />
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :value="entity.client.phone">
|
||||
<template #label>
|
||||
{{ t('ticket.summary.clientPhone') }}
|
||||
<VnLinkPhone :phone-number="entity.client.phone" />
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :value="entity.client.mobile">
|
||||
<template #label>
|
||||
{{ t('ticket.summary.clientMobile') }}
|
||||
<VnLinkPhone :phone-number="entity.client.mobile" />
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv
|
||||
:label="t('ticket.summary.consignee')"
|
||||
:value="`${entity.address?.nickname} #${entity.address?.id}`"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('ticket.summary.consigneeStreet')"
|
||||
:value="formattedAddress"
|
||||
/>
|
||||
</QCard>
|
||||
<QCard class="vn-one" v-if="entity.notes.length">
|
||||
<VnTitle
|
||||
|
|
|
@ -22,6 +22,16 @@ const states = ref([]);
|
|||
const agencies = ref([]);
|
||||
const warehouses = ref([]);
|
||||
const groupedStates = ref([]);
|
||||
|
||||
const getGroupedStates = (data) => {
|
||||
for (const state of data) {
|
||||
groupedStates.value.push({
|
||||
id: state.id,
|
||||
name: t(`${state.code}`),
|
||||
code: state.code,
|
||||
});
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
@ -29,11 +39,12 @@ const groupedStates = ref([]);
|
|||
<FetchData url="States" @on-fetch="(data) => (states = data)" auto-load />
|
||||
<FetchData
|
||||
url="AlertLevels"
|
||||
auto-load
|
||||
@on-fetch="
|
||||
(data) =>
|
||||
(groupedStates = data.map((x) => Object.assign(x, { code: t(x.code) })))
|
||||
(data) => {
|
||||
getGroupedStates(data);
|
||||
}
|
||||
"
|
||||
auto-load
|
||||
/>
|
||||
<FetchData
|
||||
url="AgencyModes"
|
||||
|
@ -115,11 +126,12 @@ const groupedStates = ref([]);
|
|||
</QItemSection>
|
||||
<QItemSection v-if="groupedStates">
|
||||
<VnSelect
|
||||
:label="t('params.groupedStates')"
|
||||
:label="t('Grouped state')"
|
||||
v-model="params.groupedStates"
|
||||
@update:model-value="searchFn()"
|
||||
:options="groupedStates"
|
||||
option-label="code"
|
||||
option-value="id"
|
||||
option-label="name"
|
||||
emit-value
|
||||
map-options
|
||||
use-input
|
||||
|
@ -292,7 +304,7 @@ en:
|
|||
ON_PREPARATION: On preparation
|
||||
PACKED: Packed
|
||||
DELIVERED: Delivered
|
||||
ON_PREVIOUS: On previous
|
||||
ON_PREVIOUS: ON_PREVIOUS
|
||||
es:
|
||||
params:
|
||||
search: Contiene
|
||||
|
@ -337,7 +349,7 @@ es:
|
|||
ON_PREPARATION: En preparación
|
||||
PACKED: Encajado
|
||||
DELIVERED: Servido
|
||||
ON_PREVIOUS: En previa
|
||||
ON_PREVIOUS: ON_PREVIOUS
|
||||
Collection: Colección
|
||||
Nickname: Nombre mostrado
|
||||
</i18n>
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue