Compare commits
No commits in common. "dev" and "fix_workerDescriptorMenu_i18n" have entirely different histories.
dev
...
fix_worker
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 🆕
|
||||
|
|
|
|||
|
|
@ -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
|
||||
```
|
||||
|
|
|
|||
|
|
@ -198,7 +198,8 @@ const setCategoryList = (data) => {
|
|||
v-model="params.typeFk"
|
||||
:options="itemTypesOptions"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
use-input
|
||||
:disable="!selectedCategoryFk"
|
||||
@update:model-value="
|
||||
|
|
@ -234,7 +235,8 @@ const setCategoryList = (data) => {
|
|||
v-model="value.selectedTag"
|
||||
:options="tagOptions"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
:emit-value="false"
|
||||
use-input
|
||||
:is-clearable="false"
|
||||
|
|
@ -250,7 +252,8 @@ const setCategoryList = (data) => {
|
|||
option-value="value"
|
||||
option-label="value"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
emit-value
|
||||
use-input
|
||||
:disable="!value"
|
||||
|
|
@ -262,6 +265,7 @@ const setCategoryList = (data) => {
|
|||
v-model="value.value"
|
||||
:label="t('components.itemsFilterPanel.value')"
|
||||
:disable="!value"
|
||||
is-outlined
|
||||
:is-clearable="false"
|
||||
@keyup.enter="applyTags(params, searchFn)"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ function textAlignToFlex(textAlign) {
|
|||
:style="textAlignToFlex(align)"
|
||||
>
|
||||
<span :title="label">{{ label }}</span>
|
||||
<div v-if="name">
|
||||
<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'"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -633,7 +633,6 @@ const rowCtrlClickFunction = computed(() => {
|
|||
:data-key="$attrs['data-key']"
|
||||
:columns="columns"
|
||||
:redirect="redirect"
|
||||
v-bind="$attrs?.['table-filter']"
|
||||
>
|
||||
<template
|
||||
v-for="(_, slotName) in $slots"
|
||||
|
|
@ -1156,7 +1155,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,12 +34,6 @@ 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"
|
||||
|
|
@ -52,7 +41,6 @@ function columnName(col) {
|
|||
v-model="params[columnName(col)]"
|
||||
:search-url="searchUrl"
|
||||
/>
|
||||
</slot>
|
||||
</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 {
|
||||
|
|
|
|||
|
|
@ -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,15 +1,12 @@
|
|||
<script setup>
|
||||
import { onBeforeMount, computed } from 'vue';
|
||||
import { useRoute, useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
|
||||
import { onBeforeMount } from 'vue';
|
||||
import { useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
|
||||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
import { useStateStore } from 'stores/useStateStore';
|
||||
import useCardSize from 'src/composables/useCardSize';
|
||||
import VnSubToolbar from '../ui/VnSubToolbar.vue';
|
||||
|
||||
const emit = defineEmits(['onFetch']);
|
||||
|
||||
const props = defineProps({
|
||||
id: { type: Number, required: false, default: null },
|
||||
dataKey: { type: String, required: true },
|
||||
url: { type: String, default: undefined },
|
||||
idInWhere: { type: Boolean, default: false },
|
||||
|
|
@ -19,13 +16,10 @@ const props = defineProps({
|
|||
searchDataKey: { type: String, default: undefined },
|
||||
searchbarProps: { type: Object, default: undefined },
|
||||
redirectOnError: { type: Boolean, default: false },
|
||||
visual: { type: Boolean, default: true },
|
||||
});
|
||||
|
||||
const route = useRoute();
|
||||
const stateStore = useStateStore();
|
||||
const router = useRouter();
|
||||
const entityId = computed(() => props.id || route?.params?.id);
|
||||
const arrayData = useArrayData(props.dataKey, {
|
||||
url: props.url,
|
||||
userFilter: props.filter,
|
||||
|
|
@ -41,7 +35,7 @@ onBeforeMount(async () => {
|
|||
|
||||
const route = router.currentRoute.value;
|
||||
try {
|
||||
await fetch(entityId.value);
|
||||
await fetch(route.params.id);
|
||||
} catch {
|
||||
const { matched: matches } = route;
|
||||
const { path } = matches.at(-1);
|
||||
|
|
@ -57,7 +51,8 @@ onBeforeRouteUpdate(async (to, from) => {
|
|||
router.push({ name, params: to.params });
|
||||
}
|
||||
}
|
||||
if (entityId.value !== to.params.id) await fetch(to.params.id, true);
|
||||
const id = to.params.id;
|
||||
if (id !== from.params.id) await fetch(id, true);
|
||||
});
|
||||
|
||||
async function fetch(id, append = false) {
|
||||
|
|
@ -66,17 +61,14 @@ async function fetch(id, append = false) {
|
|||
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);
|
||||
}
|
||||
</script>
|
||||
<template>
|
||||
<template v-if="visual">
|
||||
<VnSubToolbar />
|
||||
<div :class="[useCardSize(), $attrs.class]">
|
||||
<RouterView :key="$route.path" />
|
||||
</div>
|
||||
</template>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -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,54 +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.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;
|
||||
});
|
||||
|
|
@ -275,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
|
||||
|
|
@ -345,7 +467,6 @@ watch(
|
|||
backgroundColor: useColor(modelLog.model),
|
||||
}"
|
||||
:title="`${modelLog.model} #${modelLog.id}`"
|
||||
data-cy="vnLog-model-chip"
|
||||
>
|
||||
{{ t(modelLog.modelI18n) }}
|
||||
</QChip>
|
||||
|
|
@ -440,7 +561,9 @@ watch(
|
|||
}}:
|
||||
</span>
|
||||
<VnLogValue
|
||||
:value="value.val"
|
||||
:value="
|
||||
value.val.val
|
||||
"
|
||||
:name="value.name"
|
||||
/>
|
||||
</QItem>
|
||||
|
|
@ -459,7 +582,6 @@ watch(
|
|||
}`,
|
||||
)
|
||||
"
|
||||
data-cy="vnLog-action-icon"
|
||||
/>
|
||||
</div>
|
||||
</QItem>
|
||||
|
|
@ -494,9 +616,10 @@ watch(
|
|||
{{ prop.nameI18n }}:
|
||||
</span>
|
||||
<VnLogValue
|
||||
:value="prop.val"
|
||||
:value="prop.val.val"
|
||||
:name="prop.name"
|
||||
/>
|
||||
<VnIconLink />
|
||||
<span
|
||||
v-if="
|
||||
propIndex <
|
||||
|
|
@ -525,7 +648,7 @@ watch(
|
|||
</span>
|
||||
<span v-if="log.action == 'update'">
|
||||
<VnLogValue
|
||||
:value="prop.old"
|
||||
:value="prop.old.val"
|
||||
:name="prop.name"
|
||||
/>
|
||||
<span
|
||||
|
|
@ -536,7 +659,7 @@ watch(
|
|||
</span>
|
||||
→
|
||||
<VnLogValue
|
||||
:value="prop.val"
|
||||
:value="prop.val.val"
|
||||
:name="prop.name"
|
||||
/>
|
||||
<span
|
||||
|
|
@ -548,7 +671,7 @@ watch(
|
|||
</span>
|
||||
<span v-else="prop.old.val">
|
||||
<VnLogValue
|
||||
:value="prop.val"
|
||||
:value="prop.val.val"
|
||||
:name="prop.name"
|
||||
/>
|
||||
<span
|
||||
|
|
@ -577,12 +700,176 @@ 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
|
||||
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"
|
||||
: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"
|
||||
option-label="name"
|
||||
option-value="id"
|
||||
: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"
|
||||
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
|
||||
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
|
||||
clear-icon="close"
|
||||
/>
|
||||
</QItem>
|
||||
</QList>
|
||||
</template>
|
||||
</RightMenu>
|
||||
<QDialog v-model="dateFromDialog">
|
||||
<QDate
|
||||
:years-in-month-view="false"
|
||||
v-model="dateFrom"
|
||||
dense
|
||||
flat
|
||||
minimal
|
||||
@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 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']"
|
||||
:exprBuilder
|
||||
search-url="logs"
|
||||
:showTagChips="false"
|
||||
<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 #body="{ params, searchFn }">
|
||||
<QDate
|
||||
v-model="params.created"
|
||||
@update:model-value="searchFn()"
|
||||
dense
|
||||
flat
|
||||
minimal
|
||||
>
|
||||
<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" />
|
||||
</QDate>
|
||||
<QSeparator />
|
||||
<QItem>
|
||||
<QItemSection v-if="!workers">
|
||||
<QSkeleton type="QInput" class="full-width" />
|
||||
</QItemSection>
|
||||
<QItemSection class="col-9 justify-center">
|
||||
<span>{{ opt.name }}</span>
|
||||
<span class="text-grey">{{ opt.nickname }}</span>
|
||||
<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>
|
||||
</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"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
<template #filter-from="{ params, columnName, searchFn }">
|
||||
<VnInputDate
|
||||
:label="t('globals.from')"
|
||||
v-model="params[columnName]"
|
||||
dense
|
||||
filled
|
||||
@update:modelValue="() => searchFn()"
|
||||
/>
|
||||
</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"
|
||||
>
|
||||
<VnJsonValue v-bind="$attrs" />
|
||||
<QIcon
|
||||
name="launch"
|
||||
class="link"
|
||||
v-if="$attrs.value && descriptor"
|
||||
:data-cy="'iconLaunch-' + $props.name"
|
||||
style="padding-bottom: 2px"
|
||||
/>
|
||||
<component :is="descriptor" :id="value.id ?? value.val" />
|
||||
</span>
|
||||
<component :is="descriptor" :id="$attrs.value" v-if="$attrs.value && descriptor" />
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -6,13 +6,10 @@ describe('VnDmsList', () => {
|
|||
let vm;
|
||||
const dms = {
|
||||
userFk: 1,
|
||||
name: 'DMS 1',
|
||||
name: 'DMS 1'
|
||||
};
|
||||
|
||||
beforeAll(() => {
|
||||
vi.mock('src/composables/getUrl', () => ({
|
||||
getUrl: vi.fn().mockResolvedValue(''),
|
||||
}));
|
||||
vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
|
||||
vm = createWrapper(VnDmsList, {
|
||||
props: {
|
||||
|
|
@ -21,8 +18,8 @@ describe('VnDmsList', () => {
|
|||
filter: 'wd.workerFk',
|
||||
updateModel: 'Workers',
|
||||
deleteModel: 'WorkerDms',
|
||||
downloadModel: 'WorkerDms',
|
||||
},
|
||||
downloadModel: 'WorkerDms'
|
||||
}
|
||||
}).vm;
|
||||
});
|
||||
|
||||
|
|
@ -37,7 +34,7 @@ describe('VnDmsList', () => {
|
|||
name: 'Jessica',
|
||||
lastName: 'Jones',
|
||||
file: '4.jpg',
|
||||
created: '2021-07-28 21:00:00',
|
||||
created: '2021-07-28 21:00:00'
|
||||
},
|
||||
{
|
||||
userFk: 2,
|
||||
|
|
@ -50,26 +47,27 @@ describe('VnDmsList', () => {
|
|||
lastName: 'BannerDMS',
|
||||
created: '2022-07-28 21:00:00',
|
||||
file: '4.jpg',
|
||||
},
|
||||
}
|
||||
},
|
||||
{
|
||||
userFk: 3,
|
||||
name: 'Natasha',
|
||||
lastName: 'Romanoff',
|
||||
file: '4.jpg',
|
||||
created: '2021-10-28 21:00:00',
|
||||
},
|
||||
];
|
||||
created: '2021-10-28 21:00:00'
|
||||
}
|
||||
]
|
||||
|
||||
it('Should replace objects that contain the "dms" property with the value of the same and sort by creation date', () => {
|
||||
vm.setData(data);
|
||||
expect([vm.rows][0][0].lastName).toEqual('BannerDMS');
|
||||
expect([vm.rows][0][1].lastName).toEqual('Romanoff');
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
describe('parseDms()', () => {
|
||||
const resultDms = { ...dms, userId: 1 };
|
||||
const resultDms = { ...dms, userId:1};
|
||||
|
||||
it('Should add properties that end with "Fk" by changing the suffix to "Id"', () => {
|
||||
const parsedDms = vm.parseDms(dms);
|
||||
|
|
@ -78,7 +76,7 @@ describe('VnDmsList', () => {
|
|||
});
|
||||
|
||||
describe('showFormDialog()', () => {
|
||||
const resultDms = { ...dms, userId: 1 };
|
||||
const resultDms = { ...dms, userId:1};
|
||||
|
||||
it('should call fn parseDms() and set show true if dms is defined', () => {
|
||||
vm.showFormDialog(dms);
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,38 +1,375 @@
|
|||
<script setup>
|
||||
import { ref } from 'vue';
|
||||
import VnDescriptor from './VnDescriptor.vue';
|
||||
import { onBeforeMount, watch, computed, ref } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
|
||||
import { useArrayData } from 'composables/useArrayData';
|
||||
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
|
||||
import { useState } from 'src/composables/useState';
|
||||
import { useRoute, useRouter } from 'vue-router';
|
||||
import { useClipboard } from 'src/composables/useClipboard';
|
||||
import VnMoreOptions from './VnMoreOptions.vue';
|
||||
|
||||
const $props = defineProps({
|
||||
id: {
|
||||
type: Number,
|
||||
default: false,
|
||||
url: {
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
card: {
|
||||
filter: {
|
||||
type: Object,
|
||||
default: null,
|
||||
},
|
||||
title: {
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
subtitle: {
|
||||
type: Number,
|
||||
default: null,
|
||||
},
|
||||
dataKey: {
|
||||
type: String,
|
||||
default: null,
|
||||
},
|
||||
summary: {
|
||||
type: Object,
|
||||
default: null,
|
||||
},
|
||||
width: {
|
||||
type: String,
|
||||
default: 'md-width',
|
||||
},
|
||||
toModule: {
|
||||
type: String,
|
||||
default: null,
|
||||
},
|
||||
});
|
||||
|
||||
const state = useState();
|
||||
const route = useRoute();
|
||||
const router = useRouter();
|
||||
const { t } = useI18n();
|
||||
const { copyText } = useClipboard();
|
||||
const { viewSummary } = useSummaryDialog();
|
||||
let arrayData;
|
||||
let store;
|
||||
let entity;
|
||||
const isLoading = ref(false);
|
||||
const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
|
||||
const DESCRIPTOR_PROXY = 'DescriptorProxy';
|
||||
const moduleName = ref();
|
||||
const isSameModuleName = route.matched[1].meta.moduleName !== moduleName.value;
|
||||
defineExpose({ getData });
|
||||
|
||||
onBeforeMount(async () => {
|
||||
arrayData = useArrayData($props.dataKey, {
|
||||
url: $props.url,
|
||||
userFilter: $props.filter,
|
||||
skip: 0,
|
||||
oneRecord: true,
|
||||
});
|
||||
store = arrayData.store;
|
||||
entity = computed(() => {
|
||||
const data = store.data ?? {};
|
||||
if (data) emit('onFetch', data);
|
||||
return data;
|
||||
});
|
||||
|
||||
// It enables to load data only once if the module is the same as the dataKey
|
||||
if (!isSameDataKey.value || !route.params.id) await getData();
|
||||
watch(
|
||||
() => [$props.url, $props.filter],
|
||||
async () => {
|
||||
if (!isSameDataKey.value) await getData();
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
function getName() {
|
||||
let name = $props.dataKey;
|
||||
if ($props.dataKey.includes(DESCRIPTOR_PROXY)) {
|
||||
name = name.split(DESCRIPTOR_PROXY)[0];
|
||||
}
|
||||
return name;
|
||||
}
|
||||
const routeName = computed(() => {
|
||||
let routeName = getName();
|
||||
return `${routeName}Summary`;
|
||||
});
|
||||
|
||||
async function getData() {
|
||||
store.url = $props.url;
|
||||
store.filter = $props.filter ?? {};
|
||||
isLoading.value = true;
|
||||
try {
|
||||
const { data } = await arrayData.fetch({ append: false, updateRouter: false });
|
||||
state.set($props.dataKey, data);
|
||||
emit('onFetch', data);
|
||||
} finally {
|
||||
isLoading.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
function getValueFromPath(path) {
|
||||
if (!path) return;
|
||||
const keys = path.toString().split('.');
|
||||
let current = entity.value;
|
||||
|
||||
for (const key of keys) {
|
||||
if (current[key] === undefined) return undefined;
|
||||
else current = current[key];
|
||||
}
|
||||
return current;
|
||||
}
|
||||
|
||||
function copyIdText(id) {
|
||||
copyText(id, {
|
||||
component: {
|
||||
copyValue: id,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
const emit = defineEmits(['onFetch']);
|
||||
const entity = ref();
|
||||
|
||||
const iconModule = computed(() => {
|
||||
moduleName.value = getName();
|
||||
if ($props.toModule) {
|
||||
return router.getRoutes().find((r) => r.name === $props.toModule.name).meta.icon;
|
||||
}
|
||||
if (isSameModuleName) {
|
||||
return router.options.routes[1].children.find((r) => r.name === moduleName.value)
|
||||
?.meta?.icon;
|
||||
} else {
|
||||
return route.matched[1].meta.icon;
|
||||
}
|
||||
});
|
||||
|
||||
const toModule = computed(() => {
|
||||
moduleName.value = getName();
|
||||
if ($props.toModule) return $props.toModule;
|
||||
if (isSameModuleName) {
|
||||
return router.options.routes[1].children.find((r) => r.name === moduleName.value)
|
||||
?.redirect;
|
||||
} else {
|
||||
return route.matched[1].path.split('/').length > 2
|
||||
? route.matched[1].redirect
|
||||
: route.matched[1].children[0].redirect;
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<component
|
||||
:is="card"
|
||||
:id
|
||||
:visual="false"
|
||||
v-bind="$attrs"
|
||||
@on-fetch="
|
||||
(data) => {
|
||||
entity = data;
|
||||
emit('onFetch', data);
|
||||
}
|
||||
"
|
||||
/>
|
||||
<VnDescriptor v-model="entity" v-bind="$attrs">
|
||||
<template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
|
||||
<slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
|
||||
<div class="descriptor" data-cy="cardDescriptor">
|
||||
<template v-if="entity && !isLoading">
|
||||
<div class="header bg-primary q-pa-sm justify-between">
|
||||
<slot name="header-extra-action">
|
||||
<QBtn
|
||||
round
|
||||
flat
|
||||
dense
|
||||
size="md"
|
||||
:icon="iconModule"
|
||||
color="white"
|
||||
class="link"
|
||||
:to="toModule"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ t('globals.goToModuleIndex') }}
|
||||
</QTooltip>
|
||||
</QBtn>
|
||||
</slot>
|
||||
<QBtn
|
||||
@click.stop="viewSummary(entity.id, $props.summary, $props.width)"
|
||||
round
|
||||
flat
|
||||
dense
|
||||
size="md"
|
||||
icon="preview"
|
||||
color="white"
|
||||
class="link"
|
||||
v-if="summary"
|
||||
data-cy="openSummaryBtn"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ t('components.smartCard.openSummary') }}
|
||||
</QTooltip>
|
||||
</QBtn>
|
||||
<RouterLink :to="{ name: routeName, params: { id: entity.id } }">
|
||||
<QBtn
|
||||
class="link"
|
||||
color="white"
|
||||
dense
|
||||
flat
|
||||
icon="launch"
|
||||
round
|
||||
size="md"
|
||||
data-cy="goToSummaryBtn"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ t('components.cardDescriptor.summary') }}
|
||||
</QTooltip>
|
||||
</QBtn>
|
||||
</RouterLink>
|
||||
<VnMoreOptions v-if="$slots.menu">
|
||||
<template #menu="{ menuRef }">
|
||||
<slot name="menu" :entity="entity" :menu-ref="menuRef" />
|
||||
</template>
|
||||
</VnDescriptor>
|
||||
</VnMoreOptions>
|
||||
</div>
|
||||
<slot name="before" />
|
||||
<div class="body q-py-sm">
|
||||
<QList dense>
|
||||
<QItemLabel header class="ellipsis text-h5" :lines="1">
|
||||
<div class="title">
|
||||
<span
|
||||
v-if="$props.title"
|
||||
:title="getValueFromPath(title)"
|
||||
:data-cy="`${$attrs['data-cy'] ?? 'cardDescriptor'}_title`"
|
||||
>
|
||||
{{ getValueFromPath(title) ?? $props.title }}
|
||||
</span>
|
||||
<slot v-else name="description" :entity="entity">
|
||||
<span
|
||||
:title="entity.name"
|
||||
:data-cy="`${$attrs['data-cy'] ?? 'cardDescriptor'}_description`"
|
||||
v-text="entity.name"
|
||||
/>
|
||||
</slot>
|
||||
</div>
|
||||
</QItemLabel>
|
||||
<QItem>
|
||||
<QItemLabel
|
||||
class="subtitle"
|
||||
:data-cy="`${$attrs['data-cy'] ?? 'cardDescriptor'}_subtitle`"
|
||||
>
|
||||
#{{ getValueFromPath(subtitle) ?? entity.id }}
|
||||
</QItemLabel>
|
||||
<QBtn
|
||||
round
|
||||
flat
|
||||
dense
|
||||
size="sm"
|
||||
icon="content_copy"
|
||||
color="primary"
|
||||
@click.stop="copyIdText(entity.id)"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ t('globals.copyId') }}
|
||||
</QTooltip>
|
||||
</QBtn>
|
||||
</QItem>
|
||||
</QList>
|
||||
<div
|
||||
class="list-box q-mt-xs"
|
||||
:data-cy="`${$attrs['data-cy'] ?? 'cardDescriptor'}_listbox`"
|
||||
>
|
||||
<slot name="body" :entity="entity" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="icons">
|
||||
<slot name="icons" :entity="entity" />
|
||||
</div>
|
||||
<div class="actions justify-center" data-cy="descriptor_actions">
|
||||
<slot name="actions" :entity="entity" />
|
||||
</div>
|
||||
<slot name="after" />
|
||||
</template>
|
||||
<SkeletonDescriptor v-if="!entity || isLoading" />
|
||||
</div>
|
||||
<QInnerLoading
|
||||
:label="t('globals.pleaseWait')"
|
||||
:showing="isLoading"
|
||||
color="primary"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<style lang="scss">
|
||||
.body {
|
||||
background-color: var(--vn-section-color);
|
||||
.text-h5 {
|
||||
font-size: 20px;
|
||||
padding-top: 5px;
|
||||
padding-bottom: 0px;
|
||||
}
|
||||
.q-item {
|
||||
min-height: 20px;
|
||||
|
||||
.link {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
.vn-label-value {
|
||||
display: flex;
|
||||
padding: 0px 16px;
|
||||
.label {
|
||||
color: var(--vn-label-color);
|
||||
font-size: 14px;
|
||||
|
||||
&:not(:has(a))::after {
|
||||
content: ':';
|
||||
}
|
||||
}
|
||||
.value {
|
||||
color: var(--vn-text-color);
|
||||
font-size: 14px;
|
||||
margin-left: 4px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
text-align: left;
|
||||
}
|
||||
.info {
|
||||
margin-left: 5px;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.title {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
span {
|
||||
color: var(--vn-text-color);
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
.subtitle {
|
||||
color: var(--vn-text-color);
|
||||
font-size: 16px;
|
||||
margin-bottom: 2px;
|
||||
}
|
||||
.list-box {
|
||||
.q-item__label {
|
||||
color: var(--vn-label-color);
|
||||
padding-bottom: 0%;
|
||||
}
|
||||
}
|
||||
.descriptor {
|
||||
width: 256px;
|
||||
.header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
.icons {
|
||||
margin: 0 10px;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
.q-icon {
|
||||
margin-right: 5px;
|
||||
}
|
||||
}
|
||||
.actions {
|
||||
margin: 0 5px;
|
||||
justify-content: center !important;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<i18n>
|
||||
en:
|
||||
globals:
|
||||
copyId: Copy ID
|
||||
es:
|
||||
globals:
|
||||
copyId: Copiar ID
|
||||
</i18n>
|
||||
|
|
|
|||
|
|
@ -201,29 +201,6 @@ async function fetch() {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
.vn-card-group {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.vn-card-content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
text-overflow: ellipsis;
|
||||
> div {
|
||||
max-height: 70px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 1010px) {
|
||||
.vn-card-group {
|
||||
flex-direction: row;
|
||||
}
|
||||
.vn-card-content {
|
||||
flex: 1;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<style lang="scss" scoped>
|
||||
.summaryHeader .vn-label-value {
|
||||
|
|
|
|||
|
|
@ -1,78 +0,0 @@
|
|||
<script setup>
|
||||
import { onBeforeMount, watch, computed, ref } from 'vue';
|
||||
import { useArrayData } from 'composables/useArrayData';
|
||||
import { useState } from 'src/composables/useState';
|
||||
import { useRoute } from 'vue-router';
|
||||
import VnDescriptor from './VnDescriptor.vue';
|
||||
|
||||
const $props = defineProps({
|
||||
url: {
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
filter: {
|
||||
type: Object,
|
||||
default: null,
|
||||
},
|
||||
dataKey: {
|
||||
type: String,
|
||||
default: null,
|
||||
},
|
||||
});
|
||||
|
||||
const state = useState();
|
||||
const route = useRoute();
|
||||
let arrayData;
|
||||
let store;
|
||||
let entity;
|
||||
const isLoading = ref(false);
|
||||
const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
|
||||
defineExpose({ getData });
|
||||
|
||||
onBeforeMount(async () => {
|
||||
arrayData = useArrayData($props.dataKey, {
|
||||
url: $props.url,
|
||||
userFilter: $props.filter,
|
||||
skip: 0,
|
||||
oneRecord: true,
|
||||
});
|
||||
store = arrayData.store;
|
||||
entity = computed(() => {
|
||||
const data = store.data ?? {};
|
||||
if (data) emit('onFetch', data);
|
||||
return data;
|
||||
});
|
||||
|
||||
// It enables to load data only once if the module is the same as the dataKey
|
||||
if (!isSameDataKey.value || !route.params.id) await getData();
|
||||
watch(
|
||||
() => [$props.url, $props.filter],
|
||||
async () => {
|
||||
if (!isSameDataKey.value) await getData();
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
async function getData() {
|
||||
store.url = $props.url;
|
||||
store.filter = $props.filter ?? {};
|
||||
isLoading.value = true;
|
||||
try {
|
||||
const { data } = await arrayData.fetch({ append: false, updateRouter: false });
|
||||
state.set($props.dataKey, data);
|
||||
emit('onFetch', data);
|
||||
} finally {
|
||||
isLoading.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
const emit = defineEmits(['onFetch']);
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<VnDescriptor v-model="entity" v-bind="$attrs" :module="dataKey">
|
||||
<template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
|
||||
<slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
|
||||
</template>
|
||||
</VnDescriptor>
|
||||
</template>
|
||||
|
|
@ -1,318 +0,0 @@
|
|||
<script setup>
|
||||
import { computed, ref } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
|
||||
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
|
||||
import { useRoute, useRouter } from 'vue-router';
|
||||
import { useClipboard } from 'src/composables/useClipboard';
|
||||
import VnMoreOptions from './VnMoreOptions.vue';
|
||||
|
||||
const entity = defineModel({ type: Object, default: null });
|
||||
const $props = defineProps({
|
||||
title: {
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
subtitle: {
|
||||
type: Number,
|
||||
default: null,
|
||||
},
|
||||
summary: {
|
||||
type: Object,
|
||||
default: null,
|
||||
},
|
||||
width: {
|
||||
type: String,
|
||||
default: 'md-width',
|
||||
},
|
||||
module: {
|
||||
type: String,
|
||||
default: null,
|
||||
},
|
||||
toModule: {
|
||||
type: String,
|
||||
default: null,
|
||||
},
|
||||
});
|
||||
|
||||
const route = useRoute();
|
||||
const router = useRouter();
|
||||
const { t } = useI18n();
|
||||
const { copyText } = useClipboard();
|
||||
const { viewSummary } = useSummaryDialog();
|
||||
const DESCRIPTOR_PROXY = 'DescriptorProxy';
|
||||
const moduleName = ref();
|
||||
const isSameModuleName = route.matched[1].meta.moduleName !== moduleName.value;
|
||||
|
||||
function getName() {
|
||||
let name = $props.module;
|
||||
if ($props.module.includes(DESCRIPTOR_PROXY)) {
|
||||
name = name.split(DESCRIPTOR_PROXY)[0];
|
||||
}
|
||||
return name;
|
||||
}
|
||||
const routeName = computed(() => {
|
||||
let routeName = getName();
|
||||
return `${routeName}Summary`;
|
||||
});
|
||||
|
||||
function getValueFromPath(path) {
|
||||
if (!path) return;
|
||||
const keys = path.toString().split('.');
|
||||
let current = entity.value;
|
||||
|
||||
for (const key of keys) {
|
||||
if (current[key] === undefined) return undefined;
|
||||
else current = current[key];
|
||||
}
|
||||
return current;
|
||||
}
|
||||
|
||||
function copyIdText(id) {
|
||||
copyText(id, {
|
||||
component: {
|
||||
copyValue: id,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
const emit = defineEmits(['onFetch']);
|
||||
|
||||
const iconModule = computed(() => {
|
||||
moduleName.value = getName();
|
||||
if ($props.toModule) {
|
||||
return router.getRoutes().find((r) => r.name === $props.toModule.name).meta.icon;
|
||||
}
|
||||
if (isSameModuleName) {
|
||||
return router.options.routes[1].children.find((r) => r.name === moduleName.value)
|
||||
?.meta?.icon;
|
||||
} else {
|
||||
return route.matched[1].meta.icon;
|
||||
}
|
||||
});
|
||||
|
||||
const toModule = computed(() => {
|
||||
moduleName.value = getName();
|
||||
if ($props.toModule) return $props.toModule;
|
||||
if (isSameModuleName) {
|
||||
return router.options.routes[1].children.find((r) => r.name === moduleName.value)
|
||||
?.redirect;
|
||||
} else {
|
||||
return route.matched[1].path.split('/').length > 2
|
||||
? route.matched[1].redirect
|
||||
: route.matched[1].children[0].redirect;
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="descriptor" data-cy="vnDescriptor">
|
||||
<template v-if="entity && entity?.id">
|
||||
<div class="header bg-primary q-pa-sm justify-between">
|
||||
<slot name="header-extra-action">
|
||||
<QBtn
|
||||
round
|
||||
flat
|
||||
dense
|
||||
size="md"
|
||||
:icon="iconModule"
|
||||
color="white"
|
||||
class="link"
|
||||
:to="toModule"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ t('globals.goToModuleIndex') }}
|
||||
</QTooltip>
|
||||
</QBtn>
|
||||
</slot>
|
||||
<QBtn
|
||||
@click.stop="viewSummary(entity.id, summary, width)"
|
||||
round
|
||||
flat
|
||||
dense
|
||||
size="md"
|
||||
icon="preview"
|
||||
color="white"
|
||||
class="link"
|
||||
v-if="summary"
|
||||
data-cy="openSummaryBtn"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ t('components.smartCard.openSummary') }}
|
||||
</QTooltip>
|
||||
</QBtn>
|
||||
<RouterLink :to="{ name: routeName, params: { id: entity.id } }">
|
||||
<QBtn
|
||||
class="link"
|
||||
color="white"
|
||||
dense
|
||||
flat
|
||||
icon="launch"
|
||||
round
|
||||
size="md"
|
||||
data-cy="goToSummaryBtn"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ t('components.vnDescriptor.summary') }}
|
||||
</QTooltip>
|
||||
</QBtn>
|
||||
</RouterLink>
|
||||
<VnMoreOptions v-if="$slots.menu">
|
||||
<template #menu="{ menuRef }">
|
||||
<slot name="menu" :entity="entity" :menu-ref="menuRef" />
|
||||
</template>
|
||||
</VnMoreOptions>
|
||||
</div>
|
||||
<slot name="before" />
|
||||
<div class="body q-py-sm">
|
||||
<QList dense>
|
||||
<QItemLabel header class="ellipsis text-h5" :lines="1">
|
||||
<div class="title">
|
||||
<span
|
||||
v-if="title"
|
||||
:title="getValueFromPath(title)"
|
||||
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_title`"
|
||||
>
|
||||
{{ getValueFromPath(title) ?? title }}
|
||||
</span>
|
||||
<slot v-else name="description" :entity="entity">
|
||||
<span
|
||||
:title="entity.name"
|
||||
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_description`"
|
||||
v-text="entity.name"
|
||||
/>
|
||||
</slot>
|
||||
</div>
|
||||
</QItemLabel>
|
||||
<QItem>
|
||||
<QItemLabel
|
||||
class="subtitle"
|
||||
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_subtitle`"
|
||||
>
|
||||
#{{ getValueFromPath(subtitle) ?? entity.id }}
|
||||
</QItemLabel>
|
||||
<QBtn
|
||||
round
|
||||
flat
|
||||
dense
|
||||
size="sm"
|
||||
icon="content_copy"
|
||||
color="primary"
|
||||
@click.stop="copyIdText(entity.id)"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ t('globals.copyId') }}
|
||||
</QTooltip>
|
||||
</QBtn>
|
||||
</QItem>
|
||||
</QList>
|
||||
<div
|
||||
class="list-box q-mt-xs"
|
||||
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_listbox`"
|
||||
>
|
||||
<slot name="body" :entity="entity" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="icons">
|
||||
<slot name="icons" :entity="entity" />
|
||||
</div>
|
||||
<div class="actions justify-center" data-cy="descriptor_actions">
|
||||
<slot name="actions" :entity="entity" />
|
||||
</div>
|
||||
<slot name="after" />
|
||||
</template>
|
||||
<SkeletonDescriptor v-if="!entity" />
|
||||
</div>
|
||||
<QInnerLoading :label="t('globals.pleaseWait')" :showing="!entity" color="primary" />
|
||||
</template>
|
||||
|
||||
<style lang="scss">
|
||||
.body {
|
||||
background-color: var(--vn-section-color);
|
||||
.text-h5 {
|
||||
font-size: 20px;
|
||||
padding-top: 5px;
|
||||
padding-bottom: 0px;
|
||||
}
|
||||
.q-item {
|
||||
min-height: 20px;
|
||||
|
||||
.link {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
.vn-label-value {
|
||||
display: flex;
|
||||
padding: 0px 16px;
|
||||
.label {
|
||||
color: var(--vn-label-color);
|
||||
font-size: 14px;
|
||||
|
||||
&:not(:has(a))::after {
|
||||
content: ':';
|
||||
}
|
||||
}
|
||||
.value {
|
||||
color: var(--vn-text-color);
|
||||
font-size: 14px;
|
||||
margin-left: 4px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
text-align: left;
|
||||
}
|
||||
.info {
|
||||
margin-left: 5px;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.title {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
span {
|
||||
color: var(--vn-text-color);
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
.subtitle {
|
||||
color: var(--vn-text-color);
|
||||
font-size: 16px;
|
||||
margin-bottom: 2px;
|
||||
}
|
||||
.list-box {
|
||||
.q-item__label {
|
||||
color: var(--vn-label-color);
|
||||
padding-bottom: 0%;
|
||||
}
|
||||
}
|
||||
.descriptor {
|
||||
width: 256px;
|
||||
.header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
.icons {
|
||||
margin: 0 10px;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
.q-icon {
|
||||
margin-right: 5px;
|
||||
}
|
||||
}
|
||||
.actions {
|
||||
margin: 0 5px;
|
||||
justify-content: center !important;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<i18n>
|
||||
en:
|
||||
globals:
|
||||
copyId: Copy ID
|
||||
es:
|
||||
globals:
|
||||
copyId: Copiar ID
|
||||
</i18n>
|
||||
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -57,5 +57,4 @@ function handleClick() {
|
|||
{{ capitalize(type).replace('-', '') }}
|
||||
</QTooltip>
|
||||
</QBtn>
|
||||
{{ phoneNumber }}
|
||||
</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">
|
||||
|
|
|
|||
|
|
@ -215,7 +215,6 @@ defineExpose({
|
|||
paginate,
|
||||
userParams: arrayData.store.userParams,
|
||||
currentFilter: arrayData.store.currentFilter,
|
||||
arrayData,
|
||||
});
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ const id = props.entityId;
|
|||
:to="{ name: routeName, params: { id: id } }"
|
||||
class="header link"
|
||||
:href="url"
|
||||
data-cy="goToSummaryBtn"
|
||||
>
|
||||
<QIcon name="open_in_new" color="white" size="sm" />
|
||||
</router-link>
|
||||
|
|
|
|||
|
|
@ -6,12 +6,10 @@ const session = useSession();
|
|||
const token = session.getToken();
|
||||
|
||||
describe('downloadFile', () => {
|
||||
const baseUrl = 'http://localhost:9000';
|
||||
let defaulCreateObjectURL;
|
||||
|
||||
beforeAll(() => {
|
||||
vi.mock('src/composables/getUrl', () => ({
|
||||
getUrl: vi.fn().mockResolvedValue(''),
|
||||
}));
|
||||
defaulCreateObjectURL = window.URL.createObjectURL;
|
||||
window.URL.createObjectURL = vi.fn(() => 'blob:http://localhost:9000/blob-id');
|
||||
});
|
||||
|
|
@ -24,14 +22,15 @@ describe('downloadFile', () => {
|
|||
headers: { 'content-disposition': 'attachment; filename="test-file.txt"' },
|
||||
};
|
||||
vi.spyOn(axios, 'get').mockImplementation((url) => {
|
||||
if (url.includes('downloadFile')) return Promise.resolve(res);
|
||||
if (url == 'Urls/getUrl') return Promise.resolve({ data: baseUrl });
|
||||
else if (url.includes('downloadFile')) return Promise.resolve(res);
|
||||
});
|
||||
|
||||
await downloadFile(1);
|
||||
|
||||
expect(axios.get).toHaveBeenCalledWith(
|
||||
`/api/dms/1/downloadFile?access_token=${token}`,
|
||||
{ responseType: 'blob' },
|
||||
`${baseUrl}/api/dms/1/downloadFile?access_token=${token}`,
|
||||
{ responseType: 'blob' }
|
||||
);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -7,33 +7,18 @@ const { getTokenMultimedia } = useSession();
|
|||
const token = getTokenMultimedia();
|
||||
|
||||
export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
|
||||
const appUrl = await getAppUrl();
|
||||
const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
|
||||
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,
|
||||
});
|
||||
|
||||
download(response);
|
||||
}
|
||||
|
||||
function download(response) {
|
||||
const contentDisposition = response.headers['content-disposition'];
|
||||
const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition);
|
||||
const filename = matches?.[1] ? matches[1].replace(/['"]/g, '') : 'downloaded-file';
|
||||
const filename =
|
||||
matches != null && matches[1]
|
||||
? matches[1].replace(/['"]/g, '')
|
||||
: 'downloaded-file';
|
||||
|
||||
exportFile(filename, response.data);
|
||||
}
|
||||
|
||||
async function getAppUrl() {
|
||||
return (await getUrl('', 'lilium')).replace('/#/', '');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -189,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('%', '');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -651,7 +646,6 @@ worker:
|
|||
model: Model
|
||||
serialNumber: Serial number
|
||||
removePDA: Deallocate PDA
|
||||
sendToTablet: Send to tablet
|
||||
create:
|
||||
lastName: Last name
|
||||
birth: Birth
|
||||
|
|
@ -822,7 +816,6 @@ travel:
|
|||
search: Search travel
|
||||
searchInfo: You can search by travel id or name
|
||||
id: Id
|
||||
awbFk: AWB
|
||||
travelList:
|
||||
tableVisibleColumns:
|
||||
ref: Reference
|
||||
|
|
@ -847,7 +840,6 @@ travel:
|
|||
availabledHour: Availabled hour
|
||||
thermographs: Thermographs
|
||||
hb: HB
|
||||
roundedCc: Rounded CC
|
||||
basicData:
|
||||
daysInForward: Automatic movement (Raid)
|
||||
isRaid: Raid
|
||||
|
|
@ -890,7 +882,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
|
||||
|
|
@ -736,7 +731,6 @@ worker:
|
|||
model: Modelo
|
||||
serialNumber: Número de serie
|
||||
removePDA: Desasignar PDA
|
||||
sendToTablet: Enviar a la tablet
|
||||
create:
|
||||
lastName: Apellido
|
||||
birth: Fecha de nacimiento
|
||||
|
|
@ -905,7 +899,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 +923,6 @@ travel:
|
|||
availabled: F. Disponible
|
||||
availabledHour: Hora Disponible
|
||||
hb: HB
|
||||
roundedCc: CC redondeado
|
||||
basicData:
|
||||
daysInForward: Desplazamiento automatico (redada)
|
||||
isRaid: Redada
|
||||
|
|
@ -974,7 +966,7 @@ components:
|
|||
openCard: Ficha
|
||||
openSummary: Detalles
|
||||
viewSummary: Vista previa
|
||||
vnDescriptor:
|
||||
cardDescriptor:
|
||||
mainList: Listado principal
|
||||
summary: Resumen
|
||||
moreOptions: Más opciones
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ const rolesOptions = ref([]);
|
|||
:label="t('globals.name')"
|
||||
v-model="params.name"
|
||||
lazy-rules
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -57,7 +57,7 @@ const rolesOptions = ref([]);
|
|||
:label="t('account.card.alias')"
|
||||
v-model="params.nickname"
|
||||
lazy-rules
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -75,7 +75,8 @@ const rolesOptions = ref([]);
|
|||
use-input
|
||||
hide-selected
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
:input-debounce="0"
|
||||
/>
|
||||
</QItemSection>
|
||||
|
|
|
|||
|
|
@ -56,7 +56,8 @@ onBeforeMount(() => {
|
|||
option-label="name"
|
||||
use-input
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -71,7 +72,8 @@ onBeforeMount(() => {
|
|||
option-label="name"
|
||||
use-input
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -81,7 +83,7 @@ onBeforeMount(() => {
|
|||
:label="t('acls.aclFilter.property')"
|
||||
v-model="params.property"
|
||||
lazy-rules
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -96,7 +98,8 @@ onBeforeMount(() => {
|
|||
option-label="name"
|
||||
use-input
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -111,7 +114,8 @@ onBeforeMount(() => {
|
|||
option-label="name"
|
||||
use-input
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import { useRoute, useRouter } from 'vue-router';
|
|||
import { useI18n } from 'vue-i18n';
|
||||
import { useQuasar } from 'quasar';
|
||||
|
||||
import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
|
||||
import CardDescriptor from 'components/ui/CardDescriptor.vue';
|
||||
import VnLv from 'src/components/ui/VnLv.vue';
|
||||
|
||||
import axios from 'axios';
|
||||
|
|
@ -48,7 +48,7 @@ const removeAlias = () => {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<EntityDescriptor
|
||||
<CardDescriptor
|
||||
ref="descriptor"
|
||||
:url="`MailAliases/${entityId}`"
|
||||
data-key="Alias"
|
||||
|
|
@ -63,7 +63,7 @@ const removeAlias = () => {
|
|||
<template #body="{ entity }">
|
||||
<VnLv :label="t('role.description')" :value="entity.description" />
|
||||
</template>
|
||||
</EntityDescriptor>
|
||||
</CardDescriptor>
|
||||
</template>
|
||||
|
||||
<i18n>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<script setup>
|
||||
import { ref, computed, onMounted } from 'vue';
|
||||
import { useRoute } from 'vue-router';
|
||||
import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
|
||||
import CardDescriptor from 'components/ui/CardDescriptor.vue';
|
||||
import VnLv from 'src/components/ui/VnLv.vue';
|
||||
import AccountDescriptorMenu from './AccountDescriptorMenu.vue';
|
||||
import VnImg from 'src/components/ui/VnImg.vue';
|
||||
|
|
@ -20,7 +20,7 @@ onMounted(async () => {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<EntityDescriptor
|
||||
<CardDescriptor
|
||||
ref="descriptor"
|
||||
:url="`VnUsers/preview`"
|
||||
:filter="{ ...filter, where: { id: entityId } }"
|
||||
|
|
@ -78,7 +78,7 @@ onMounted(async () => {
|
|||
</QIcon>
|
||||
</QCardActions>
|
||||
</template>
|
||||
</EntityDescriptor>
|
||||
</CardDescriptor>
|
||||
</template>
|
||||
<style scoped>
|
||||
.q-item__label {
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ const props = defineProps({
|
|||
:label="t('globals.name')"
|
||||
v-model="params.name"
|
||||
lazy-rules
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -37,7 +37,7 @@ const props = defineProps({
|
|||
:label="t('role.description')"
|
||||
v-model="params.description"
|
||||
lazy-rules
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
import { computed } from 'vue';
|
||||
import { useRoute } from 'vue-router';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
|
||||
import CardDescriptor from 'components/ui/CardDescriptor.vue';
|
||||
import VnLv from 'src/components/ui/VnLv.vue';
|
||||
import axios from 'axios';
|
||||
import useNotify from 'src/composables/useNotify.js';
|
||||
|
|
@ -32,7 +32,7 @@ const removeRole = async () => {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<EntityDescriptor
|
||||
<CardDescriptor
|
||||
url="VnRoles"
|
||||
:filter="{ where: { id: entityId } }"
|
||||
data-key="Role"
|
||||
|
|
@ -47,7 +47,7 @@ const removeRole = async () => {
|
|||
<template #body="{ entity }">
|
||||
<VnLv :label="t('role.description')" :value="entity.description" />
|
||||
</template>
|
||||
</EntityDescriptor>
|
||||
</CardDescriptor>
|
||||
</template>
|
||||
<style scoped>
|
||||
.q-item__label {
|
||||
|
|
|
|||
|
|
@ -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 }">
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import { toDateHourMinSec, toPercentage } from 'src/filters';
|
|||
import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
|
||||
import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
|
||||
import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
|
||||
import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
|
||||
import CardDescriptor from 'components/ui/CardDescriptor.vue';
|
||||
import VnLv from 'src/components/ui/VnLv.vue';
|
||||
import VnUserLink from 'src/components/ui/VnUserLink.vue';
|
||||
import { getUrl } from 'src/composables/getUrl';
|
||||
|
|
@ -44,7 +44,7 @@ onMounted(async () => {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<EntityDescriptor
|
||||
<CardDescriptor
|
||||
:url="`Claims/${entityId}`"
|
||||
:filter="filter"
|
||||
title="client.name"
|
||||
|
|
@ -147,7 +147,7 @@ onMounted(async () => {
|
|||
</QBtn>
|
||||
</QCardActions>
|
||||
</template>
|
||||
</EntityDescriptor>
|
||||
</CardDescriptor>
|
||||
</template>
|
||||
<style scoped>
|
||||
.q-item__label {
|
||||
|
|
|
|||
|
|
@ -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" />
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ const props = defineProps({
|
|||
:label="t('claim.customerId')"
|
||||
v-model="params.clientFk"
|
||||
lazy-rules
|
||||
filled
|
||||
is-outlined
|
||||
>
|
||||
<template #prepend> <QIcon name="badge" size="xs" /></template>
|
||||
</VnInput>
|
||||
|
|
@ -41,11 +41,12 @@ const props = defineProps({
|
|||
:label="t('Client Name')"
|
||||
v-model="params.clientName"
|
||||
lazy-rules
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
<VnSelect
|
||||
outlined
|
||||
dense
|
||||
filled
|
||||
rounded
|
||||
:label="t('globals.params.departmentFk')"
|
||||
v-model="params.departmentFk"
|
||||
option-value="id"
|
||||
|
|
@ -60,7 +61,8 @@ const props = defineProps({
|
|||
:use-like="false"
|
||||
option-filter="firstName"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
<VnSelect
|
||||
:label="t('claim.state')"
|
||||
|
|
@ -68,12 +70,14 @@ const props = defineProps({
|
|||
:options="states"
|
||||
option-label="description"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
<VnInputDate
|
||||
v-model="params.created"
|
||||
:label="t('claim.created')"
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
dense
|
||||
/>
|
||||
<VnSelect
|
||||
|
|
@ -82,7 +86,8 @@ const props = defineProps({
|
|||
url="Items/withName"
|
||||
:use-like="false"
|
||||
sort-by="id DESC"
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
dense
|
||||
/>
|
||||
<VnSelect
|
||||
|
|
@ -93,13 +98,15 @@ const props = defineProps({
|
|||
:use-like="false"
|
||||
option-filter="firstName"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
<VnSelect
|
||||
:label="t('claim.zone')"
|
||||
v-model="params.zoneFk"
|
||||
url="Zones"
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
dense
|
||||
/>
|
||||
<QCheckbox
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ const columns = computed(() => [
|
|||
|
||||
const STATE_COLOR = {
|
||||
pending: 'bg-warning',
|
||||
loses: 'bg-negative',
|
||||
managed: 'bg-info',
|
||||
resolved: 'bg-positive',
|
||||
};
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ 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();
|
||||
|
|
@ -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 }) }}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import { toCurrency, toDate } from 'src/filters';
|
|||
|
||||
import useCardDescription from 'src/composables/useCardDescription';
|
||||
|
||||
import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
|
||||
import CardDescriptor from 'components/ui/CardDescriptor.vue';
|
||||
import VnLv from 'src/components/ui/VnLv.vue';
|
||||
import CustomerDescriptorMenu from './CustomerDescriptorMenu.vue';
|
||||
import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
|
||||
|
|
@ -54,7 +54,7 @@ const debtWarning = computed(() => {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<EntityDescriptor
|
||||
<CardDescriptor
|
||||
:url="`Clients/${entityId}/getCard`"
|
||||
:summary="$props.summary"
|
||||
data-key="Customer"
|
||||
|
|
@ -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"
|
||||
|
|
@ -223,7 +232,7 @@ const debtWarning = computed(() => {
|
|||
</QBtn>
|
||||
</QCardActions>
|
||||
</template>
|
||||
</EntityDescriptor>
|
||||
</CardDescriptor>
|
||||
</template>
|
||||
|
||||
<i18n>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ const exprBuilder = (param, value) => {
|
|||
<template #body="{ params, searchFn }">
|
||||
<QItem class="q-my-sm">
|
||||
<QItemSection>
|
||||
<VnInput :label="t('FI')" v-model="params.fi" filled>
|
||||
<VnInput :label="t('FI')" v-model="params.fi" is-outlined>
|
||||
<template #prepend>
|
||||
<QIcon name="badge" size="xs" />
|
||||
</template>
|
||||
|
|
@ -50,7 +50,7 @@ const exprBuilder = (param, value) => {
|
|||
</QItem>
|
||||
<QItem class="q-mb-sm">
|
||||
<QItemSection>
|
||||
<VnInput :label="t('Name')" v-model="params.name" filled />
|
||||
<VnInput :label="t('Name')" v-model="params.name" is-outlined />
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem class="q-mb-sm">
|
||||
|
|
@ -58,15 +58,16 @@ const exprBuilder = (param, value) => {
|
|||
<VnInput
|
||||
:label="t('customer.summary.socialName')"
|
||||
v-model="params.socialName"
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem class="q-mb-sm">
|
||||
<QItemSection>
|
||||
<VnSelect
|
||||
outlined
|
||||
dense
|
||||
filled
|
||||
rounded
|
||||
:label="t('globals.params.departmentFk')"
|
||||
v-model="params.departmentFk"
|
||||
option-value="id"
|
||||
|
|
@ -88,7 +89,8 @@ const exprBuilder = (param, value) => {
|
|||
map-options
|
||||
hide-selected
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
auto-load
|
||||
:input-debounce="0"
|
||||
/>
|
||||
|
|
@ -96,12 +98,12 @@ const exprBuilder = (param, value) => {
|
|||
</QItem>
|
||||
<QItem class="q-mb-sm">
|
||||
<QItemSection>
|
||||
<VnInput :label="t('City')" v-model="params.city" filled />
|
||||
<VnInput :label="t('City')" v-model="params.city" is-outlined />
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem class="q-mb-sm">
|
||||
<QItemSection>
|
||||
<VnInput :label="t('Phone')" v-model="params.phone" filled>
|
||||
<VnInput :label="t('Phone')" v-model="params.phone" is-outlined>
|
||||
<template #prepend>
|
||||
<QIcon name="phone" size="xs" />
|
||||
</template>
|
||||
|
|
@ -110,7 +112,7 @@ const exprBuilder = (param, value) => {
|
|||
</QItem>
|
||||
<QItem class="q-mb-sm">
|
||||
<QItemSection>
|
||||
<VnInput :label="t('Email')" v-model="params.email" filled>
|
||||
<VnInput :label="t('Email')" v-model="params.email" is-outlined>
|
||||
<template #prepend>
|
||||
<QIcon name="email" size="sm" />
|
||||
</template>
|
||||
|
|
@ -130,14 +132,19 @@ const exprBuilder = (param, value) => {
|
|||
map-options
|
||||
hide-selected
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
auto-load
|
||||
sortBy="name ASC"
|
||||
/></QItemSection>
|
||||
</QItem>
|
||||
<QItem class="q-mb-sm">
|
||||
<QItemSection>
|
||||
<VnInput :label="t('Postcode')" v-model="params.postcode" filled />
|
||||
<VnInput
|
||||
:label="t('Postcode')"
|
||||
v-model="params.postcode"
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -45,7 +45,8 @@ const departments = ref();
|
|||
dense
|
||||
option-label="name"
|
||||
option-value="id"
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
emit-value
|
||||
hide-selected
|
||||
map-options
|
||||
|
|
@ -66,7 +67,8 @@ const departments = ref();
|
|||
map-options
|
||||
option-label="name"
|
||||
option-value="id"
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
use-input
|
||||
v-model="params.departmentFk"
|
||||
@update:model-value="searchFn()"
|
||||
|
|
@ -89,7 +91,8 @@ const departments = ref();
|
|||
map-options
|
||||
option-label="name"
|
||||
option-value="id"
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
use-input
|
||||
v-model="params.countryFk"
|
||||
@update:model-value="searchFn()"
|
||||
|
|
@ -105,7 +108,7 @@ const departments = ref();
|
|||
<VnInput
|
||||
:label="t('P. Method')"
|
||||
clearable
|
||||
filled
|
||||
is-outlined
|
||||
v-model="params.paymentMethod"
|
||||
/>
|
||||
</QItemSection>
|
||||
|
|
@ -116,7 +119,7 @@ const departments = ref();
|
|||
<VnInput
|
||||
:label="t('Balance D.')"
|
||||
clearable
|
||||
filled
|
||||
is-outlined
|
||||
v-model="params.balance"
|
||||
/>
|
||||
</QItemSection>
|
||||
|
|
@ -134,7 +137,8 @@ const departments = ref();
|
|||
map-options
|
||||
option-label="name"
|
||||
option-value="id"
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
use-input
|
||||
v-model="params.workerFk"
|
||||
@update:model-value="searchFn()"
|
||||
|
|
@ -150,7 +154,7 @@ const departments = ref();
|
|||
<VnInputDate
|
||||
:label="t('L. O. Date')"
|
||||
clearable
|
||||
filled
|
||||
is-outlined
|
||||
v-model="params.date"
|
||||
/>
|
||||
</QItemSection>
|
||||
|
|
@ -161,7 +165,7 @@ const departments = ref();
|
|||
<VnInput
|
||||
:label="t('Credit I.')"
|
||||
clearable
|
||||
filled
|
||||
is-outlined
|
||||
v-model="params.credit"
|
||||
/>
|
||||
</QItemSection>
|
||||
|
|
@ -171,7 +175,7 @@ const departments = ref();
|
|||
<QItemSection>
|
||||
<VnInputDate
|
||||
:label="t('From')"
|
||||
filled
|
||||
is-outlined
|
||||
v-model="params.defaulterSinced"
|
||||
/>
|
||||
</QItemSection>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ const props = defineProps({
|
|||
<template #body="{ params }">
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnInput :label="t('Order ID')" v-model="params.orderFk" filled>
|
||||
<VnInput :label="t('Order ID')" v-model="params.orderFk" is-outlined>
|
||||
<template #prepend>
|
||||
<QIcon name="vn:basket" size="xs" />
|
||||
</template>
|
||||
|
|
@ -34,7 +34,11 @@ const props = defineProps({
|
|||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnInput :label="t('Customer ID')" v-model="params.clientFk" filled>
|
||||
<VnInput
|
||||
:label="t('Customer ID')"
|
||||
v-model="params.clientFk"
|
||||
is-outlined
|
||||
>
|
||||
<template #prepend>
|
||||
<QIcon name="vn:client" size="xs" />
|
||||
</template>
|
||||
|
|
@ -43,15 +47,19 @@ const props = defineProps({
|
|||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnInputNumber :label="t('Amount')" v-model="params.amount" filled />
|
||||
<VnInputNumber
|
||||
:label="t('Amount')"
|
||||
v-model="params.amount"
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnInputDate v-model="params.from" :label="t('From')" filled />
|
||||
<VnInputDate v-model="params.from" :label="t('From')" is-outlined />
|
||||
</QItemSection>
|
||||
<QItemSection>
|
||||
<VnInputDate v-model="params.to" :label="t('To')" filled />
|
||||
<VnInputDate v-model="params.to" :label="t('To')" is-outlined />
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import { toDate } from 'src/filters';
|
|||
import { getUrl } from 'src/composables/getUrl';
|
||||
import { useQuasar } from 'quasar';
|
||||
import { usePrintService } from 'composables/usePrintService';
|
||||
import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
|
||||
import CardDescriptor from 'components/ui/CardDescriptor.vue';
|
||||
import VnLv from 'src/components/ui/VnLv.vue';
|
||||
import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
|
||||
import axios from 'axios';
|
||||
|
|
@ -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) {
|
||||
|
|
@ -145,7 +145,7 @@ async function deleteEntry() {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<EntityDescriptor
|
||||
<CardDescriptor
|
||||
:url="`Entries/${entityId}`"
|
||||
:filter="entryFilter"
|
||||
title="supplier.nickname"
|
||||
|
|
@ -264,7 +264,7 @@ async function deleteEntry() {
|
|||
</QBtn>
|
||||
</QCardActions>
|
||||
</template>
|
||||
</EntityDescriptor>
|
||||
</CardDescriptor>
|
||||
</template>
|
||||
<i18n>
|
||||
es:
|
||||
|
|
|
|||
|
|
@ -84,10 +84,7 @@ 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"
|
||||
|
|
@ -162,7 +159,6 @@ onMounted(async () => {
|
|||
/>
|
||||
</div>
|
||||
<div class="card-content">
|
||||
<VnLv :label="t('travel.awbFk')" :value="entry.travel.awbFk" />
|
||||
<VnCheckbox
|
||||
:label="t('entry.summary.travelDelivered')"
|
||||
v-model="entry.travel.isDelivered"
|
||||
|
|
|
|||
|
|
@ -101,14 +101,14 @@ const entryFilterPanel = ref();
|
|||
:label="t('params.landed')"
|
||||
v-model="params.landed"
|
||||
@update:model-value="searchFn()"
|
||||
filled
|
||||
is-outlined
|
||||
data-cy="landed"
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnInput v-model="params.id" label="Id" filled />
|
||||
<VnInput v-model="params.id" label="Id" is-outlined />
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
|
|
@ -118,7 +118,8 @@ const entryFilterPanel = ref();
|
|||
@update:model-value="searchFn()"
|
||||
hide-selected
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -127,7 +128,7 @@ const entryFilterPanel = ref();
|
|||
<VnInput
|
||||
v-model="params.reference"
|
||||
:label="t('entry.list.tableVisibleColumns.reference')"
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -142,7 +143,8 @@ const entryFilterPanel = ref();
|
|||
:fields="['id', 'name']"
|
||||
hide-selected
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -151,7 +153,7 @@ const entryFilterPanel = ref();
|
|||
<VnInput
|
||||
v-model="params.evaNotes"
|
||||
:label="t('params.evaNotes')"
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -166,7 +168,8 @@ const entryFilterPanel = ref();
|
|||
sort-by="name ASC"
|
||||
hide-selected
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -181,7 +184,8 @@ const entryFilterPanel = ref();
|
|||
sort-by="name ASC"
|
||||
hide-selected
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
>
|
||||
<template #option="scope">
|
||||
<QItem v-bind="scope.itemProps">
|
||||
|
|
@ -203,7 +207,7 @@ const entryFilterPanel = ref();
|
|||
<VnInput
|
||||
v-model="params.invoiceNumber"
|
||||
:label="t('params.invoiceNumber')"
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -220,16 +224,8 @@ const entryFilterPanel = ref();
|
|||
option-label="description"
|
||||
hide-selected
|
||||
dense
|
||||
filled
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnInput
|
||||
v-model="params.evaNotes"
|
||||
:label="t('params.evaNotes')"
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
|
|||
import axios from 'axios';
|
||||
import { toCurrency, toDate } from 'src/filters';
|
||||
import VnLv from 'src/components/ui/VnLv.vue';
|
||||
import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
|
||||
import CardDescriptor from 'components/ui/CardDescriptor.vue';
|
||||
import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
|
||||
import filter from './InvoiceInFilter.js';
|
||||
import InvoiceInDescriptorMenu from './InvoiceInDescriptorMenu.vue';
|
||||
|
|
@ -84,7 +84,7 @@ async function setInvoiceCorrection(id) {
|
|||
}
|
||||
</script>
|
||||
<template>
|
||||
<EntityDescriptor
|
||||
<CardDescriptor
|
||||
ref="cardDescriptorRef"
|
||||
data-key="InvoiceIn"
|
||||
:url="`InvoiceIns/${entityId}`"
|
||||
|
|
@ -159,7 +159,7 @@ async function setInvoiceCorrection(id) {
|
|||
</QBtn>
|
||||
</QCardActions>
|
||||
</template>
|
||||
</EntityDescriptor>
|
||||
</CardDescriptor>
|
||||
</template>
|
||||
<style lang="scss" scoped>
|
||||
.q-dialog {
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
</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,13 +207,14 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
|
|||
<InvoiceInDescriptorMenu :invoice="entity" />
|
||||
</template>
|
||||
<template #body="{ entity }">
|
||||
<QCard class="max-width">
|
||||
<!--Basic Data-->
|
||||
<QCard class="vn-one">
|
||||
<QCardSection class="q-pa-none">
|
||||
<VnTitle
|
||||
:url="getLink('basic-data')"
|
||||
:text="t('globals.pageTitles.basicData')"
|
||||
/>
|
||||
<div class="vn-card-group">
|
||||
<div class="vn-card-content">
|
||||
</QCardSection>
|
||||
<VnLv
|
||||
:label="t('invoiceIn.list.supplier')"
|
||||
:value="entity.supplier?.name"
|
||||
|
|
@ -232,24 +226,24 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
|
|||
</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv
|
||||
:label="t('invoiceIn.supplierRef')"
|
||||
:value="entity.supplierRef"
|
||||
/>
|
||||
<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('invoiceIn.serial')" :value="`${entity.serial}`" />
|
||||
<VnLv
|
||||
:label="t('globals.country')"
|
||||
:value="entity.supplier?.country?.code"
|
||||
/>
|
||||
</div>
|
||||
<div class="vn-card-content">
|
||||
</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')"
|
||||
|
|
@ -267,12 +261,15 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
|
|||
:label="t('invoiceIn.summary.bookedDate')"
|
||||
:value="toDate(entity.booked)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('globals.isVies')"
|
||||
:value="entity.supplier?.isVies"
|
||||
<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')"
|
||||
/>
|
||||
</div>
|
||||
<div class="vn-card-content">
|
||||
</QCardSection>
|
||||
<VnLv
|
||||
:label="t('invoiceIn.summary.sage')"
|
||||
:value="entity.sageWithholding?.withholding"
|
||||
|
|
@ -285,12 +282,16 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
|
|||
:label="t('invoiceIn.card.company')"
|
||||
:value="entity.company?.code"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('invoiceIn.isBooked')"
|
||||
:value="invoiceIn?.isBooked"
|
||||
<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')"
|
||||
/>
|
||||
</div>
|
||||
<div class="vn-card-content">
|
||||
</QCardSection>
|
||||
<QCardSection class="q-pa-none">
|
||||
<VnLv
|
||||
:label="t('invoiceIn.summary.taxableBase')"
|
||||
:value="toCurrency(entity.totals.totalTaxableBase)"
|
||||
|
|
@ -304,10 +305,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
|
|||
:color="amountsNotMatch ? 'negative' : 'transparent'"
|
||||
:title="
|
||||
amountsNotMatch
|
||||
? t('invoiceIn.noMatch', {
|
||||
totalTaxableBase:
|
||||
entity.totals.totalTaxableBase,
|
||||
})
|
||||
? t('invoiceIn.summary.noMatch')
|
||||
: t('invoiceIn.summary.dueTotal')
|
||||
"
|
||||
>
|
||||
|
|
@ -315,8 +313,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
|
|||
</QChip>
|
||||
</template>
|
||||
</VnLv>
|
||||
</div>
|
||||
</div>
|
||||
</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>
|
||||
|
|
|
|||
|
|
@ -40,13 +40,17 @@ function handleDaysAgo(params, daysAgo) {
|
|||
<VnInputDate
|
||||
:label="$t('globals.from')"
|
||||
v-model="params.from"
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnInputDate :label="$t('globals.to')" v-model="params.to" filled />
|
||||
<VnInputDate
|
||||
:label="$t('globals.to')"
|
||||
v-model="params.to"
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
|
|
@ -54,7 +58,7 @@ function handleDaysAgo(params, daysAgo) {
|
|||
<VnInputNumber
|
||||
:label="$t('globals.daysAgo')"
|
||||
v-model="params.daysAgo"
|
||||
filled
|
||||
is-outlined
|
||||
:step="0"
|
||||
@update:model-value="(val) => handleDaysAgo(params, val)"
|
||||
@remove="(val) => handleDaysAgo(params, val)"
|
||||
|
|
@ -63,7 +67,12 @@ function handleDaysAgo(params, daysAgo) {
|
|||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnSelectSupplier v-model="params.supplierFk" dense filled />
|
||||
<VnSelectSupplier
|
||||
v-model="params.supplierFk"
|
||||
dense
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
|
|
@ -71,7 +80,7 @@ function handleDaysAgo(params, daysAgo) {
|
|||
<VnInput
|
||||
:label="getLocale('supplierRef')"
|
||||
v-model="params.supplierRef"
|
||||
filled
|
||||
is-outlined
|
||||
lazy-rules
|
||||
/>
|
||||
</QItemSection>
|
||||
|
|
@ -81,7 +90,7 @@ function handleDaysAgo(params, daysAgo) {
|
|||
<VnInput
|
||||
:label="getLocale('fi')"
|
||||
v-model="params.fi"
|
||||
filled
|
||||
is-outlined
|
||||
lazy-rules
|
||||
/>
|
||||
</QItemSection>
|
||||
|
|
@ -91,7 +100,7 @@ function handleDaysAgo(params, daysAgo) {
|
|||
<VnInput
|
||||
:label="getLocale('serial')"
|
||||
v-model="params.serial"
|
||||
filled
|
||||
is-outlined
|
||||
lazy-rules
|
||||
/>
|
||||
</QItemSection>
|
||||
|
|
@ -101,7 +110,7 @@ function handleDaysAgo(params, daysAgo) {
|
|||
<VnInput
|
||||
:label="getLocale('account')"
|
||||
v-model="params.account"
|
||||
filled
|
||||
is-outlined
|
||||
lazy-rules
|
||||
/>
|
||||
</QItemSection>
|
||||
|
|
@ -111,7 +120,7 @@ function handleDaysAgo(params, daysAgo) {
|
|||
<VnInput
|
||||
:label="getLocale('globals.params.awbCode')"
|
||||
v-model="params.awbCode"
|
||||
filled
|
||||
is-outlined
|
||||
lazy-rules
|
||||
/>
|
||||
</QItemSection>
|
||||
|
|
@ -121,7 +130,7 @@ function handleDaysAgo(params, daysAgo) {
|
|||
<VnInputNumber
|
||||
:label="$t('globals.amount')"
|
||||
v-model="params.amount"
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -133,7 +142,7 @@ function handleDaysAgo(params, daysAgo) {
|
|||
url="Companies"
|
||||
option-label="code"
|
||||
:fields="['id', 'code']"
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@ const { t } = useI18n();
|
|||
<VnInputNumber
|
||||
v-model="params.daysAgo"
|
||||
:label="t('params.daysAgo')"
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
dense
|
||||
/>
|
||||
</QItemSection>
|
||||
|
|
@ -35,7 +36,8 @@ const { t } = useI18n();
|
|||
<VnInput
|
||||
v-model="params.serial"
|
||||
:label="t('params.serial')"
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
dense
|
||||
/>
|
||||
</QItemSection>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ invoiceIn:
|
|||
serial: Serial
|
||||
isBooked: Is booked
|
||||
supplierRef: Invoice nº
|
||||
isDeductible: Deductible
|
||||
list:
|
||||
ref: Reference
|
||||
supplier: Supplier
|
||||
|
|
@ -58,6 +57,7 @@ invoiceIn:
|
|||
bank: Bank
|
||||
foreignValue: Foreign value
|
||||
dueTotal: Due day
|
||||
noMatch: Do not match
|
||||
code: Code
|
||||
net: Net
|
||||
stems: Stems
|
||||
|
|
@ -68,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
|
||||
|
|
@ -67,4 +66,3 @@ invoiceIn:
|
|||
isBooked: Contabilizada
|
||||
account: Cuenta contable
|
||||
correctingFk: Rectificativa
|
||||
noMatch: No cuadra con el iva({totalTaxableBase})
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import { ref, computed } from 'vue';
|
|||
import { useRoute } from 'vue-router';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
|
||||
import CardDescriptor from 'components/ui/CardDescriptor.vue';
|
||||
import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
|
||||
import VnLv from 'src/components/ui/VnLv.vue';
|
||||
import InvoiceOutDescriptorMenu from './InvoiceOutDescriptorMenu.vue';
|
||||
|
|
@ -34,7 +34,7 @@ function ticketFilter(invoice) {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<EntityDescriptor
|
||||
<CardDescriptor
|
||||
ref="descriptor"
|
||||
:url="`InvoiceOuts/${entityId}`"
|
||||
:filter="filter"
|
||||
|
|
@ -93,5 +93,5 @@ function ticketFilter(invoice) {
|
|||
</QBtn>
|
||||
</QCardActions>
|
||||
</template>
|
||||
</EntityDescriptor>
|
||||
</CardDescriptor>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -33,13 +33,17 @@ const states = ref();
|
|||
<VnInput
|
||||
:label="t('globals.params.clientFk')"
|
||||
v-model="params.clientFk"
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnInput v-model="params.fi" :label="t('globals.params.fi')" filled />
|
||||
<VnInput
|
||||
v-model="params.fi"
|
||||
:label="t('globals.params.fi')"
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
|
|
@ -47,7 +51,7 @@ const states = ref();
|
|||
<VnInputNumber
|
||||
:label="t('globals.amount')"
|
||||
v-model="params.amount"
|
||||
filled
|
||||
is-outlined
|
||||
data-cy="InvoiceOutFilterAmountBtn"
|
||||
/>
|
||||
</QItemSection>
|
||||
|
|
@ -58,7 +62,8 @@ const states = ref();
|
|||
:label="t('invoiceOut.params.min')"
|
||||
dense
|
||||
lazy-rules
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
type="number"
|
||||
v-model.number="params.min"
|
||||
/>
|
||||
|
|
@ -68,7 +73,8 @@ const states = ref();
|
|||
:label="t('invoiceOut.params.max')"
|
||||
dense
|
||||
lazy-rules
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
type="number"
|
||||
v-model.number="params.max"
|
||||
/>
|
||||
|
|
@ -88,7 +94,7 @@ const states = ref();
|
|||
<VnInputDate
|
||||
v-model="params.created"
|
||||
:label="t('invoiceOut.params.created')"
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -97,14 +103,15 @@ const states = ref();
|
|||
<VnInputDate
|
||||
v-model="params.dued"
|
||||
:label="t('invoiceOut.params.dued')"
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnSelect
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
:label="t('globals.params.departmentFk')"
|
||||
v-model="params.departmentFk"
|
||||
option-value="id"
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ const serialTypesOptions = ref([]);
|
|||
|
||||
const handleInvoiceOutSerialsFetch = (data) => {
|
||||
serialTypesOptions.value = Array.from(
|
||||
new Set(data.map((item) => item.type).filter((type) => type)),
|
||||
new Set(data.map((item) => item.type).filter((type) => type))
|
||||
);
|
||||
};
|
||||
|
||||
|
|
@ -99,7 +99,8 @@ onMounted(async () => {
|
|||
option-label="name"
|
||||
hide-selected
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
data-cy="InvoiceOutGlobalClientSelect"
|
||||
>
|
||||
<template #option="scope">
|
||||
|
|
@ -123,18 +124,19 @@ onMounted(async () => {
|
|||
option-label="type"
|
||||
hide-selected
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
data-cy="InvoiceOutGlobalSerialSelect"
|
||||
/>
|
||||
<VnInputDate
|
||||
v-model="formData.invoiceDate"
|
||||
:label="t('invoiceDate')"
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
<VnInputDate
|
||||
v-model="formData.maxShipped"
|
||||
:label="t('maxShipped')"
|
||||
filled
|
||||
is-outlined
|
||||
data-cy="InvoiceOutGlobalMaxShippedDate"
|
||||
/>
|
||||
<VnSelect
|
||||
|
|
@ -143,7 +145,8 @@ onMounted(async () => {
|
|||
:options="companiesOptions"
|
||||
option-label="code"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
data-cy="InvoiceOutGlobalCompanySelect"
|
||||
/>
|
||||
<VnSelect
|
||||
|
|
@ -151,7 +154,8 @@ onMounted(async () => {
|
|||
v-model="formData.printer"
|
||||
:options="printersOptions"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
data-cy="InvoiceOutGlobalPrinterSelect"
|
||||
/>
|
||||
</div>
|
||||
|
|
@ -162,7 +166,7 @@ onMounted(async () => {
|
|||
color="primary"
|
||||
class="q-mt-md full-width"
|
||||
unelevated
|
||||
filled
|
||||
rounded
|
||||
dense
|
||||
/>
|
||||
<QBtn
|
||||
|
|
@ -171,7 +175,7 @@ onMounted(async () => {
|
|||
color="primary"
|
||||
class="q-mt-md full-width"
|
||||
unelevated
|
||||
filled
|
||||
rounded
|
||||
dense
|
||||
@click="getStatus = 'stopping'"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -35,13 +35,17 @@ const props = defineProps({
|
|||
<VnInputDate
|
||||
v-model="params.from"
|
||||
:label="t('globals.from')"
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnInputDate v-model="params.to" :label="t('globals.to')" filled />
|
||||
<VnInputDate
|
||||
v-model="params.to"
|
||||
:label="t('globals.to')"
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
|
|
@ -53,7 +57,8 @@ const props = defineProps({
|
|||
option-label="code"
|
||||
option-value="code"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
@update:model-value="searchFn()"
|
||||
>
|
||||
<template #option="scope">
|
||||
|
|
@ -79,8 +84,9 @@ const props = defineProps({
|
|||
v-model="params.country"
|
||||
option-label="name"
|
||||
option-value="name"
|
||||
outlined
|
||||
dense
|
||||
filled
|
||||
rounded
|
||||
@update:model-value="searchFn()"
|
||||
>
|
||||
<template #option="scope">
|
||||
|
|
@ -104,8 +110,9 @@ const props = defineProps({
|
|||
url="Clients"
|
||||
:label="t('globals.client')"
|
||||
v-model="params.clientId"
|
||||
outlined
|
||||
dense
|
||||
filled
|
||||
rounded
|
||||
@update:model-value="searchFn()"
|
||||
/>
|
||||
</QItemSection>
|
||||
|
|
@ -115,7 +122,7 @@ const props = defineProps({
|
|||
<VnInputNumber
|
||||
v-model="params.amount"
|
||||
:label="t('globals.amount')"
|
||||
filled
|
||||
is-outlined
|
||||
:positive="false"
|
||||
/>
|
||||
</QItemSection>
|
||||
|
|
@ -123,8 +130,9 @@ const props = defineProps({
|
|||
<QItem>
|
||||
<QItemSection>
|
||||
<VnSelect
|
||||
outlined
|
||||
dense
|
||||
filled
|
||||
rounded
|
||||
:label="t('globals.params.departmentFk')"
|
||||
v-model="params.departmentFk"
|
||||
option-value="id"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import { computed, ref, onMounted } from 'vue';
|
|||
import { useRoute } from 'vue-router';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import EntityDescriptor from 'src/components/ui/EntityDescriptor.vue';
|
||||
import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
|
||||
import VnLv from 'src/components/ui/VnLv.vue';
|
||||
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
||||
import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
|
||||
|
|
@ -90,7 +90,7 @@ const updateStock = async () => {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<EntityDescriptor
|
||||
<CardDescriptor
|
||||
data-key="Item"
|
||||
:summary="$props.summary"
|
||||
:url="`Items/${entityId}/getCard`"
|
||||
|
|
@ -162,7 +162,7 @@ const updateStock = async () => {
|
|||
</QBtn>
|
||||
</QCardActions>
|
||||
</template>
|
||||
</EntityDescriptor>
|
||||
</CardDescriptor>
|
||||
</template>
|
||||
|
||||
<i18n>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ const props = defineProps({
|
|||
required: true,
|
||||
},
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
|
@ -27,7 +28,8 @@ const props = defineProps({
|
|||
:fields="['id', 'nickname']"
|
||||
option-label="nickname"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
use-input
|
||||
@update:model-value="searchFn()"
|
||||
sort-by="nickname ASC"
|
||||
|
|
@ -44,7 +46,8 @@ const props = defineProps({
|
|||
:label="t('params.warehouseFk')"
|
||||
v-model="params.warehouseFk"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
use-input
|
||||
@update:model-value="searchFn()"
|
||||
/>
|
||||
|
|
@ -55,7 +58,7 @@ const props = defineProps({
|
|||
<VnInputDate
|
||||
:label="t('params.started')"
|
||||
v-model="params.started"
|
||||
filled
|
||||
is-outlined
|
||||
@update:model-value="searchFn()"
|
||||
/>
|
||||
</QItemSection>
|
||||
|
|
@ -65,7 +68,7 @@ const props = defineProps({
|
|||
<VnInputDate
|
||||
:label="t('params.ended')"
|
||||
v-model="params.ended"
|
||||
filled
|
||||
is-outlined
|
||||
@update:model-value="searchFn()"
|
||||
/>
|
||||
</QItemSection>
|
||||
|
|
|
|||
|
|
@ -177,7 +177,11 @@ onMounted(async () => {
|
|||
<template #body="{ params, searchFn }">
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnInput v-model="params.search" :label="t('params.search')" filled />
|
||||
<VnInput
|
||||
v-model="params.search"
|
||||
:label="t('params.search')"
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
|
|
@ -193,7 +197,8 @@ onMounted(async () => {
|
|||
option-label="name"
|
||||
hide-selected
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -208,7 +213,8 @@ onMounted(async () => {
|
|||
option-label="name"
|
||||
hide-selected
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
>
|
||||
<template #option="scope">
|
||||
<QItem v-bind="scope.itemProps">
|
||||
|
|
@ -234,7 +240,8 @@ onMounted(async () => {
|
|||
option-label="nickname"
|
||||
hide-selected
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -245,7 +252,8 @@ onMounted(async () => {
|
|||
@update:model-value="searchFn()"
|
||||
hide-selected
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -274,7 +282,8 @@ onMounted(async () => {
|
|||
:options="tagOptions"
|
||||
option-label="name"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
:emit-value="false"
|
||||
use-input
|
||||
:is-clearable="false"
|
||||
|
|
@ -290,7 +299,8 @@ onMounted(async () => {
|
|||
option-value="value"
|
||||
option-label="value"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
emit-value
|
||||
use-input
|
||||
:disable="!tag"
|
||||
|
|
@ -302,7 +312,7 @@ onMounted(async () => {
|
|||
v-model="tag.value"
|
||||
:label="t('params.value')"
|
||||
:disable="!tag"
|
||||
filled
|
||||
is-outlined
|
||||
:is-clearable="false"
|
||||
@keydown.enter.prevent="applyTags(params, searchFn)"
|
||||
/>
|
||||
|
|
@ -341,7 +351,8 @@ onMounted(async () => {
|
|||
option-label="label"
|
||||
option-value="label"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
:emit-value="false"
|
||||
use-input
|
||||
:is-clearable="false"
|
||||
|
|
@ -366,7 +377,7 @@ onMounted(async () => {
|
|||
v-model="fieldFilter.value"
|
||||
:label="t('params.value')"
|
||||
:disable="!fieldFilter.selectedField"
|
||||
filled
|
||||
is-outlined
|
||||
@keydown.enter="applyFieldFilters(params, searchFn)"
|
||||
/>
|
||||
</QItemSection>
|
||||
|
|
|
|||
|
|
@ -87,7 +87,11 @@ onMounted(async () => {
|
|||
<template #body="{ params, searchFn }">
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnInput v-model="params.search" :label="t('params.search')" filled />
|
||||
<VnInput
|
||||
v-model="params.search"
|
||||
:label="t('params.search')"
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
|
|
@ -95,7 +99,7 @@ onMounted(async () => {
|
|||
<VnInput
|
||||
v-model="params.ticketFk"
|
||||
:label="t('params.ticketFk')"
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -110,7 +114,8 @@ onMounted(async () => {
|
|||
option-label="nickname"
|
||||
hide-selected
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -119,7 +124,7 @@ onMounted(async () => {
|
|||
<VnInput
|
||||
v-model="params.clientFk"
|
||||
:label="t('params.clientFk')"
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -134,7 +139,8 @@ onMounted(async () => {
|
|||
option-label="name"
|
||||
hide-selected
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -147,16 +153,25 @@ onMounted(async () => {
|
|||
:params="{ departmentCodes: ['VT'] }"
|
||||
hide-selected
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnInputDate v-model="params.from" :label="t('params.from')" filled />
|
||||
<VnInputDate
|
||||
v-model="params.from"
|
||||
:label="t('params.from')"
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
<QItemSection>
|
||||
<VnInputDate v-model="params.to" :label="t('params.to')" filled />
|
||||
<VnInputDate
|
||||
v-model="params.to"
|
||||
:label="t('params.to')"
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
|
|
@ -165,7 +180,7 @@ onMounted(async () => {
|
|||
:label="t('params.daysOnward')"
|
||||
v-model="params.daysOnward"
|
||||
lazy-rules
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -180,7 +195,8 @@ onMounted(async () => {
|
|||
option-label="name"
|
||||
hide-selected
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
import { computed } from 'vue';
|
||||
import { useRoute } from 'vue-router';
|
||||
|
||||
import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
|
||||
import CardDescriptor from 'components/ui/CardDescriptor.vue';
|
||||
import VnLv from 'src/components/ui/VnLv.vue';
|
||||
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
||||
import filter from './ItemTypeFilter.js';
|
||||
|
|
@ -25,7 +25,7 @@ const entityId = computed(() => {
|
|||
});
|
||||
</script>
|
||||
<template>
|
||||
<EntityDescriptor
|
||||
<CardDescriptor
|
||||
:url="`ItemTypes/${entityId}`"
|
||||
:filter="filter"
|
||||
title="code"
|
||||
|
|
@ -46,5 +46,5 @@ const entityId = computed(() => {
|
|||
:value="entity.category?.name"
|
||||
/>
|
||||
</template>
|
||||
</EntityDescriptor>
|
||||
</CardDescriptor>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
<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';
|
||||
const { t } = useI18n();
|
||||
|
||||
const dates = dateRange(Date.vnNew());
|
||||
|
|
@ -95,7 +94,6 @@ const columns = computed(() => [
|
|||
columnClass: 'no-padding',
|
||||
},
|
||||
]);
|
||||
const openTab = (id) => useOpenURL(`#/customer/${id}/summary`);
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
|
@ -115,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>
|
||||
|
|
@ -125,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>
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ const getLocale = (label) => {
|
|||
<VnInput
|
||||
:label="t('globals.params.clientFk')"
|
||||
v-model="params.clientFk"
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -86,7 +86,7 @@ const getLocale = (label) => {
|
|||
<VnInput
|
||||
:label="t('params.orderFk')"
|
||||
v-model="params.orderFk"
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
@ -95,7 +95,7 @@ const getLocale = (label) => {
|
|||
<VnInputNumber
|
||||
:label="t('params.scopeDays')"
|
||||
v-model="params.scopeDays"
|
||||
filled
|
||||
is-outlined
|
||||
@update:model-value="(val) => handleScopeDays(params, val)"
|
||||
@remove="(val) => handleScopeDays(params, val)"
|
||||
/>
|
||||
|
|
@ -106,54 +106,66 @@ const getLocale = (label) => {
|
|||
<VnInput
|
||||
:label="t('params.nickname')"
|
||||
v-model="params.nickname"
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnSelect
|
||||
outlined
|
||||
dense
|
||||
filled
|
||||
rounded
|
||||
:label="t('globals.params.departmentFk')"
|
||||
v-model="params.departmentFk"
|
||||
option-value="id"
|
||||
option-label="name"
|
||||
url="Departments"
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnInput :label="t('params.refFk')" v-model="params.refFk" filled />
|
||||
<VnInput
|
||||
:label="t('params.refFk')"
|
||||
v-model="params.refFk"
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnSelect
|
||||
outlined
|
||||
dense
|
||||
filled
|
||||
rounded
|
||||
:label="t('params.agencyModeFk')"
|
||||
v-model="params.agencyModeFk"
|
||||
url="AgencyModes/isActive"
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnSelect
|
||||
outlined
|
||||
dense
|
||||
filled
|
||||
rounded
|
||||
:label="t('globals.params.stateFk')"
|
||||
v-model="params.stateFk"
|
||||
url="States"
|
||||
is-outlined
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnSelect
|
||||
outlined
|
||||
dense
|
||||
filled
|
||||
rounded
|
||||
:label="t('params.groupedStates')"
|
||||
v-model="params.alertLevel"
|
||||
:options="groupedStates"
|
||||
|
|
@ -164,8 +176,9 @@ const getLocale = (label) => {
|
|||
<QItem>
|
||||
<QItemSection>
|
||||
<VnSelect
|
||||
outlined
|
||||
dense
|
||||
filled
|
||||
rounded
|
||||
:label="t('globals.params.warehouseFk')"
|
||||
v-model="params.warehouseFk"
|
||||
:options="warehouses"
|
||||
|
|
@ -175,8 +188,9 @@ const getLocale = (label) => {
|
|||
<QItem>
|
||||
<QItemSection>
|
||||
<VnSelect
|
||||
outlined
|
||||
dense
|
||||
filled
|
||||
rounded
|
||||
:label="t('globals.params.countryFk')"
|
||||
v-model="params.countryFk"
|
||||
url="Countries"
|
||||
|
|
@ -186,8 +200,9 @@ const getLocale = (label) => {
|
|||
<QItem>
|
||||
<QItemSection>
|
||||
<VnSelect
|
||||
outlined
|
||||
dense
|
||||
filled
|
||||
rounded
|
||||
:label="t('globals.params.provinceFk')"
|
||||
v-model="params.provinceFk"
|
||||
url="Provinces"
|
||||
|
|
@ -197,6 +212,21 @@ const getLocale = (label) => {
|
|||
<QItem>
|
||||
<QItemSection>
|
||||
<VnSelect
|
||||
outlined
|
||||
dense
|
||||
rounded
|
||||
:label="t('globals.params.departmentFk')"
|
||||
v-model="params.department"
|
||||
option-label="name"
|
||||
option-value="name"
|
||||
url="Departments"
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnSelect
|
||||
outlined
|
||||
dense
|
||||
rounded
|
||||
:label="t('globals.params.packing')"
|
||||
|
|
|
|||
|
|
@ -449,7 +449,8 @@ 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>
|
||||
<div @click.stop.prevent>
|
||||
<div v-if="row.refFk">
|
||||
<span class="link">{{ row.refFk }}</span>
|
||||
<InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
|
||||
</div>
|
||||
|
|
@ -462,6 +463,7 @@ const openTab = (id) => useOpenURL(`#/ticket/${id}/sale`);
|
|||
>
|
||||
{{ row.state }}
|
||||
</QBadge>
|
||||
</div>
|
||||
</template>
|
||||
<template #column-isFragile="{ row }">
|
||||
<QIcon v-if="row.isFragile" name="local_bar" color="primary" size="sm">
|
||||
|
|
|
|||
|
|
@ -57,8 +57,9 @@ const getSelectedTagValues = async (tag) => {
|
|||
option-value="id"
|
||||
option-label="name"
|
||||
dense
|
||||
outlined
|
||||
class="q-mb-md"
|
||||
filled
|
||||
rounded
|
||||
:emit-value="false"
|
||||
use-input
|
||||
@update:model-value="getSelectedTagValues"
|
||||
|
|
@ -78,7 +79,8 @@ const getSelectedTagValues = async (tag) => {
|
|||
option-value="value"
|
||||
option-label="value"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
emit-value
|
||||
use-input
|
||||
:disable="!value || !selectedTag"
|
||||
|
|
@ -90,14 +92,16 @@ const getSelectedTagValues = async (tag) => {
|
|||
v-model="value.value"
|
||||
:label="t('components.itemsFilterPanel.value')"
|
||||
:disable="!value"
|
||||
is-outlined
|
||||
class="col"
|
||||
data-cy="catalogFilterValueDialogValueInput"
|
||||
/>
|
||||
<QBtn
|
||||
icon="delete"
|
||||
size="md"
|
||||
outlined
|
||||
dense
|
||||
filled
|
||||
rounded
|
||||
flat
|
||||
class="filter-icon col-2"
|
||||
@click="tagValues.splice(index, 1)"
|
||||
|
|
|
|||
|
|
@ -6,11 +6,9 @@ import filter from './OrderFilter.js';
|
|||
|
||||
<template>
|
||||
<VnCard
|
||||
:data-key="$attrs['data-key'] ?? 'Order'"
|
||||
data-key="Order"
|
||||
url="Orders"
|
||||
:filter="filter"
|
||||
:descriptor="OrderDescriptor"
|
||||
v-bind="$attrs"
|
||||
v-on="$attrs"
|
||||
/>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -221,7 +221,8 @@ function addOrder(value, field, params) {
|
|||
option-value="id"
|
||||
option-label="name"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
emit-value
|
||||
use-input
|
||||
sort-by="name ASC"
|
||||
|
|
@ -250,7 +251,8 @@ function addOrder(value, field, params) {
|
|||
v-model="orderBySelected"
|
||||
:options="orderByList"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
@update:model-value="(value) => addOrder(value, 'field', params)"
|
||||
/>
|
||||
</QItemSection>
|
||||
|
|
@ -262,7 +264,8 @@ function addOrder(value, field, params) {
|
|||
v-model="orderWaySelected"
|
||||
:options="orderWayList"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
@update:model-value="(value) => addOrder(value, 'way', params)"
|
||||
/>
|
||||
</QItemSection>
|
||||
|
|
@ -272,7 +275,8 @@ function addOrder(value, field, params) {
|
|||
<VnInput
|
||||
:label="t('components.itemsFilterPanel.value')"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
:is-clearable="false"
|
||||
v-model="searchByTag"
|
||||
@keyup.enter="(val) => onSearchByTag(val, params)"
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@ import { useRoute } from 'vue-router';
|
|||
import { useI18n } from 'vue-i18n';
|
||||
import { toCurrency, toDate } from 'src/filters';
|
||||
import { useState } from 'src/composables/useState';
|
||||
import filter from './OrderFilter.js';
|
||||
import CardDescriptor from 'components/ui/CardDescriptor.vue';
|
||||
import VnLv from 'src/components/ui/VnLv.vue';
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
import OrderCard from './OrderCard.vue';
|
||||
import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
|
||||
import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
|
||||
|
||||
const DEFAULT_ITEMS = 0;
|
||||
|
|
@ -24,14 +24,11 @@ const route = useRoute();
|
|||
const state = useState();
|
||||
const { t } = useI18n();
|
||||
const getTotalRef = ref();
|
||||
const total = ref(0);
|
||||
|
||||
const entityId = computed(() => {
|
||||
return $props.id || route.params.id;
|
||||
});
|
||||
|
||||
const orderTotal = computed(() => state.get('orderTotal') ?? 0);
|
||||
|
||||
const setData = (entity) => {
|
||||
if (!entity) return;
|
||||
getTotalRef.value && getTotalRef.value.fetch();
|
||||
|
|
@ -41,6 +38,9 @@ const setData = (entity) => {
|
|||
const getConfirmationValue = (isConfirmed) => {
|
||||
return t(isConfirmed ? 'globals.confirmed' : 'order.summary.notConfirmed');
|
||||
};
|
||||
|
||||
const orderTotal = computed(() => state.get('orderTotal') ?? 0);
|
||||
const total = ref(0);
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
|
@ -54,12 +54,12 @@ const getConfirmationValue = (isConfirmed) => {
|
|||
"
|
||||
/>
|
||||
<CardDescriptor
|
||||
v-bind="$attrs"
|
||||
:id="entityId"
|
||||
:card="OrderCard"
|
||||
ref="descriptor"
|
||||
:url="`Orders/${entityId}`"
|
||||
:filter="filter"
|
||||
title="client.name"
|
||||
@on-fetch="setData"
|
||||
module="Order"
|
||||
data-key="Order"
|
||||
>
|
||||
<template #body="{ entity }">
|
||||
<VnLv
|
||||
|
|
|
|||
|
|
@ -12,11 +12,6 @@ const $props = defineProps({
|
|||
|
||||
<template>
|
||||
<QPopupProxy>
|
||||
<OrderDescriptor
|
||||
v-if="$props.id"
|
||||
:id="$props.id"
|
||||
:summary="OrderSummary"
|
||||
data-key="OrderDescriptor"
|
||||
/>
|
||||
<OrderDescriptor v-if="$props.id" :id="$props.id" :summary="OrderSummary" />
|
||||
</QPopupProxy>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -49,7 +49,8 @@ const sourceList = ref([]);
|
|||
v-model="params.clientFk"
|
||||
lazy-rules
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
<VnSelect
|
||||
:label="t('agency')"
|
||||
|
|
@ -57,11 +58,13 @@ const sourceList = ref([]);
|
|||
:options="agencyList"
|
||||
:input-debounce="0"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
<VnSelect
|
||||
outlined
|
||||
dense
|
||||
filled
|
||||
rounded
|
||||
:label="t('globals.params.departmentFk')"
|
||||
v-model="params.departmentFk"
|
||||
option-value="id"
|
||||
|
|
@ -72,14 +75,21 @@ const sourceList = ref([]);
|
|||
v-model="params.from"
|
||||
:label="t('fromLanded')"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
<VnInputDate
|
||||
v-model="params.to"
|
||||
:label="t('toLanded')"
|
||||
dense
|
||||
outlined
|
||||
rounded
|
||||
/>
|
||||
<VnInputDate v-model="params.to" :label="t('toLanded')" dense filled />
|
||||
<VnInput
|
||||
:label="t('orderId')"
|
||||
v-model="params.orderFk"
|
||||
lazy-rules
|
||||
filled
|
||||
is-outlined
|
||||
/>
|
||||
<VnSelect
|
||||
:label="t('application')"
|
||||
|
|
@ -88,7 +98,8 @@ const sourceList = ref([]);
|
|||
option-label="value"
|
||||
option-value="value"
|
||||
dense
|
||||
filled
|
||||
outlined
|
||||
rounded
|
||||
:input-debounce="0"
|
||||
/>
|
||||
<QCheckbox
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ async function handleConfirm() {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<div class="q-pa-md">
|
||||
<CardSummary
|
||||
ref="summary"
|
||||
:url="`Orders/${entityId}/summary`"
|
||||
|
|
@ -95,13 +96,11 @@ async function handleConfirm() {
|
|||
<OrderDescriptorMenu :order="entity" />
|
||||
</template>
|
||||
<template #body="{ entity }">
|
||||
<QCard class="vn-two">
|
||||
<QCard class="vn-one">
|
||||
<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>
|
||||
|
|
@ -119,8 +118,12 @@ async function handleConfirm() {
|
|||
:label="t('globals.confirmed')"
|
||||
:value="Boolean(entity?.isConfirmed)"
|
||||
/>
|
||||
</div>
|
||||
<div class="vn-card-content">
|
||||
</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)"
|
||||
|
|
@ -154,8 +157,6 @@ async function handleConfirm() {
|
|||
: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')" />
|
||||
|
|
@ -170,7 +171,9 @@ async function handleConfirm() {
|
|||
<span class="text-h6">{{ t('globals.subtotal') }}</span>
|
||||
</template>
|
||||
<template #value>
|
||||
<span class="text-h6">{{ toCurrency(entity?.subTotal) }}</span>
|
||||
<span class="text-h6">{{
|
||||
toCurrency(entity?.subTotal)
|
||||
}}</span>
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv>
|
||||
|
|
@ -231,7 +234,9 @@ async function handleConfirm() {
|
|||
{{ toCurrency(props.row.price) }}
|
||||
</QTd>
|
||||
<QTd key="amount" :props="props">
|
||||
{{ toCurrency(props.row?.quantity * props.row?.price) }}
|
||||
{{
|
||||
toCurrency(props.row?.quantity * props.row?.price)
|
||||
}}
|
||||
</QTd>
|
||||
</QTr>
|
||||
</template>
|
||||
|
|
@ -239,6 +244,7 @@ async function handleConfirm() {
|
|||
</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,7 +3,7 @@ import { computed } from 'vue';
|
|||
import { useI18n } from 'vue-i18n';
|
||||
import { useRoute } from 'vue-router';
|
||||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
|
||||
import CardDescriptor from 'components/ui/CardDescriptor.vue';
|
||||
import VnLv from 'components/ui/VnLv.vue';
|
||||
|
||||
const props = defineProps({
|
||||
|
|
@ -21,7 +21,7 @@ const { store } = useArrayData();
|
|||
const card = computed(() => store.data);
|
||||
</script>
|
||||
<template>
|
||||
<EntityDescriptor
|
||||
<CardDescriptor
|
||||
data-key="Agency"
|
||||
:url="`Agencies/${entityId}`"
|
||||
:title="card?.name"
|
||||
|
|
@ -31,5 +31,5 @@ const card = computed(() => store.data);
|
|||
<template #body="{ entity: agency }">
|
||||
<VnLv :label="t('globals.name')" :value="agency.name" />
|
||||
</template>
|
||||
</EntityDescriptor>
|
||||
</CardDescriptor>
|
||||
</template>
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue