forked from verdnatura/salix-front
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4774-traducciones
This commit is contained in:
commit
cd1c70850e
180
CHANGELOG.md
180
CHANGELOG.md
|
|
@ -1,3 +1,183 @@
|
|||
# Version 24.40 - 2024-10-02
|
||||
|
||||
### Added 🆕
|
||||
|
||||
- chore: refs #4074 admit several acls by:jorgep
|
||||
- chore: refs #4074 drop workerCreate by:jorgep
|
||||
- chore: refs #4074 fix tests by:jorgep
|
||||
- chore: refs #4074 wip replace useRole for useAcl by:jorgep
|
||||
- chore: refs #7155 remove console.log by:alexm
|
||||
- chore: refs #7155 typo by:alexm
|
||||
- chore: refs #7663 add test by:jorgep
|
||||
- chore: refs #7663 create test wip by:jorgep
|
||||
- chore: refs #7663 drop useless code (origin/7663-setWeight) by:jorgep
|
||||
- chore: refs #7828 fix e2e by:jorgep
|
||||
- feat(AccountBasicData): add twoFactorFk by:alexm
|
||||
- feat: add max rule by:Javier Segarra
|
||||
- feat: add shortcut add event in some subSections by:Javier Segarra
|
||||
- feat: add shortcut more buttons (origin/add_shortcut_add_subSections) by:Javier Segarra
|
||||
- feat: add tooltip CustomerNewCustomAgent by:Javier Segarra
|
||||
- feat: apply color when today by:Javier Segarra
|
||||
- feat: change label because its more natural by:Javier Segarra
|
||||
- feat: change order by:Javier Segarra
|
||||
- feat: change QBadge color by:Javier Segarra
|
||||
- feat: change url CustomerList by:Javier Segarra
|
||||
- feat: copy customer countryFk by:Javier Segarra
|
||||
- feat: create VnSelectEnum and add in AccountBasicData and ClaimBasicData by:alexm
|
||||
- feat: CustomerBalance by:Javier Segarra
|
||||
- feat: CustomerConsumptionFilter by:Javier Segarra
|
||||
- feat: customer consumption (origin/7830-customerDesplegables, 7830-customerDesplegables) by:alexm
|
||||
- feat: CustomerCreateTicket by:Javier Segarra
|
||||
- feat: CustomerCredit section by:Javier Segarra
|
||||
- feat: CustomerGreuges by:Javier Segarra
|
||||
- feat: CustomerSample to VnTable by:Javier Segarra
|
||||
- feat: global handler (origin/fix_global_handler, fix_global_handler) by:alexm
|
||||
- feat: goToSupplier by:Javier Segarra
|
||||
- feat: handle newValue by:Javier Segarra
|
||||
- feat: handle same multiple CP by:Javier Segarra
|
||||
- feat: hide menus on small view (origin/hideMenu) by:jorgep
|
||||
- feat: minor changes by:Javier Segarra
|
||||
- feat: orderCreateDialog by:Javier Segarra
|
||||
- feat: refs #4074 drop useless code by:jorgep
|
||||
- feat: refs #4074 useAcl in vnSelectDialog by:jorgep
|
||||
- feat: refs #6346 new wagon type section by:Jon
|
||||
- feat: refs #7404 add m3 and fix detail by:pablone
|
||||
- feat: refs #7404 add some style to the form and reorganize fields by:pablone
|
||||
- feat: refs #7404 add travel m3 to reserves form by:pablone
|
||||
- feat: refs #7404 style dynamic text color by:pablone
|
||||
- feat: refs #7404 travel m3 form by:pablone
|
||||
- feat: refs #7500 added VnImg to show files by:Jon
|
||||
- feat: refs #7663 add setWeight menu opt (wip) by:jorgep
|
||||
- feat: refs #7663 fine tunning by:jorgep
|
||||
- feat: refs #7828 create axios instance which no manage errors (origin/7828-makeCorrectCalls) by:jorgep
|
||||
- feat: refs #7828 useAcl & cherry pick mail data worker by:jorgep
|
||||
- feat: remove cli warnings by:Javier Segarra
|
||||
- feat: show preparation field by:Javier Segarra
|
||||
- feat: stateGroupedFilter by:Javier Segarra
|
||||
- feat: translations fixed by:jgallego
|
||||
- feat(TravelList): add daysOnward by:alexm
|
||||
- feat: travel m3 by:pablone
|
||||
- feat: use disableInifiniteScroll property by:Javier Segarra
|
||||
- feat: VnImg draggable by:Javier Segarra
|
||||
- feat: vnLocation changes by:Javier Segarra
|
||||
- feat: vnSelect exprBuilder by:Javier Segarra
|
||||
- fix: refs #7404 remove some style by:pablone
|
||||
- fix: refs #7404 style non center pop up (origin/7404-fixFront) by:pablone
|
||||
- fix: refs #7404 translates and some minor style fixes by:pablone
|
||||
- fix: styles by:Javier Segarra
|
||||
- perf: improve style by:Javier Segarra
|
||||
|
||||
### Changed 📦
|
||||
|
||||
- perf: CustomerBalance by:Javier Segarra
|
||||
- perf: CustomerBasicData by:Javier Segarra
|
||||
- perf: CustomerBasicData.salesPersonFk by:Javier Segarra
|
||||
- perf: CustomerSummary by:Javier Segarra
|
||||
- perf: customerSummaryTable by:Javier Segarra
|
||||
- perf: disable card option by:Javier Segarra
|
||||
- perf: i18n by:Javier Segarra
|
||||
- perf: improve by:Javier Segarra
|
||||
- perf: improve style by:Javier Segarra
|
||||
- perf: imrpove exprBuilder by:Javier Segarra
|
||||
- perf: minor comments by:Javier Segarra
|
||||
- perf: refs #6346 previous changes by:Jon
|
||||
- perf: sendEmail customerConsumption by:Javier Segarra
|
||||
- perf: solve reload CardSummary component by:Javier Segarra
|
||||
- perf: update CustommerDescriptor by:Javier Segarra
|
||||
- refactor: refs #4074 accept array by:jorgep
|
||||
- refactor: refs #4074 rollback by:jorgep
|
||||
- refactor: refs #4074 use acl & drop useless roles by:jorgep
|
||||
- refactor: refs #4074 useAcl in navigationStore & router by:jorgep
|
||||
- refactor: refs #4074 use fn (origin/4074-useAcls) by:jorgep
|
||||
- refactor: refs #4074 use VnTitle by:jorgep
|
||||
- refactor: refs #6346 deleted front error checking by:Jon
|
||||
- refactor: refs #6346 requested changes by:Jon
|
||||
- refactor: refs #6346 wagons to VnTable by:Jon
|
||||
- refactor: refs #7500 deleted useless code by:Jon
|
||||
- refactor: refs #7500 refactor vnimg when storage is dms by:Jon
|
||||
- refactor: refs #7828 wip by:jorgep
|
||||
|
||||
### Fixed 🛠️
|
||||
|
||||
- chore: refs #4074 fix tests by:jorgep
|
||||
- chore: refs #7828 fix e2e by:jorgep
|
||||
- feat: refs #7404 add m3 and fix detail by:pablone
|
||||
- feat: translations fixed by:jgallego
|
||||
- fix: #5938 grouped filter by:Javier Segarra
|
||||
- fix: #6943 fix customerSummaryTable by:Javier Segarra
|
||||
- fix: #6943 show nickname salesPerson by:Javier Segarra
|
||||
- fix: address-create i18n by:Javier Segarra
|
||||
- fix: comments (origin/6943_fix_customer_module, 6943_fix_customer_module) by:Javier Segarra
|
||||
- fix: CusomerSummary to Address by:Javier Segarra
|
||||
- fix: CustomerAddress mobile by:Javier Segarra
|
||||
- fix: CustomerBillingData by:Javier Segarra
|
||||
- fix: Customerconsumption by:Javier Segarra
|
||||
- fix: customer credit opinion by:alexm
|
||||
- fix: CustomerCreditOpinion workerDescriptor by:Javier Segarra
|
||||
- fix: CustomerDescriptorAccount by:Javier Segarra
|
||||
- fix: CustomerDescriptor.bussinessTypeFk by:Javier Segarra
|
||||
- fix: CustomerFilter by:Javier Segarra
|
||||
- fix: CustomerGreuges by:Javier Segarra
|
||||
- fix: CustomerMandates by:Javier Segarra
|
||||
- fix: Customer module find salesPersons out of first get by:Javier Segarra
|
||||
- fix: CustomerRecovery transalate label by:Javier Segarra
|
||||
- fix: CustomerSamples by:Javier Segarra
|
||||
- fix: customerSummaryToTicketList button by:Javier Segarra
|
||||
- fix: CustomerWebPayment by:Javier Segarra
|
||||
- fix: CustommerSummaryTable Proxy by:Javier Segarra
|
||||
- fix: deleted code by:Jon
|
||||
- fix: duplicate code by:alexm
|
||||
- fix: emit:updateModelValue by:Javier Segarra
|
||||
- fix: fixed wagon tests by:Jon
|
||||
- fix: fix wagon list reload by:Jon
|
||||
- fix: i18n en preparation label by:Javier Segarra
|
||||
- fix: infiniteScroll by:Javier Segarra
|
||||
- fix: isFullMovable checkbox by:Javier Segarra
|
||||
- fix: merge conflicts by:Javier Segarra
|
||||
- fix: merge in dev by:alexm
|
||||
- fix: missing code by:Jon
|
||||
- fix: Options VnSelect properties by:Javier Segarra
|
||||
- fix: refs #4074 await to watch by:jorgep
|
||||
- fix: refs #4074 drop wrong acl by:jorgep
|
||||
- fix: refs #4074 workerCard data-key by:jorgep
|
||||
- fix: refs #6346 fix list and create by:pablone
|
||||
- fix: refs #6943 prevent null (origin/6943-warmfix-preventNull) by:jorgep
|
||||
- fix: refs #7155 remove userParams in watcher (7155-travel_daysOnward) by:alexm
|
||||
- fix: refs #7155 use chip-locale (origin/7155-travel_daysOnward_2, 7155-travel_daysOnward_2) by:alexm
|
||||
- fix: refs #7404 remove console.log by:pablone
|
||||
- fix: refs #7404 remove from test by:pablone
|
||||
- fix: refs #7404 remove some style by:pablone
|
||||
- fix: refs #7404 revert commit prevent production access by:pablone
|
||||
- fix: refs #7404 style non center pop up (origin/7404-fixFront) by:pablone
|
||||
- fix: refs #7404 translates and some minor style fixes by:pablone
|
||||
- fix: refs #7500 fixed e2e test by:Jon
|
||||
- fix: refs #7500 fixed showing images wrongly by:Jon
|
||||
- fix: refs #7830 customer credit by:pablone
|
||||
- fix: refs #7830 remove console.log by:pablone
|
||||
- fix: remove console.log by:pablone
|
||||
- fix: remove FetchData by:Javier Segarra
|
||||
- fix: remove FIXME (origin/6943_fix_customerSummaryTable) by:Javier Segarra
|
||||
- fix: remove print variable by:Javier Segarra
|
||||
- fix: remove promise execution by:Javier Segarra
|
||||
- fix: reset VnTable scroll properties by:Javier Segarra
|
||||
- fix: rule by:Javier Segarra
|
||||
- fix: solve conflicts from master to test by:Javier Segarra
|
||||
- fix: split params (origin/warmfix-addSearchUrl) by:jorgep
|
||||
- fix: state cell by:Javier Segarra
|
||||
- fix: stop call back event hasMoreData by:Javier Segarra
|
||||
- fix: styles by:Javier Segarra
|
||||
- fix: SupplierFiscalData VnLocation (origin/fix_supplierFD_location) by:Javier Segarra
|
||||
- fix: VnLocation test by:Javier Segarra
|
||||
- fix(VnTable): header background-color by:alexm
|
||||
- fix(VnTable): sanitizer value is defined by:carlossa
|
||||
- fix: wagon reload (origin/FixWagonRedirect) by:Jon
|
||||
- fix: workerDms filter workerFk by:alexm
|
||||
- fix(WorkerList): add type email by:alexm
|
||||
- Merge remote-tracking branch 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable by:Javier Segarra
|
||||
- refs #7155 scopeDays fix (origin/7155-scopeDays) by:carlossa
|
||||
- revert: vnUSerLink change by:Javier Segarra
|
||||
- test: fix test (7677_vnLocation_perf) by:Javier Segarra
|
||||
|
||||
# Version 24.38 - 2024-09-17
|
||||
|
||||
### Added 🆕
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "salix-front",
|
||||
"version": "24.42.0",
|
||||
"version": "24.44.0",
|
||||
"description": "Salix frontend",
|
||||
"productName": "Salix",
|
||||
"author": "Verdnatura",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
import { QInput } from 'quasar';
|
||||
import setDefault from './setDefault';
|
||||
|
||||
setDefault(QInput, 'dense', true);
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
import { QSelect } from 'quasar';
|
||||
import setDefault from './setDefault';
|
||||
|
||||
setDefault(QSelect, 'dense', true);
|
||||
|
|
@ -1 +1,3 @@
|
|||
export * from './defaults/qTable';
|
||||
export * from './defaults/qInput';
|
||||
export * from './defaults/qSelect';
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@ const countriesFilter = {
|
|||
|
||||
const countriesOptions = ref([]);
|
||||
|
||||
const onDataSaved = (formData, requestResponse) => {
|
||||
emit('onDataSaved', formData, requestResponse);
|
||||
const onDataSaved = (...args) => {
|
||||
emit('onDataSaved', ...args);
|
||||
};
|
||||
|
||||
onMounted(async () => {
|
||||
|
|
|
|||
|
|
@ -317,7 +317,7 @@ defineExpose({
|
|||
params,
|
||||
});
|
||||
|
||||
function handleOnDataSaved(_, res) {
|
||||
function handleOnDataSaved(_) {
|
||||
if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
|
||||
else $props.create.onDataSaved(_);
|
||||
}
|
||||
|
|
@ -497,6 +497,7 @@ function handleOnDataSaved(_, res) {
|
|||
auto-width
|
||||
class="no-margin q-px-xs"
|
||||
:class="[getColAlign(col), col.columnClass]"
|
||||
:style="col.style"
|
||||
v-if="col.visible ?? true"
|
||||
@click.ctrl="
|
||||
($event) =>
|
||||
|
|
@ -525,6 +526,7 @@ function handleOnDataSaved(_, res) {
|
|||
:class="getColAlign(col)"
|
||||
class="sticky no-padding"
|
||||
@click="stopEventPropagation($event)"
|
||||
:style="col.style"
|
||||
>
|
||||
<QBtn
|
||||
v-for="(btn, index) of col.actions"
|
||||
|
|
@ -710,7 +712,7 @@ function handleOnDataSaved(_, res) {
|
|||
icon="add"
|
||||
shortcut="+"
|
||||
/>
|
||||
<QTooltip>
|
||||
<QTooltip self="top right">
|
||||
{{ createForm?.title }}
|
||||
</QTooltip>
|
||||
</QPageSticky>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
<script setup>
|
||||
const model = defineModel({ type: [String, Number], required: true });
|
||||
</script>
|
||||
<template>
|
||||
<QDate v-model="model" :today-btn="true" :options="$attrs.options" />
|
||||
</template>
|
||||
<style lang="scss" scoped>
|
||||
.q-date {
|
||||
width: 245px;
|
||||
min-width: unset;
|
||||
|
||||
:deep(.q-date__calendar) {
|
||||
padding-bottom: 0;
|
||||
}
|
||||
:deep(.q-date__view) {
|
||||
min-height: 245px;
|
||||
padding: 8px;
|
||||
}
|
||||
:deep(.q-date__calendar-days-container) {
|
||||
min-height: 160px;
|
||||
height: unset;
|
||||
}
|
||||
|
||||
:deep(.q-date__header) {
|
||||
padding: 2px 2px 5px 12px;
|
||||
height: 60px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -130,24 +130,4 @@ const mixinRules = [
|
|||
.q-field__append {
|
||||
padding-inline: 0;
|
||||
}
|
||||
|
||||
.q-field__append.q-field__marginal.row.no-wrap.items-center.row {
|
||||
height: 20px;
|
||||
}
|
||||
.q-field--outlined .q-field__append.q-field__marginal.row.no-wrap.items-center.row {
|
||||
height: auto;
|
||||
}
|
||||
.q-field__control {
|
||||
height: unset;
|
||||
}
|
||||
|
||||
.q-field--labeled {
|
||||
.q-field__native,
|
||||
.q-field__prefix,
|
||||
.q-field__suffix,
|
||||
.q-field__input {
|
||||
padding-bottom: 0;
|
||||
min-height: 15px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ import { onMounted, watch, computed, ref } from 'vue';
|
|||
import { date } from 'quasar';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useAttrs } from 'vue';
|
||||
import VnDate from './VnDate.vue';
|
||||
|
||||
const model = defineModel({ type: [String, Date] });
|
||||
const $props = defineProps({
|
||||
|
|
@ -87,6 +88,11 @@ const styleAttrs = computed(() => {
|
|||
}
|
||||
: {};
|
||||
});
|
||||
|
||||
const manageDate = (date) => {
|
||||
formattedDate.value = date;
|
||||
isPopupOpen.value = false;
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
|
@ -129,6 +135,7 @@ const styleAttrs = computed(() => {
|
|||
/>
|
||||
</template>
|
||||
<QMenu
|
||||
v-if="$q.screen.gt.xs"
|
||||
transition-show="scale"
|
||||
transition-hide="scale"
|
||||
v-model="isPopupOpen"
|
||||
|
|
@ -137,19 +144,11 @@ const styleAttrs = computed(() => {
|
|||
:no-focus="true"
|
||||
:no-parent-event="true"
|
||||
>
|
||||
<QDate
|
||||
v-model="popupDate"
|
||||
:landscape="true"
|
||||
:today-btn="true"
|
||||
:options="$attrs.options"
|
||||
@update:model-value="
|
||||
(date) => {
|
||||
formattedDate = date;
|
||||
isPopupOpen = false;
|
||||
}
|
||||
"
|
||||
/>
|
||||
<VnDate v-model="popupDate" @update:model-value="manageDate" />
|
||||
</QMenu>
|
||||
<QDialog v-else v-model="isPopupOpen">
|
||||
<VnDate v-model="popupDate" @update:model-value="manageDate" />
|
||||
</QDialog>
|
||||
</QInput>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ import { computed, ref, useAttrs } from 'vue';
|
|||
import { useI18n } from 'vue-i18n';
|
||||
import { date } from 'quasar';
|
||||
import { useValidator } from 'src/composables/useValidator';
|
||||
import VnTime from './VnTime.vue';
|
||||
|
||||
const { validations } = useValidator();
|
||||
const $attrs = useAttrs();
|
||||
const model = defineModel({ type: String });
|
||||
|
|
@ -107,6 +109,7 @@ function dateToTime(newDate) {
|
|||
/>
|
||||
</template>
|
||||
<QMenu
|
||||
v-if="$q.screen.gt.xs"
|
||||
transition-show="scale"
|
||||
transition-hide="scale"
|
||||
v-model="isPopupOpen"
|
||||
|
|
@ -115,8 +118,11 @@ function dateToTime(newDate) {
|
|||
:no-focus="true"
|
||||
:no-parent-event="true"
|
||||
>
|
||||
<QTime v-model="formattedTime" mask="HH:mm" landscape now-btn />
|
||||
<VnTime v-model="formattedTime" />
|
||||
</QMenu>
|
||||
<QDialog v-else v-model="isPopupOpen">
|
||||
<VnTime v-model="formattedTime" />
|
||||
</QDialog>
|
||||
</QInput>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -227,6 +227,8 @@ function nullishToTrue(value) {
|
|||
}
|
||||
|
||||
const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
|
||||
|
||||
defineExpose({ opts: myOptions });
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
|
@ -283,15 +285,4 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
|
|||
.q-field--outlined {
|
||||
max-width: 100%;
|
||||
}
|
||||
.q-field__inner {
|
||||
.q-field__control {
|
||||
min-height: auto !important;
|
||||
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
.q-field__native.row {
|
||||
min-height: auto !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
<script setup>
|
||||
const model = defineModel({ type: [String, Number], required: true });
|
||||
</script>
|
||||
<template>
|
||||
<QTime v-model="model" now-btn mask="HH:mm" />
|
||||
</template>
|
||||
<style lang="scss" scoped>
|
||||
.q-time {
|
||||
width: 230px;
|
||||
min-width: unset;
|
||||
:deep(.q-time__header) {
|
||||
min-height: unset;
|
||||
height: 50px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -31,7 +31,7 @@ const dialog = ref(null);
|
|||
<div class="container order-catalog-item overflow-hidden">
|
||||
<QCard class="card shadow-6">
|
||||
<div class="img-wrapper">
|
||||
<VnImg :id="item.id" class="image" />
|
||||
<VnImg :id="item.id" class="image" zoom-resolution="1600x900" />
|
||||
<div v-if="item.hex && isCatalog" class="item-color-container">
|
||||
<div
|
||||
class="item-color"
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ defineExpose({
|
|||
:class="{ zoomIn: zoom }"
|
||||
:src="getUrl()"
|
||||
v-bind="$attrs"
|
||||
@click.stop="show = $props.zoom ? true : false"
|
||||
@click.stop="show = $props.zoom"
|
||||
spinner-color="primary"
|
||||
/>
|
||||
<QDialog v-if="$props.zoom" v-model="show">
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<script setup>
|
||||
import axios from 'axios';
|
||||
import { ref } from 'vue';
|
||||
import { ref, reactive } from 'vue';
|
||||
import { onBeforeRouteLeave } from 'vue-router';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useQuasar } from 'quasar';
|
||||
|
|
@ -12,36 +12,40 @@ import VnPaginate from 'components/ui/VnPaginate.vue';
|
|||
import VnUserLink from 'components/ui/VnUserLink.vue';
|
||||
import VnConfirm from 'components/ui/VnConfirm.vue';
|
||||
import VnAvatar from 'components/ui/VnAvatar.vue';
|
||||
import VnRow from 'components/ui/VnRow.vue';
|
||||
import VnSelect from 'components/common/VnSelect.vue';
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
import VnInput from 'components/common/VnInput.vue';
|
||||
|
||||
const $props = defineProps({
|
||||
url: { type: String, default: null },
|
||||
filter: { type: Object, default: () => {} },
|
||||
body: { type: Object, default: () => {} },
|
||||
addNote: { type: Boolean, default: false },
|
||||
selectType: { type: Boolean, default: false },
|
||||
});
|
||||
|
||||
const { t } = useI18n();
|
||||
const state = useState();
|
||||
const quasar = useQuasar();
|
||||
const currentUser = ref(state.getUser());
|
||||
const newNote = ref('');
|
||||
const newNote = reactive({ text: null, observationTypeFk: null });
|
||||
const observationTypes = ref([]);
|
||||
const vnPaginateRef = ref();
|
||||
function handleKeyUp(event) {
|
||||
if (event.key === 'Enter') {
|
||||
event.preventDefault();
|
||||
if (!event.shiftKey) insert();
|
||||
}
|
||||
}
|
||||
|
||||
async function insert() {
|
||||
if (!newNote.text || ($props.selectType && !newNote.observationTypeFk)) return;
|
||||
|
||||
const body = $props.body;
|
||||
const newBody = { ...body, ...{ text: newNote.value } };
|
||||
const newBody = {
|
||||
...body,
|
||||
...{ text: newNote.text, observationTypeFk: newNote.observationTypeFk },
|
||||
};
|
||||
await axios.post($props.url, newBody);
|
||||
await vnPaginateRef.value.fetch();
|
||||
newNote.value = '';
|
||||
}
|
||||
|
||||
onBeforeRouteLeave((to, from, next) => {
|
||||
if (newNote.value)
|
||||
if (newNote.text)
|
||||
quasar.dialog({
|
||||
component: VnConfirm,
|
||||
componentProps: {
|
||||
|
|
@ -54,6 +58,13 @@ onBeforeRouteLeave((to, from, next) => {
|
|||
});
|
||||
</script>
|
||||
<template>
|
||||
<FetchData
|
||||
v-if="selectType"
|
||||
url="ObservationTypes"
|
||||
:filter="{ fields: ['id', 'description'] }"
|
||||
auto-load
|
||||
@on-fetch="(data) => (observationTypes = data)"
|
||||
/>
|
||||
<QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">
|
||||
<QCardSection horizontal>
|
||||
<VnAvatar :worker-id="currentUser.id" size="md" />
|
||||
|
|
@ -62,29 +73,42 @@ onBeforeRouteLeave((to, from, next) => {
|
|||
{{ t('globals.now') }}
|
||||
</div>
|
||||
</QCardSection>
|
||||
<QCardSection class="q-pa-xs q-my-none q-py-none" horizontal>
|
||||
<QInput
|
||||
v-model="newNote"
|
||||
class="full-width"
|
||||
type="textarea"
|
||||
:label="t('Add note here...')"
|
||||
filled
|
||||
size="lg"
|
||||
autogrow
|
||||
autofocus
|
||||
@keyup="handleKeyUp"
|
||||
clearable
|
||||
>
|
||||
<template #append>
|
||||
<QBtn
|
||||
:title="t('Save (Enter)')"
|
||||
icon="save"
|
||||
color="primary"
|
||||
flat
|
||||
@click="insert"
|
||||
/>
|
||||
</template>
|
||||
</QInput>
|
||||
<QCardSection class="q-px-xs q-my-none q-py-none">
|
||||
<VnRow class="full-width">
|
||||
<VnSelect
|
||||
:label="t('Observation type')"
|
||||
v-if="selectType"
|
||||
url="ObservationTypes"
|
||||
v-model="newNote.observationTypeFk"
|
||||
option-label="description"
|
||||
style="flex: 0.15"
|
||||
:required="true"
|
||||
@keyup.enter.stop="insert"
|
||||
/>
|
||||
<VnInput
|
||||
v-model.trim="newNote.text"
|
||||
type="textarea"
|
||||
:label="t('Add note here...')"
|
||||
filled
|
||||
size="lg"
|
||||
autogrow
|
||||
@keyup.enter.stop="insert"
|
||||
clearable
|
||||
:required="true"
|
||||
>
|
||||
<template #append>
|
||||
<QBtn
|
||||
:title="t('Save (Enter)')"
|
||||
icon="save"
|
||||
color="primary"
|
||||
flat
|
||||
@click="insert"
|
||||
class="q-mb-xs"
|
||||
dense
|
||||
/>
|
||||
</template>
|
||||
</VnInput>
|
||||
</VnRow>
|
||||
</QCardSection>
|
||||
</QCard>
|
||||
<VnPaginate
|
||||
|
|
@ -98,6 +122,10 @@ onBeforeRouteLeave((to, from, next) => {
|
|||
class="show"
|
||||
v-bind="$attrs"
|
||||
search-url="notes"
|
||||
@on-fetch="
|
||||
newNote.text = '';
|
||||
newNote.observationTypeFk = null;
|
||||
"
|
||||
>
|
||||
<template #body="{ rows }">
|
||||
<TransitionGroup name="list" tag="div" class="column items-center full-width">
|
||||
|
|
@ -111,13 +139,28 @@ onBeforeRouteLeave((to, from, next) => {
|
|||
:descriptor="false"
|
||||
:worker-id="note.workerFk"
|
||||
size="md"
|
||||
:title="note.worker?.user.nickname"
|
||||
/>
|
||||
<div class="full-width row justify-between q-pa-xs">
|
||||
<VnUserLink
|
||||
:name="`${note.worker.user.nickname}`"
|
||||
:worker-id="note.worker.id"
|
||||
/>
|
||||
{{ toDateHourMin(note.created) }}
|
||||
<div>
|
||||
<VnUserLink
|
||||
:name="`${note.worker.user.nickname}`"
|
||||
:worker-id="note.worker.id"
|
||||
/>
|
||||
<QBadge
|
||||
class="q-ml-xs"
|
||||
outline
|
||||
color="grey"
|
||||
v-if="selectType && note.observationTypeFk"
|
||||
>
|
||||
{{
|
||||
observationTypes.find(
|
||||
(ot) => ot.id === note.observationTypeFk
|
||||
)?.description
|
||||
}}
|
||||
</QBadge>
|
||||
</div>
|
||||
<span v-text="toDateHourMin(note.created)" />
|
||||
</div>
|
||||
</QCardSection>
|
||||
<QCardSection class="q-pa-xs q-my-none q-py-none">
|
||||
|
|
@ -131,12 +174,6 @@ onBeforeRouteLeave((to, from, next) => {
|
|||
<style lang="scss" scoped>
|
||||
.q-card {
|
||||
width: 90%;
|
||||
@media (max-width: $breakpoint-sm) {
|
||||
width: 100%;
|
||||
}
|
||||
&__section {
|
||||
word-wrap: break-word;
|
||||
}
|
||||
}
|
||||
.q-dialog .q-card {
|
||||
width: 400px;
|
||||
|
|
@ -150,11 +187,28 @@ onBeforeRouteLeave((to, from, next) => {
|
|||
opacity: 0;
|
||||
background-color: $primary;
|
||||
}
|
||||
|
||||
.vn-row > :nth-child(2) {
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
@media (max-width: $breakpoint-xs) {
|
||||
.vn-row > :deep(*) {
|
||||
margin-left: 0;
|
||||
}
|
||||
.q-card {
|
||||
width: 100%;
|
||||
|
||||
&__section {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<i18n>
|
||||
es:
|
||||
Add note here...: Añadir nota aquí...
|
||||
New note: Nueva nota
|
||||
Save (Enter): Guardar (Intro)
|
||||
|
||||
Observation type: Tipo de observación
|
||||
</i18n>
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ const props = defineProps({
|
|||
},
|
||||
offset: {
|
||||
type: Number,
|
||||
default: 0,
|
||||
default: undefined,
|
||||
},
|
||||
skeleton: {
|
||||
type: Boolean,
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ defineProps({ wrap: { type: Boolean, default: false } });
|
|||
<style lang="scss" scoped>
|
||||
.vn-row {
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
> :deep(*) {
|
||||
flex: 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
|
|||
for (const row of response.data) store.data.push(row);
|
||||
} else {
|
||||
store.data = response.data;
|
||||
if (!document.querySelectorAll('[role="dialog"]').length)
|
||||
if (!document.querySelectorAll('[role="dialog"][aria-modal="true"]').length)
|
||||
updateRouter && updateStateParams();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -288,14 +288,3 @@ input::-webkit-inner-spin-button {
|
|||
color: $info;
|
||||
}
|
||||
}
|
||||
.q-field__inner {
|
||||
.q-field__control {
|
||||
min-height: auto !important;
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
padding-bottom: 2px;
|
||||
.q-field__native.row {
|
||||
min-height: auto !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -105,6 +105,7 @@ globals:
|
|||
campaign: Campaign
|
||||
weight: Weight
|
||||
error: Ups! Something went wrong
|
||||
recalc: Recalculate
|
||||
pageTitles:
|
||||
logIn: Login
|
||||
addressEdit: Update address
|
||||
|
|
@ -275,6 +276,7 @@ globals:
|
|||
serial: Serial
|
||||
medical: Mutual
|
||||
RouteExtendedList: Router
|
||||
wasteRecalc: Waste recaclulate
|
||||
supplier: Supplier
|
||||
created: Created
|
||||
worker: Worker
|
||||
|
|
@ -293,6 +295,7 @@ globals:
|
|||
maxTemperature: Max
|
||||
minTemperature: Min
|
||||
params:
|
||||
id: ID
|
||||
clientFk: Client id
|
||||
salesPersonFk: Sales person
|
||||
warehouseFk: Warehouse
|
||||
|
|
@ -300,7 +303,12 @@ globals:
|
|||
from: From
|
||||
To: To
|
||||
stateFk: State
|
||||
departmentFk: Department
|
||||
email: Email
|
||||
SSN: SSN
|
||||
fi: FI
|
||||
changePass: Change password
|
||||
deleteConfirmTitle: Delete selected elements
|
||||
errors:
|
||||
statusUnauthorized: Access denied
|
||||
statusInternalServerError: An internal server error has ocurred
|
||||
|
|
@ -807,14 +815,14 @@ worker:
|
|||
bankEntity: Swift / BIC
|
||||
formation:
|
||||
tableVisibleColumns:
|
||||
course: Curso
|
||||
startDate: Fecha Inicio
|
||||
endDate: Fecha Fin
|
||||
center: Centro Formación
|
||||
invoice: Factura
|
||||
amount: Importe
|
||||
remark: Bonficado
|
||||
hasDiploma: Diploma
|
||||
course: Course
|
||||
startDate: Start date
|
||||
endDate: End date
|
||||
center: Training center
|
||||
invoice: Invoice
|
||||
amount: Amount
|
||||
remark: Remark
|
||||
hasDiploma: Has diploma
|
||||
medical:
|
||||
tableVisibleColumns:
|
||||
date: Date
|
||||
|
|
|
|||
|
|
@ -107,6 +107,7 @@ globals:
|
|||
campaign: Campaña
|
||||
weight: Peso
|
||||
error: ¡Ups! Algo salió mal
|
||||
recalc: Recalcular
|
||||
pageTitles:
|
||||
logIn: Inicio de sesión
|
||||
addressEdit: Modificar consignatario
|
||||
|
|
@ -279,6 +280,7 @@ globals:
|
|||
clientsActionsMonitor: Clientes y acciones
|
||||
serial: Facturas por serie
|
||||
medical: Mutua
|
||||
wasteRecalc: Recalcular mermas
|
||||
supplier: Proveedor
|
||||
created: Fecha creación
|
||||
worker: Trabajador
|
||||
|
|
@ -297,6 +299,7 @@ globals:
|
|||
maxTemperature: Máx
|
||||
minTemperature: Mín
|
||||
params:
|
||||
id: Id
|
||||
clientFk: Id cliente
|
||||
salesPersonFk: Comercial
|
||||
warehouseFk: Almacén
|
||||
|
|
@ -304,7 +307,12 @@ globals:
|
|||
from: Desde
|
||||
To: Hasta
|
||||
stateFk: Estado
|
||||
departmentFk: Departamento
|
||||
email: Correo
|
||||
SSN: NSS
|
||||
fi: NIF
|
||||
changePass: Cambiar contraseña
|
||||
deleteConfirmTitle: Eliminar los elementos seleccionados
|
||||
errors:
|
||||
statusUnauthorized: Acceso denegado
|
||||
statusInternalServerError: Ha ocurrido un error interno del servidor
|
||||
|
|
|
|||
|
|
@ -5,7 +5,8 @@ import VnTable from 'components/VnTable/VnTable.vue';
|
|||
import VnSearchbar from 'components/ui/VnSearchbar.vue';
|
||||
import AccountSummary from './Card/AccountSummary.vue';
|
||||
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
|
||||
|
||||
import AccountFilter from './AccountFilter.vue';
|
||||
import RightMenu from 'src/components/common/RightMenu.vue';
|
||||
const { t } = useI18n();
|
||||
const { viewSummary } = useSummaryDialog();
|
||||
const tableRef = ref();
|
||||
|
|
@ -20,14 +21,6 @@ const columns = computed(() => [
|
|||
isId: true,
|
||||
field: 'id',
|
||||
cardVisible: true,
|
||||
columnFilter: {
|
||||
component: 'select',
|
||||
name: 'search',
|
||||
attrs: {
|
||||
url: 'VnUsers/preview',
|
||||
fields: ['id', 'name'],
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
align: 'left',
|
||||
|
|
@ -53,9 +46,6 @@ const columns = computed(() => [
|
|||
columnField: {
|
||||
component: null,
|
||||
},
|
||||
columnFilter: {
|
||||
inWhere: true,
|
||||
},
|
||||
cardVisible: true,
|
||||
create: true,
|
||||
},
|
||||
|
|
@ -67,9 +57,6 @@ const columns = computed(() => [
|
|||
columnField: {
|
||||
component: null,
|
||||
},
|
||||
columnFilter: {
|
||||
inWhere: true,
|
||||
},
|
||||
cardVisible: true,
|
||||
create: true,
|
||||
},
|
||||
|
|
@ -123,6 +110,11 @@ const exprBuilder = (param, value) => {
|
|||
:info="t('account.searchInfo')"
|
||||
:filter="filter"
|
||||
/>
|
||||
<RightMenu>
|
||||
<template #right-panel>
|
||||
<AccountFilter data-key="AccountUsers" />
|
||||
</template>
|
||||
</RightMenu>
|
||||
<VnTable
|
||||
ref="tableRef"
|
||||
data-key="AccountUsers"
|
||||
|
|
@ -133,6 +125,8 @@ const exprBuilder = (param, value) => {
|
|||
default-mode="table"
|
||||
redirect="account"
|
||||
:use-model="true"
|
||||
:right-search="false"
|
||||
auto-load
|
||||
/>
|
||||
</template>
|
||||
|
||||
|
|
|
|||
|
|
@ -10,10 +10,7 @@ const { t } = useI18n();
|
|||
<VnCard
|
||||
data-key="Account"
|
||||
:descriptor="AccountDescriptor"
|
||||
search-data-key="AccountUsers"
|
||||
:filter="{
|
||||
include: { relation: 'role', scope: { fields: ['id', 'name'] } },
|
||||
}"
|
||||
search-data-key="AccountList"
|
||||
:searchbar-props="{
|
||||
url: 'VnUsers/preview',
|
||||
label: t('account.search'),
|
||||
|
|
|
|||
|
|
@ -22,5 +22,6 @@ const noteFilter = computed(() => {
|
|||
:filter="noteFilter"
|
||||
:body="{ clientFk: route.params.id }"
|
||||
style="overflow-y: auto"
|
||||
:select-type="true"
|
||||
/>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -25,19 +25,31 @@ const { notify } = useNotify();
|
|||
const { t } = useI18n();
|
||||
|
||||
const newObservation = ref(null);
|
||||
const obsId = ref(null);
|
||||
|
||||
const onSubmit = async () => {
|
||||
try {
|
||||
const data = $props.clients.map((item) => {
|
||||
return { clientFk: item.clientFk, text: newObservation.value };
|
||||
});
|
||||
await axios.post('ClientObservations', data);
|
||||
if (!obsId.value)
|
||||
obsId.value = (
|
||||
await axios.get('ObservationTypes/findOne', {
|
||||
params: { filter: { where: { description: 'Finance' } } },
|
||||
})
|
||||
).data?.id;
|
||||
|
||||
const payload = {
|
||||
const bodyObs = $props.clients.map((item) => {
|
||||
return {
|
||||
clientFk: item.clientFk,
|
||||
text: newObservation.value,
|
||||
observationTypeFk: obsId.value,
|
||||
};
|
||||
});
|
||||
await axios.post('ClientObservations', bodyObs);
|
||||
|
||||
const bodyObsMail = {
|
||||
defaulters: $props.clients,
|
||||
observation: newObservation.value,
|
||||
};
|
||||
await axios.post('Defaulters/observationEmail', payload);
|
||||
await axios.post('Defaulters/observationEmail', bodyObsMail);
|
||||
|
||||
await $props.promise();
|
||||
|
||||
|
|
|
|||
|
|
@ -240,39 +240,33 @@ function handleLocation(data, location) {
|
|||
class="row q-gutter-md q-mb-md"
|
||||
v-for="(note, index) in notes"
|
||||
>
|
||||
<div class="col">
|
||||
<VnSelect
|
||||
:label="t('Observation type')"
|
||||
:options="observationTypes"
|
||||
hide-selected
|
||||
option-label="description"
|
||||
option-value="id"
|
||||
v-model="note.observationTypeFk"
|
||||
/>
|
||||
</div>
|
||||
<div class="col">
|
||||
<VnInput
|
||||
:label="t('Description')"
|
||||
:rules="validate('route.description')"
|
||||
clearable
|
||||
v-model="note.description"
|
||||
/>
|
||||
</div>
|
||||
<div class="flex items-center">
|
||||
<QIcon
|
||||
@click.stop="deleteNote(note.id, index)"
|
||||
class="cursor-pointer"
|
||||
color="primary"
|
||||
name="delete"
|
||||
size="sm"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ t('Remove note') }}
|
||||
</QTooltip>
|
||||
</QIcon>
|
||||
</div>
|
||||
<VnSelect
|
||||
:label="t('Observation type')"
|
||||
:options="observationTypes"
|
||||
hide-selected
|
||||
option-label="description"
|
||||
option-value="id"
|
||||
v-model="note.observationTypeFk"
|
||||
/>
|
||||
<VnInput
|
||||
:label="t('Description')"
|
||||
:rules="validate('route.description')"
|
||||
clearable
|
||||
v-model="note.description"
|
||||
/>
|
||||
<QIcon
|
||||
:style="{ flex: 0, 'align-self': $q.screen.gt.xs ? 'end' : 'center' }"
|
||||
@click.stop="deleteNote(note.id, index)"
|
||||
class="cursor-pointer"
|
||||
color="primary"
|
||||
name="delete"
|
||||
size="sm"
|
||||
>
|
||||
<QTooltip>
|
||||
{{ t('Remove note') }}
|
||||
</QTooltip>
|
||||
</QIcon>
|
||||
</VnRow>
|
||||
|
||||
<QBtn
|
||||
@click.stop="addNote()"
|
||||
class="cursor-pointer add-icon q-mt-md"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
<script setup>
|
||||
import { ref } from 'vue';
|
||||
import { useRoute } from 'vue-router';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
import FormModel from 'components/FormModel.vue';
|
||||
import VnRow from 'components/ui/VnRow.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
|
|
@ -11,17 +9,8 @@ import VnSelect from 'src/components/common/VnSelect.vue';
|
|||
|
||||
const route = useRoute();
|
||||
const { t } = useI18n();
|
||||
|
||||
const workersOptions = ref([]);
|
||||
const clientsOptions = ref([]);
|
||||
</script>
|
||||
<template>
|
||||
<FetchData
|
||||
url="Workers/search"
|
||||
@on-fetch="(data) => (workersOptions = data)"
|
||||
auto-load
|
||||
/>
|
||||
<FetchData url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
|
||||
<FormModel
|
||||
:url="`Departments/${route.params.id}`"
|
||||
model="department"
|
||||
|
|
@ -62,7 +51,7 @@ const clientsOptions = ref([]);
|
|||
<VnSelect
|
||||
:label="t('department.bossDepartment')"
|
||||
v-model="data.workerFk"
|
||||
:options="workersOptions"
|
||||
url="Workers/search"
|
||||
option-value="id"
|
||||
option-label="name"
|
||||
hide-selected
|
||||
|
|
@ -72,7 +61,7 @@ const clientsOptions = ref([]);
|
|||
<VnSelect
|
||||
:label="t('department.selfConsumptionCustomer')"
|
||||
v-model="data.clientFk"
|
||||
:options="clientsOptions"
|
||||
url="Clients"
|
||||
option-value="id"
|
||||
option-label="name"
|
||||
hide-selected
|
||||
|
|
|
|||
|
|
@ -0,0 +1,72 @@
|
|||
<script setup>
|
||||
import { ref, computed, watch } from 'vue';
|
||||
import VnInputDate from 'components/common/VnInputDate.vue';
|
||||
import useNotify from 'src/composables/useNotify.js';
|
||||
import axios from 'axios';
|
||||
|
||||
const isLoading = ref(false);
|
||||
const dateFrom = ref();
|
||||
const dateTo = ref();
|
||||
|
||||
const optionsTo = computed(() => (date) => {
|
||||
if (!dateFrom.value) return true;
|
||||
return new Date(date) >= new Date(dateFrom.value);
|
||||
});
|
||||
|
||||
watch(dateFrom, (newDateFrom) => {
|
||||
if (dateTo.value && new Date(dateTo.value) < new Date(newDateFrom))
|
||||
dateTo.value = newDateFrom;
|
||||
});
|
||||
|
||||
const recalc = async () => {
|
||||
const { notify } = useNotify();
|
||||
|
||||
const params = {
|
||||
schema: 'bs',
|
||||
params: [new Date(dateFrom.value), new Date(dateTo.value)],
|
||||
};
|
||||
|
||||
try {
|
||||
isLoading.value = true;
|
||||
await axios.post('Applications/waste_addSales/execute-proc', params);
|
||||
notify('wasteRecalc.recalcOk', 'positive');
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
} finally {
|
||||
isLoading.value = false;
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="q-pa-lg row justify-center">
|
||||
<QCard class="bg-light" style="width: 300px">
|
||||
<QCardSection>
|
||||
<VnInputDate
|
||||
class="q-mb-lg"
|
||||
v-model="dateFrom"
|
||||
:label="$t('globals.from')"
|
||||
rounded
|
||||
dense
|
||||
/>
|
||||
<VnInputDate
|
||||
class="q-mb-lg"
|
||||
v-model="dateTo"
|
||||
:options="optionsTo"
|
||||
:label="$t('globals.to')"
|
||||
:disable="!dateFrom"
|
||||
rounded
|
||||
dense
|
||||
/>
|
||||
<QBtn
|
||||
color="primary"
|
||||
text-color="white"
|
||||
:label="$t('globals.recalc')"
|
||||
:loading="isLoading"
|
||||
:disable="isLoading || !(dateFrom && dateTo)"
|
||||
@click="recalc()"
|
||||
/>
|
||||
</QCardSection>
|
||||
</QCard>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -18,3 +18,5 @@ myEntries:
|
|||
warehouseInFk: Warehouse in
|
||||
daysOnward: Days onward
|
||||
daysAgo: Days ago
|
||||
wasteRecalc:
|
||||
recalcOk: The wastes were successfully recalculated
|
||||
|
|
|
|||
|
|
@ -21,3 +21,5 @@ myEntries:
|
|||
warehouseInFk: Alm. entrada
|
||||
daysOnward: Días adelante
|
||||
daysAgo: Días atras
|
||||
wasteRecalc:
|
||||
recalcOk: Se han recalculado las mermas correctamente
|
||||
|
|
|
|||
|
|
@ -274,10 +274,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
|
|||
:label="t('invoiceIn.summary.company')"
|
||||
:value="entity.company?.code"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('invoiceIn.summary.booked')"
|
||||
:value="invoiceIn?.isBooked"
|
||||
/>
|
||||
<VnLv :label="t('invoiceIn.isBooked')" :value="invoiceIn?.isBooked" />
|
||||
</QCard>
|
||||
<QCard class="vn-one">
|
||||
<QCardSection class="q-pa-none">
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ const activities = ref([]);
|
|||
<QItem>
|
||||
<QItemSection>
|
||||
<QCheckbox
|
||||
:label="t('params.isBooked')"
|
||||
:label="t('invoiceIn.isBooked')"
|
||||
v-model="params.isBooked"
|
||||
@update:model-value="searchFn()"
|
||||
toggle-indeterminate
|
||||
|
|
@ -170,7 +170,7 @@ es:
|
|||
awb: AWB
|
||||
amount: Importe
|
||||
issued: Emitida
|
||||
isBooked: Conciliada
|
||||
isBooked: Contabilizada
|
||||
account: Cuenta contable
|
||||
created: Creada
|
||||
dued: Vencida
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ const cols = computed(() => [
|
|||
{
|
||||
align: 'left',
|
||||
name: 'isBooked',
|
||||
label: t('invoiceIn.list.isBooked'),
|
||||
label: t('invoiceIn.isBooked'),
|
||||
columnFilter: false,
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
invoiceIn:
|
||||
serial: Serial
|
||||
isBooked: Is booked
|
||||
list:
|
||||
ref: Reference
|
||||
supplier: Supplier
|
||||
|
|
@ -7,7 +8,6 @@ invoiceIn:
|
|||
serial: Serial
|
||||
file: File
|
||||
issued: Issued
|
||||
isBooked: Is booked
|
||||
awb: AWB
|
||||
amount: Amount
|
||||
card:
|
||||
|
|
@ -31,7 +31,6 @@ invoiceIn:
|
|||
sage: Sage withholding
|
||||
vat: Undeductible VAT
|
||||
company: Company
|
||||
booked: Booked
|
||||
expense: Expense
|
||||
taxableBase: Taxable base
|
||||
rate: Rate
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
invoiceIn:
|
||||
serial: Serie
|
||||
isBooked: Contabilizada
|
||||
list:
|
||||
ref: Referencia
|
||||
supplier: Proveedor
|
||||
|
|
@ -7,7 +8,6 @@ invoiceIn:
|
|||
shortIssued: F. emisión
|
||||
file: Fichero
|
||||
issued: Fecha emisión
|
||||
isBooked: Conciliada
|
||||
awb: AWB
|
||||
amount: Importe
|
||||
card:
|
||||
|
|
@ -31,7 +31,6 @@ invoiceIn:
|
|||
sage: Retención sage
|
||||
vat: Iva no deducible
|
||||
company: Empresa
|
||||
booked: Contabilizada
|
||||
expense: Gasto
|
||||
taxableBase: Base imp.
|
||||
rate: Tasa
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import RefundInvoiceForm from 'src/components/RefundInvoiceForm.vue';
|
|||
import SendEmailDialog from 'components/common/SendEmailDialog.vue';
|
||||
|
||||
import useNotify from 'src/composables/useNotify';
|
||||
import { useSession } from 'src/composables/useSession';
|
||||
import { usePrintService } from 'composables/usePrintService';
|
||||
import { useVnConfirm } from 'composables/useVnConfirm';
|
||||
import { getUrl } from 'src/composables/getUrl';
|
||||
|
|
@ -30,8 +29,6 @@ const $props = defineProps({
|
|||
|
||||
const { notify } = useNotify();
|
||||
const router = useRouter();
|
||||
const session = useSession();
|
||||
const token = session.getToken();
|
||||
const { t } = useI18n();
|
||||
const { openReport, sendEmail } = usePrintService();
|
||||
const { openConfirmationModal } = useVnConfirm();
|
||||
|
|
|
|||
|
|
@ -15,25 +15,10 @@ const props = defineProps({
|
|||
required: true,
|
||||
},
|
||||
});
|
||||
|
||||
const workers = ref();
|
||||
const workersCopy = ref();
|
||||
const states = ref();
|
||||
|
||||
function setWorkers(data) {
|
||||
workers.value = data;
|
||||
workersCopy.value = data;
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<FetchData url="ClaimStates" @on-fetch="(data) => (states = data)" auto-load />
|
||||
<FetchData
|
||||
url="Workers/activeWithInheritedRole"
|
||||
:filter="{ where: { role: 'salesPerson' } }"
|
||||
@on-fetch="setWorkers"
|
||||
auto-load
|
||||
/>
|
||||
<VnFilterPanel :data-key="props.dataKey" :search-button="true">
|
||||
<template #tags="{ tag, formatFn }">
|
||||
<div class="q-gutter-x-xs">
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@ import { toCurrency, toDate } from 'src/filters/index';
|
|||
import { useStateStore } from 'stores/useStateStore';
|
||||
import { QBtn } from 'quasar';
|
||||
import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
|
||||
import RightMenu from 'src/components/common/RightMenu.vue';
|
||||
import InvoiceOutFilter from './InvoiceOutFilter.vue';
|
||||
|
||||
const { t } = useI18n();
|
||||
const stateStore = useStateStore();
|
||||
|
|
@ -182,6 +184,11 @@ watchEffect(selectedRows);
|
|||
:label="t('searchInvoice')"
|
||||
data-key="invoiceOut"
|
||||
/>
|
||||
<RightMenu>
|
||||
<template #right-panel>
|
||||
<InvoiceOutFilter data-key="invoiceOut" />
|
||||
</template>
|
||||
</RightMenu>
|
||||
<VnSubToolbar>
|
||||
<template #st-actions>
|
||||
<QBtn
|
||||
|
|
@ -206,6 +213,7 @@ watchEffect(selectedRows);
|
|||
active: true,
|
||||
},
|
||||
}"
|
||||
:right-search="false"
|
||||
v-model:selected="selectedRows"
|
||||
order="id DESC"
|
||||
:columns="columns"
|
||||
|
|
|
|||
|
|
@ -170,7 +170,6 @@ const downloadCSV = async () => {
|
|||
}
|
||||
}
|
||||
"
|
||||
:limit="0"
|
||||
:columns="columns"
|
||||
auto-load
|
||||
:is-editable="false"
|
||||
|
|
|
|||
|
|
@ -171,7 +171,6 @@ const insertTag = (rows) => {
|
|||
<QBtn
|
||||
@click="insertTag(rows)"
|
||||
class="cursor-pointer"
|
||||
:disable="!validRow"
|
||||
color="primary"
|
||||
flat
|
||||
icon="add"
|
||||
|
|
|
|||
|
|
@ -491,9 +491,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
|
|||
<QTd>
|
||||
<VnImg
|
||||
size="50x50"
|
||||
zoom-resolution="1600x900"
|
||||
:id="row.id"
|
||||
height="50px"
|
||||
width="50px"
|
||||
class="image"
|
||||
/>
|
||||
</QTd>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ const router = useRouter();
|
|||
|
||||
const newItemTypeForm = reactive({});
|
||||
|
||||
const workersOptions = ref([]);
|
||||
const categoriesOptions = ref([]);
|
||||
const temperaturesOptions = ref([]);
|
||||
|
||||
|
|
@ -25,12 +24,6 @@ const redirectToItemTypeBasicData = (_, { id }) => {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<FetchData
|
||||
url="Workers"
|
||||
@on-fetch="(data) => (workersOptions = data)"
|
||||
:filter="{ order: 'firstName ASC', fields: ['id', 'firstName'] }"
|
||||
auto-load
|
||||
/>
|
||||
<FetchData
|
||||
url="ItemCategories"
|
||||
@on-fetch="(data) => (categoriesOptions = data)"
|
||||
|
|
@ -61,7 +54,9 @@ const redirectToItemTypeBasicData = (_, { id }) => {
|
|||
<VnSelect
|
||||
v-model="data.workerFk"
|
||||
:label="t('itemType.shared.worker')"
|
||||
:options="workersOptions"
|
||||
url="Workers"
|
||||
sort-by="firstName ASC"
|
||||
:fields="['id', 'firstName']"
|
||||
option-value="id"
|
||||
option-label="firstName"
|
||||
hide-selected
|
||||
|
|
|
|||
|
|
@ -12,17 +12,10 @@ import VnSelect from 'src/components/common/VnSelect.vue';
|
|||
const route = useRoute();
|
||||
const { t } = useI18n();
|
||||
|
||||
const workersOptions = ref([]);
|
||||
const categoriesOptions = ref([]);
|
||||
const temperaturesOptions = ref([]);
|
||||
</script>
|
||||
<template>
|
||||
<FetchData
|
||||
url="Workers"
|
||||
@on-fetch="(data) => (workersOptions = data)"
|
||||
:filter="{ order: 'firstName ASC', fields: ['id', 'firstName'] }"
|
||||
auto-load
|
||||
/>
|
||||
<FetchData
|
||||
url="ItemCategories"
|
||||
@on-fetch="(data) => (categoriesOptions = data)"
|
||||
|
|
@ -50,7 +43,9 @@ const temperaturesOptions = ref([]);
|
|||
<VnSelect
|
||||
v-model="data.workerFk"
|
||||
:label="t('shared.worker')"
|
||||
:options="workersOptions"
|
||||
url="Workers"
|
||||
sort-by="firstName ASC"
|
||||
:fields="['id', 'firstName']"
|
||||
option-value="id"
|
||||
option-label="firstName"
|
||||
hide-selected
|
||||
|
|
|
|||
|
|
@ -139,33 +139,35 @@ const openTab = (id) =>
|
|||
:disable-option="{ card: true }"
|
||||
>
|
||||
<template #top-left>
|
||||
<QBtn
|
||||
icon="refresh"
|
||||
size="md"
|
||||
color="primary"
|
||||
dense
|
||||
flat
|
||||
@click="$refs.table.reload()"
|
||||
>
|
||||
<QTooltip>{{ $t('globals.refresh') }}</QTooltip>
|
||||
</QBtn>
|
||||
<QBtn
|
||||
v-if="selectedRows.length"
|
||||
icon="delete"
|
||||
size="md"
|
||||
dense
|
||||
flat
|
||||
color="primary"
|
||||
@click="
|
||||
openConfirmationModal(
|
||||
$t('salesOrdersTable.deleteConfirmTitle'),
|
||||
$t('salesOrdersTable.deleteConfirmMessage'),
|
||||
removeOrders
|
||||
)
|
||||
"
|
||||
>
|
||||
<QTooltip>{{ t('salesOrdersTable.delete') }}</QTooltip>
|
||||
</QBtn>
|
||||
<div class="q-mt-sm">
|
||||
<QBtn
|
||||
icon="refresh"
|
||||
size="md"
|
||||
color="primary"
|
||||
dense
|
||||
flat
|
||||
@click="$refs.table.reload()"
|
||||
>
|
||||
<QTooltip>{{ $t('globals.refresh') }}</QTooltip>
|
||||
</QBtn>
|
||||
<QBtn
|
||||
v-if="selectedRows.length"
|
||||
icon="delete"
|
||||
size="md"
|
||||
dense
|
||||
flat
|
||||
color="primary"
|
||||
@click="
|
||||
openConfirmationModal(
|
||||
$t('globals.deleteConfirmTitle'),
|
||||
$t('salesOrdersTable.deleteConfirmMessage'),
|
||||
removeOrders
|
||||
)
|
||||
"
|
||||
>
|
||||
<QTooltip>{{ t('salesOrdersTable.delete') }}</QTooltip>
|
||||
</QBtn>
|
||||
</div>
|
||||
</template>
|
||||
<template #column-dateSend="{ row }">
|
||||
<QTd>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,11 @@ const stateOpts = ref([]);
|
|||
const zoneOpts = ref([]);
|
||||
const visibleColumns = ref([]);
|
||||
const { viewSummary } = useSummaryDialog();
|
||||
const [from, to] = dateRange(Date.vnNew());
|
||||
const from = Date.vnNew();
|
||||
from.setHours(0, 0, 0, 0);
|
||||
const to = new Date(from.getTime());
|
||||
to.setDate(to.getDate() + 1);
|
||||
to.setHours(23, 59, 59, 999);
|
||||
|
||||
function exprBuilder(param, value) {
|
||||
switch (param) {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ salesOrdersTable:
|
|||
dateMake: Make date
|
||||
client: Client
|
||||
salesPerson: Salesperson
|
||||
deleteConfirmTitle: Delete selected elements
|
||||
deleteConfirmMessage: All the selected elements will be deleted. Are you sure you want to continue?
|
||||
agency: Agency
|
||||
import: Import
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ salesOrdersTable:
|
|||
dateMake: Fecha de realización
|
||||
client: Cliente
|
||||
salesPerson: Comercial
|
||||
deleteConfirmTitle: Eliminar los elementos seleccionados
|
||||
deleteConfirmMessage: Todos los elementos seleccionados serán eliminados. ¿Seguro que quieres continuar?
|
||||
agency: Agencia
|
||||
import: Importe
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<script setup>
|
||||
import { useRoute, useRouter } from 'vue-router';
|
||||
import { useRouter } from 'vue-router';
|
||||
import { onMounted, ref } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import axios from 'axios';
|
||||
|
|
@ -13,12 +13,10 @@ import { reactive } from 'vue';
|
|||
import FetchData from 'components/FetchData.vue';
|
||||
|
||||
const { t } = useI18n();
|
||||
const route = useRoute();
|
||||
const state = useState();
|
||||
const ORDER_MODEL = 'order';
|
||||
|
||||
const router = useRouter();
|
||||
const clientList = ref([]);
|
||||
const agencyList = ref([]);
|
||||
const addressList = ref([]);
|
||||
defineEmits(['confirm', ...useDialogPluginComponent.emits]);
|
||||
|
|
@ -128,12 +126,6 @@ onMounted(async () => {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<FetchData
|
||||
url="addresses"
|
||||
@on-fetch="(data) => (clientOptions = data)"
|
||||
:filter="{ fields: ['id', 'name', 'defaultAddressFk'], order: 'id' }"
|
||||
auto-load
|
||||
/>
|
||||
<FormModelPopup
|
||||
url-create="Orders/new"
|
||||
:title="t('Create Order')"
|
||||
|
|
@ -167,13 +159,16 @@ onMounted(async () => {
|
|||
</template>
|
||||
</VnSelect>
|
||||
<VnSelect
|
||||
ref="addressRef"
|
||||
:label="t('order.form.addressFk')"
|
||||
v-model="data.addressId"
|
||||
:options="addressList"
|
||||
url="addresses"
|
||||
:fields="['id', 'nickname', 'defaultAddressFk', 'street', 'city']"
|
||||
sort-by="id"
|
||||
option-value="id"
|
||||
option-label="street"
|
||||
hide-selected
|
||||
:disable="!addressList?.length"
|
||||
:disable="!$refs.addressRef?.length"
|
||||
>
|
||||
<template #option="scope">
|
||||
<QItem v-bind="scope.itemProps">
|
||||
|
|
|
|||
|
|
@ -17,10 +17,6 @@ const props = defineProps({
|
|||
|
||||
const agencyFilter = { fields: ['id', 'name'] };
|
||||
const agencyList = ref(null);
|
||||
const salesPersonFilter = {
|
||||
fields: ['id', 'nickname'],
|
||||
};
|
||||
const salesPersonList = ref(null);
|
||||
const sourceList = ref([]);
|
||||
</script>
|
||||
|
||||
|
|
@ -32,14 +28,6 @@ const sourceList = ref([]);
|
|||
auto-load
|
||||
@on-fetch="(data) => (agencyList = data)"
|
||||
/>
|
||||
<FetchData
|
||||
url="Workers/search"
|
||||
:filter="salesPersonFilter"
|
||||
sort-by="nickname ASC"
|
||||
@on-fetch="(data) => (salesPersonList = data)"
|
||||
:params="{ departmentCodes: ['VT'] }"
|
||||
auto-load
|
||||
/>
|
||||
<FetchData
|
||||
url="Orders/getSourceValues"
|
||||
:filter="{ fields: ['value'] }"
|
||||
|
|
|
|||
|
|
@ -278,7 +278,11 @@ watch(
|
|||
>
|
||||
<template #column-image="{ row }">
|
||||
<div class="image-wrapper">
|
||||
<VnImg :id="parseInt(row?.item?.image)" class="rounded" />
|
||||
<VnImg
|
||||
:id="parseInt(row?.item?.image)"
|
||||
class="rounded"
|
||||
zoom-resolution="1600x900"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
<template #column-id="{ row }">
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
<script setup>
|
||||
import { ref } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import FetchData from 'components/FetchData.vue';
|
||||
import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
|
||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||
|
||||
|
|
@ -14,22 +12,9 @@ const props = defineProps({
|
|||
});
|
||||
|
||||
const emit = defineEmits(['search']);
|
||||
|
||||
const workers = ref();
|
||||
|
||||
function setWorkers(data) {
|
||||
workers.value = data;
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<FetchData
|
||||
url="Workers/activeWithInheritedRole"
|
||||
:filter="{ where: { role: 'salesPerson' } }"
|
||||
sort-by="firstName ASC"
|
||||
@on-fetch="setWorkers"
|
||||
auto-load
|
||||
/>
|
||||
<VnFilterPanel
|
||||
:data-key="props.dataKey"
|
||||
:search-button="true"
|
||||
|
|
|
|||
|
|
@ -99,7 +99,11 @@ const setWireTransfer = async () => {
|
|||
:key="index"
|
||||
class="row q-gutter-md q-mb-md"
|
||||
>
|
||||
<VnInput :label="t('supplier.accounts.iban')" v-model="row.iban">
|
||||
<VnInput
|
||||
:label="t('supplier.accounts.iban')"
|
||||
v-model="row.iban"
|
||||
:required="true"
|
||||
>
|
||||
<template #append>
|
||||
<QIcon name="info" class="cursor-info">
|
||||
<QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
|
||||
|
|
@ -113,6 +117,7 @@ const setWireTransfer = async () => {
|
|||
option-label="bic"
|
||||
option-value="id"
|
||||
hide-selected
|
||||
:required="true"
|
||||
:roles-allowed-to-create="['financial']"
|
||||
>
|
||||
<template #form>
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@ const route = useRoute();
|
|||
const agenciesOptions = ref(null);
|
||||
const newAgencyTermForm = reactive({
|
||||
agencyFk: null,
|
||||
minimumM3: null,
|
||||
packagePrice: null,
|
||||
kmPrice: null,
|
||||
m3Price: null,
|
||||
minimumM3: 0,
|
||||
packagePrice: 0,
|
||||
kmPrice: 0,
|
||||
m3Price: 0,
|
||||
routePrice: null,
|
||||
minimumKm: null,
|
||||
minimumKm: 0,
|
||||
supplierFk: route.params.id,
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ import { computed, ref } from 'vue';
|
|||
import { useI18n } from 'vue-i18n';
|
||||
import VnTable from 'components/VnTable/VnTable.vue';
|
||||
import VnSearchbar from 'components/ui/VnSearchbar.vue';
|
||||
import RightMenu from 'src/components/common/RightMenu.vue';
|
||||
import SupplierListFilter from './SupplierListFilter.vue';
|
||||
|
||||
const { t } = useI18n();
|
||||
const tableRef = ref();
|
||||
|
|
@ -93,6 +95,11 @@ const columns = computed(() => [
|
|||
|
||||
<template>
|
||||
<VnSearchbar data-key="SuppliersList" :limit="20" :label="t('Search suppliers')" />
|
||||
<RightMenu>
|
||||
<template #right-panel>
|
||||
<SupplierListFilter data-key="SuppliersList" />
|
||||
</template>
|
||||
</RightMenu>
|
||||
<VnTable
|
||||
ref="tableRef"
|
||||
data-key="SuppliersList"
|
||||
|
|
@ -109,6 +116,7 @@ const columns = computed(() => [
|
|||
return data;
|
||||
},
|
||||
}"
|
||||
:right-search="false"
|
||||
order="id ASC"
|
||||
:columns="columns"
|
||||
auto-load
|
||||
|
|
|
|||
|
|
@ -49,7 +49,13 @@ async function handleSave() {
|
|||
|
||||
<template>
|
||||
<FetchData
|
||||
@on-fetch="(data) => (observationTypes = data)"
|
||||
@on-fetch="
|
||||
(data) =>
|
||||
(observationTypes = data.map((type) => {
|
||||
type.label = t(`ticketNotes.observationTypes.${type.description}`);
|
||||
return type;
|
||||
}))
|
||||
"
|
||||
auto-load
|
||||
url="ObservationTypes"
|
||||
/>
|
||||
|
|
@ -76,7 +82,7 @@ async function handleSave() {
|
|||
:label="t('ticketNotes.observationType')"
|
||||
:options="observationTypes"
|
||||
hide-selected
|
||||
option-label="description"
|
||||
option-label="label"
|
||||
option-value="id"
|
||||
v-model="row.observationTypeFk"
|
||||
:disable="!!row.id"
|
||||
|
|
|
|||
|
|
@ -663,6 +663,13 @@ watch(
|
|||
</QTooltip>
|
||||
</QIcon>
|
||||
</template>
|
||||
<template #body-cell-picture="{ row }">
|
||||
<QTd>
|
||||
<div class="image-wrapper">
|
||||
<VnImg :id="row.itemFk" class="rounded" zoom-resolution="1600x900" />
|
||||
</div>
|
||||
</QTd>
|
||||
</template>
|
||||
<template #column-image="{ row }">
|
||||
<div class="image-wrapper">
|
||||
<VnImg :id="parseInt(row?.item?.id)" class="rounded" />
|
||||
|
|
|
|||
|
|
@ -82,29 +82,6 @@ async function changeState(value) {
|
|||
}
|
||||
}
|
||||
|
||||
function getNoteValue(description) {
|
||||
switch (description) {
|
||||
case 'ItemPicker':
|
||||
return t('ItemPicker');
|
||||
case 'Packager':
|
||||
return t('Packager');
|
||||
case 'Delivery':
|
||||
return t('Delivery');
|
||||
case 'SalesPerson':
|
||||
return t('SalesPerson');
|
||||
case 'Administrative':
|
||||
return t('Administrative');
|
||||
case 'Weight':
|
||||
return t('Weight');
|
||||
case 'InvoiceOut':
|
||||
return t('InvoiceOut');
|
||||
case 'DropOff':
|
||||
return t('DropOff');
|
||||
case 'Sustitución':
|
||||
return t('Sustitución');
|
||||
}
|
||||
}
|
||||
|
||||
function toTicketUrl(section) {
|
||||
return '#/ticket/' + entityId.value + '/' + section;
|
||||
}
|
||||
|
|
@ -276,23 +253,32 @@ function toTicketUrl(section) {
|
|||
:url="toTicketUrl('observation')"
|
||||
:text="t('ticket.pageTitles.notes')"
|
||||
/>
|
||||
<VnLv
|
||||
v-for="note in entity.notes"
|
||||
:key="note.id"
|
||||
:label="getNoteValue(note.observationType.description)"
|
||||
:value="note.description"
|
||||
<QVirtualScroll
|
||||
:items="entity.notes"
|
||||
v-slot="{ item, index }"
|
||||
style="max-height: 300px"
|
||||
separator
|
||||
>
|
||||
<template #value>
|
||||
<QInput
|
||||
v-model="note.description"
|
||||
filled
|
||||
type="textarea"
|
||||
class="notes"
|
||||
readonly
|
||||
autogrow
|
||||
/>
|
||||
</template>
|
||||
</VnLv>
|
||||
<QItem
|
||||
:key="index"
|
||||
class="vn-label-value"
|
||||
style="
|
||||
display: inline-block;
|
||||
padding: unset;
|
||||
min-height: max-content;
|
||||
"
|
||||
>
|
||||
<span class="label" style="margin-right: 4px">
|
||||
({{
|
||||
t(
|
||||
`ticketNotes.observationTypes.${item.observationType.description}`
|
||||
)
|
||||
}}):
|
||||
</span>
|
||||
|
||||
<span>{{ item.description }}</span>
|
||||
</QItem>
|
||||
</QVirtualScroll>
|
||||
</QCard>
|
||||
<QCard class="vn-one">
|
||||
<VnTitle :text="t('ticket.summary.summaryAmount')" />
|
||||
|
|
@ -621,28 +607,3 @@ function toTicketUrl(section) {
|
|||
color: $primary-light;
|
||||
}
|
||||
</style>
|
||||
|
||||
<i18n>
|
||||
en:
|
||||
ItemPicker: Item Picker
|
||||
Packager: Packager
|
||||
Delivery: Delivery
|
||||
SalesPerson: Sales Person
|
||||
Administrative: Administrative
|
||||
Weight: Weight
|
||||
InvoiceOut: Invoice Out
|
||||
DropOff: Drop Off
|
||||
Sustitución: Sustitution
|
||||
es:
|
||||
ItemPicker: Items
|
||||
Packager: Encajador
|
||||
Delivery: Envío
|
||||
SalesPerson: Comercial
|
||||
Administrative: Administrativa
|
||||
Weight: Peso
|
||||
InvoiceOut: Facturas
|
||||
DropOff: Despacho
|
||||
Sustitución: Sustitución
|
||||
Accepted: Aceptado
|
||||
Denied: Denegado
|
||||
</i18n>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ const initialFormState = reactive({
|
|||
warehouseId: user.value.warehouseFk,
|
||||
landed: null,
|
||||
});
|
||||
const clientOptions = ref([]);
|
||||
const agenciesOptions = ref([]);
|
||||
const addressesOptions = ref([]);
|
||||
const warehousesOptions = ref([]);
|
||||
|
|
@ -111,12 +110,6 @@ const redirectToTicketList = (_, { id }) => {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<FetchData
|
||||
url="Clients"
|
||||
@on-fetch="(data) => (clientOptions = data)"
|
||||
:filter="{ fields: ['id', 'name', 'defaultAddressFk'], order: 'id' }"
|
||||
auto-load
|
||||
/>
|
||||
<FetchData
|
||||
url="Warehouses"
|
||||
@on-fetch="(data) => (warehousesOptions = data)"
|
||||
|
|
@ -137,7 +130,9 @@ const redirectToTicketList = (_, { id }) => {
|
|||
<VnSelect
|
||||
:label="t('ticket.create.client')"
|
||||
v-model="data.clientId"
|
||||
:options="clientOptions"
|
||||
url="Clients"
|
||||
:fields="['id', 'name', 'defaultAddressFk']"
|
||||
sort-by="id"
|
||||
option-value="id"
|
||||
option-label="name"
|
||||
hide-selected
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import FetchData from 'components/FetchData.vue';
|
|||
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
import VnInputDate from 'components/common/VnInputDate.vue';
|
||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||
|
||||
const { t } = useI18n();
|
||||
const props = defineProps({
|
||||
|
|
@ -15,7 +16,6 @@ const props = defineProps({
|
|||
},
|
||||
});
|
||||
|
||||
const workers = ref([]);
|
||||
const provinces = ref([]);
|
||||
const states = ref([]);
|
||||
const agencies = ref([]);
|
||||
|
|
@ -27,12 +27,6 @@ const warehouses = ref([]);
|
|||
<FetchData url="States" @on-fetch="(data) => (states = data)" auto-load />
|
||||
<FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
|
||||
<FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
|
||||
<FetchData
|
||||
url="Workers/activeWithInheritedRole"
|
||||
:filter="{ where: { role: 'salesPerson' } }"
|
||||
@on-fetch="(data) => (workers = data)"
|
||||
auto-load
|
||||
/>
|
||||
<VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
|
||||
<template #tags="{ tag, formatFn }">
|
||||
<div class="q-gutter-x-xs">
|
||||
|
|
@ -66,23 +60,19 @@ const warehouses = ref([]);
|
|||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection v-if="!workers">
|
||||
<QSkeleton type="QInput" class="full-width" />
|
||||
</QItemSection>
|
||||
<QItemSection v-if="workers">
|
||||
<QSelect
|
||||
<QItemSection>
|
||||
<VnSelect
|
||||
:label="t('Salesperson')"
|
||||
v-model="params.salesPersonFk"
|
||||
:options="workers"
|
||||
url="Workers/activeWithInheritedRole"
|
||||
:where="{ role: 'salesPerson' }"
|
||||
option-value="id"
|
||||
option-label="name"
|
||||
emit-value
|
||||
map-options
|
||||
use-input
|
||||
option-label="firstName"
|
||||
:use-like="false"
|
||||
sort-by="firstName ASC"
|
||||
dense
|
||||
outlined
|
||||
rounded
|
||||
:input-debounce="0"
|
||||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
|
|
|
|||
|
|
@ -14,6 +14,16 @@ ticketNotes:
|
|||
description: Description
|
||||
removeNote: Remove note
|
||||
addNote: Add note
|
||||
observationTypes:
|
||||
ItemPicker: Item picker
|
||||
Packager: Packager
|
||||
Delivery: Delivery
|
||||
SalesPerson: Sales person
|
||||
Administrative: Administrative
|
||||
Weight: Weight
|
||||
InvoiceOut: Invoice Out
|
||||
DropOff: Drop Off
|
||||
Sustitución: Sustitution
|
||||
ticketSale:
|
||||
id: Id
|
||||
visible: Visible
|
||||
|
|
|
|||
|
|
@ -29,6 +29,18 @@ ticketNotes:
|
|||
description: Descripción
|
||||
removeNote: Quitar nota
|
||||
addNote: Añadir nota
|
||||
observationTypes:
|
||||
ItemPicker: Sacador
|
||||
Packager: Encajador
|
||||
Delivery: Envío
|
||||
SalesPerson: Comercial
|
||||
Administrative: Administrativa
|
||||
Weight: Peso
|
||||
InvoiceOut: Facturas
|
||||
DropOff: Despacho
|
||||
Sustitución: Sustitución
|
||||
Accepted: Aceptado
|
||||
Denied: Denegado
|
||||
purchaseRequest:
|
||||
Id: Id
|
||||
description: Descripción
|
||||
|
|
|
|||
|
|
@ -124,6 +124,12 @@ defineExpose({ states });
|
|||
lazy-rules
|
||||
is-outlined
|
||||
/>
|
||||
<VnInput
|
||||
:label="t('travel.travelList.tableVisibleColumns.daysOnward')"
|
||||
v-model="params.daysOnward"
|
||||
lazy-rules
|
||||
is-outlined
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
</VnFilterPanel>
|
||||
|
|
|
|||
|
|
@ -161,15 +161,6 @@ const columns = computed(() => [
|
|||
cardVisible: true,
|
||||
create: true,
|
||||
},
|
||||
{
|
||||
align: 'left',
|
||||
name: 'daysOnward',
|
||||
label: t('travel.travelList.tableVisibleColumns.daysOnward'),
|
||||
visible: false,
|
||||
columnFilter: {
|
||||
inWhere: false,
|
||||
},
|
||||
},
|
||||
{
|
||||
align: 'right',
|
||||
label: '',
|
||||
|
|
|
|||
|
|
@ -57,9 +57,21 @@ const columns = computed(() => [
|
|||
field: 'concept',
|
||||
cardVisible: true,
|
||||
},
|
||||
{
|
||||
align: 'right',
|
||||
name: 'tableActions',
|
||||
style: 'max-width: 20px; text-align: initial;',
|
||||
actions: [
|
||||
{
|
||||
title: t('delete'),
|
||||
icon: 'delete',
|
||||
action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
|
||||
isPrimary: true,
|
||||
},
|
||||
],
|
||||
},
|
||||
]);
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<VnTable
|
||||
ref="tableRef"
|
||||
|
|
@ -69,7 +81,7 @@ const columns = computed(() => [
|
|||
save-url="WorkerIncomes/crud"
|
||||
:create="{
|
||||
urlCreate: 'workerIncomes',
|
||||
title: t('Create workerBalance'),
|
||||
title: t('Create balance'),
|
||||
onDataSaved: () => tableRef.reload(),
|
||||
formInitialData: {
|
||||
workerFk: entityId,
|
||||
|
|
@ -81,10 +93,10 @@ const columns = computed(() => [
|
|||
:right-search="false"
|
||||
:is-editable="true"
|
||||
:use-model="true"
|
||||
:default-remove="false"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<i18n>
|
||||
es:
|
||||
Create workerBalance: Crear balance
|
||||
Create balance: Crear balance
|
||||
</i18n>
|
||||
|
|
|
|||
|
|
@ -3,9 +3,11 @@ import WorkerEventLabel from 'pages/Worker/Card/WorkerEventLabel.vue';
|
|||
import FetchData from 'components/FetchData.vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import VnSelect from 'components/common/VnSelect.vue';
|
||||
import useNotify from 'src/composables/useNotify';
|
||||
import { useRoute } from 'vue-router';
|
||||
import { computed, ref } from 'vue';
|
||||
import { computed, ref, watch } from 'vue';
|
||||
import { toDateFormat } from '../../../filters/date';
|
||||
const { notify } = useNotify();
|
||||
|
||||
const { t } = useI18n();
|
||||
const route = useRoute();
|
||||
|
|
@ -33,6 +35,13 @@ const props = defineProps({
|
|||
},
|
||||
});
|
||||
|
||||
watch(
|
||||
() => props.contractHolidays,
|
||||
(newValue) => {
|
||||
checkHolidays(newValue);
|
||||
},
|
||||
{ deep: true, immediate: true }
|
||||
);
|
||||
const emit = defineEmits(['update:businessFk', 'update:year', 'update:absenceType']);
|
||||
|
||||
const selectedBusinessFk = computed({
|
||||
|
|
@ -53,12 +62,22 @@ const selectedAbsenceType = computed({
|
|||
},
|
||||
});
|
||||
|
||||
const generateYears = () => {
|
||||
function generateYears() {
|
||||
const now = Date.vnNew();
|
||||
const maxYear = now.getFullYear() + 1;
|
||||
|
||||
return Array.from({ length: 5 }, (_, i) => String(maxYear - i)) || [];
|
||||
};
|
||||
}
|
||||
|
||||
function checkHolidays(contractHolidays) {
|
||||
if (!contractHolidays) return;
|
||||
if (
|
||||
contractHolidays.holidaysEnjoyed > contractHolidays.totalHolidays ||
|
||||
contractHolidays.hoursEnjoyed > contractHolidays.totalHours
|
||||
) {
|
||||
notify(t('Vacation days have been exceeded'), 'negative');
|
||||
}
|
||||
}
|
||||
|
||||
const absenceTypeList = ref([]);
|
||||
const contractList = ref([]);
|
||||
|
|
|
|||
|
|
@ -96,10 +96,23 @@ const columns = computed(() => [
|
|||
label: t('worker.formation.tableVisibleColumns.hasDiploma'),
|
||||
create: true,
|
||||
},
|
||||
{
|
||||
align: 'right',
|
||||
name: 'tableActions',
|
||||
actions: [
|
||||
{
|
||||
title: t('delete'),
|
||||
icon: 'delete',
|
||||
action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
|
||||
isPrimary: true,
|
||||
},
|
||||
],
|
||||
},
|
||||
]);
|
||||
</script>
|
||||
<template>
|
||||
<VnTable
|
||||
class="worker-formation"
|
||||
ref="tableRef"
|
||||
data-key="WorkerFormation"
|
||||
:url="`Workers/${entityId}/trainingCourse`"
|
||||
|
|
@ -120,8 +133,15 @@ const columns = computed(() => [
|
|||
:right-search="false"
|
||||
:is-editable="true"
|
||||
:use-model="true"
|
||||
:default-remove="false"
|
||||
/>
|
||||
</template>
|
||||
<style lang="scss" scoped>
|
||||
:global(.worker-formation thead > tr > th:nth-child(7)),
|
||||
:global(.worker-formation thead > tr > th:nth-child(8)) {
|
||||
max-width: 50px;
|
||||
}
|
||||
</style>
|
||||
<i18n>
|
||||
es:
|
||||
Create training course: Crear curso de formación
|
||||
|
|
|
|||
|
|
@ -65,6 +65,18 @@ const columns = [
|
|||
create: true,
|
||||
component: 'input',
|
||||
},
|
||||
{
|
||||
align: 'right',
|
||||
name: 'tableActions',
|
||||
actions: [
|
||||
{
|
||||
title: t('delete'),
|
||||
icon: 'delete',
|
||||
action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
|
||||
isPrimary: true,
|
||||
},
|
||||
],
|
||||
},
|
||||
];
|
||||
</script>
|
||||
<template>
|
||||
|
|
@ -87,5 +99,6 @@ const columns = [
|
|||
:right-search="false"
|
||||
:is-editable="true"
|
||||
:use-model="true"
|
||||
:default-remove="false"
|
||||
/>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -139,6 +139,7 @@ onBeforeMount(async () => {
|
|||
<VnLinkPhone :phone-number="worker?.sip?.extension" />
|
||||
</template>
|
||||
</VnLv>
|
||||
<VnLv :label="t('queue')" :value="worker.sip?.queueMember?.queue" />
|
||||
</QCard>
|
||||
</template>
|
||||
</CardSummary>
|
||||
|
|
|
|||
|
|
@ -326,16 +326,20 @@ const updateData = async () => {
|
|||
};
|
||||
|
||||
const getMailStates = async (date) => {
|
||||
const url = `WorkerTimeControls/${route.params.id}/getMailStates`;
|
||||
const month = date.getMonth() + 1;
|
||||
const prevMonth = month == 1 ? 12 : month - 1;
|
||||
const params = {
|
||||
month: date.getMonth() + 1,
|
||||
month,
|
||||
year: date.getFullYear(),
|
||||
};
|
||||
|
||||
const { data } = await axios.get(
|
||||
`WorkerTimeControls/${route.params.id}/getMailStates`,
|
||||
{ params }
|
||||
);
|
||||
workerTimeControlMails.value = data;
|
||||
const curMonthStates = (await axios.get(url, { params })).data;
|
||||
const prevMonthStates = (
|
||||
await axios.get(url, { params: { ...params, month: prevMonth } })
|
||||
).data;
|
||||
|
||||
workerTimeControlMails.value = curMonthStates.concat(prevMonthStates);
|
||||
};
|
||||
|
||||
const showWorkerTimeForm = (propValue, formType) => {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
|
|||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||
|
||||
const { t } = useI18n();
|
||||
const { t, te } = useI18n();
|
||||
const props = defineProps({
|
||||
dataKey: {
|
||||
type: String,
|
||||
|
|
@ -16,6 +16,11 @@ const props = defineProps({
|
|||
});
|
||||
|
||||
const departments = ref();
|
||||
|
||||
const getLocale = (label) => {
|
||||
const globalLocale = `globals.params.${label}`;
|
||||
return te(globalLocale) ? t(globalLocale) : t(`params.${label}`);
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
|
@ -23,7 +28,7 @@ const departments = ref();
|
|||
<VnFilterPanel :data-key="props.dataKey" :search-button="true">
|
||||
<template #tags="{ tag, formatFn }">
|
||||
<div class="q-gutter-x-xs">
|
||||
<strong>{{ t(`params.${tag.label}`) }}: </strong>
|
||||
<strong>{{ getLocale(tag.label) }}: </strong>
|
||||
<span>{{ formatFn(tag.value) }}</span>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -64,10 +69,7 @@ const departments = ref();
|
|||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection v-if="!departments">
|
||||
<QSkeleton type="QInput" class="full-width" />
|
||||
</QItemSection>
|
||||
<QItemSection v-if="departments">
|
||||
<QItemSection>
|
||||
<VnSelect
|
||||
:label="t('Department')"
|
||||
v-model="params.departmentFk"
|
||||
|
|
@ -82,6 +84,11 @@ const departments = ref();
|
|||
/>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnInput :label="t('Email')" v-model="params.email" is-outlined />
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
<QItem>
|
||||
<QItemSection>
|
||||
<VnInput
|
||||
|
|
@ -99,23 +106,17 @@ const departments = ref();
|
|||
en:
|
||||
params:
|
||||
search: Contains
|
||||
fi: FI
|
||||
firstName: First name
|
||||
lastName: Last name
|
||||
userName: User
|
||||
extension: Extension
|
||||
departmentFk: Department
|
||||
id: ID
|
||||
es:
|
||||
params:
|
||||
search: Contiene
|
||||
fi: NIF
|
||||
firstName: Nombre
|
||||
lastName: Apellidos
|
||||
userName: Usuario
|
||||
extension: Extensión
|
||||
departmentFk: Departamento
|
||||
id: ID
|
||||
FI: NIF
|
||||
First Name: Nombre
|
||||
Last Name: Apellidos
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ const postcodesOptions = ref([]);
|
|||
|
||||
const user = useState().getUser();
|
||||
const defaultPayMethod = ref();
|
||||
const bankEntitiesRef = ref();
|
||||
const columns = computed(() => [
|
||||
{
|
||||
align: 'left',
|
||||
|
|
@ -39,13 +40,31 @@ const columns = computed(() => [
|
|||
},
|
||||
{
|
||||
align: 'left',
|
||||
name: 'nickname',
|
||||
label: t('tableColumns.name'),
|
||||
name: 'firstName',
|
||||
label: t('tableColumns.firstName'),
|
||||
isTitle: true,
|
||||
columnFilter: {
|
||||
name: 'firstName',
|
||||
},
|
||||
},
|
||||
{
|
||||
align: 'left',
|
||||
name: 'lastName',
|
||||
label: t('tableColumns.lastName'),
|
||||
isTitle: true,
|
||||
columnFilter: {
|
||||
name: 'lastName',
|
||||
},
|
||||
},
|
||||
{
|
||||
align: 'left',
|
||||
name: 'nickname',
|
||||
label: t('tableColumns.userName'),
|
||||
isTitle: true,
|
||||
columnFilter: {
|
||||
name: 'userName',
|
||||
},
|
||||
},
|
||||
{
|
||||
align: 'left',
|
||||
name: 'departmentFk',
|
||||
|
|
@ -66,10 +85,17 @@ const columns = computed(() => [
|
|||
label: t('tableColumns.email'),
|
||||
cardVisible: true,
|
||||
columnFilter: {
|
||||
alias: 'mu',
|
||||
inWhere: true,
|
||||
name: 'email',
|
||||
},
|
||||
},
|
||||
{
|
||||
align: 'left',
|
||||
name: 'extension',
|
||||
label: t('tableColumns.extension'),
|
||||
cardVisible: true,
|
||||
columnFilter: {
|
||||
name: 'extension',
|
||||
},
|
||||
hidden: true,
|
||||
},
|
||||
{
|
||||
align: 'right',
|
||||
|
|
@ -93,6 +119,12 @@ onBeforeMount(async () => {
|
|||
).data?.payMethodFk;
|
||||
});
|
||||
|
||||
async function handleNewBankEntity(data, resp) {
|
||||
await bankEntitiesRef.value.fetch();
|
||||
data.bankEntityFk = resp.id;
|
||||
bankEntitiesOptions.value.push(resp);
|
||||
}
|
||||
|
||||
function handleLocation(data, location) {
|
||||
const { town, code, provinceFk, countryFk } = location ?? {};
|
||||
data.postcode = code;
|
||||
|
|
@ -152,6 +184,7 @@ async function autofillBic(worker) {
|
|||
auto-load
|
||||
/>
|
||||
<FetchData
|
||||
ref="bankEntitiesRef"
|
||||
url="BankEntities"
|
||||
@on-fetch="(data) => (bankEntitiesOptions = data)"
|
||||
auto-load
|
||||
|
|
@ -180,7 +213,7 @@ async function autofillBic(worker) {
|
|||
default-mode="table"
|
||||
redirect="worker"
|
||||
:right-search="false"
|
||||
auto-load
|
||||
:order="['id DESC']"
|
||||
>
|
||||
<template #more-create-dialog="{ data }">
|
||||
<div class="q-pa-lg full-width">
|
||||
|
|
@ -319,7 +352,9 @@ async function autofillBic(worker) {
|
|||
>
|
||||
<template #form>
|
||||
<CreateBankEntityForm
|
||||
@on-data-saved="(data) => bankEntitiesOptions.push(data)"
|
||||
@on-data-saved="
|
||||
(_, resp) => handleNewBankEntity(data, resp)
|
||||
"
|
||||
/>
|
||||
</template>
|
||||
<template #option="scope">
|
||||
|
|
|
|||
|
|
@ -1,6 +1,12 @@
|
|||
passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
|
||||
tableColumns:
|
||||
id: ID
|
||||
name: Name
|
||||
firstName: First name
|
||||
lastName: Last Name
|
||||
userName: User Name
|
||||
department: Department
|
||||
email: Email
|
||||
fi: FI
|
||||
SSN: SSN
|
||||
extension: Extension
|
||||
queue: Queue
|
||||
|
|
|
|||
|
|
@ -6,6 +6,12 @@ External: Externo
|
|||
passwordRequirements: 'La contraseña debe tener al menos { length } caracteres de longitud, {nAlpha} caracteres alfabéticos, {nUpper} letras mayúsculas, {nDigits} dígitos y {nPunct} símbolos (Ej: $%&.)'
|
||||
tableColumns:
|
||||
id: ID
|
||||
name: Nombre
|
||||
firstName: Nombre
|
||||
lastName: Apellidos
|
||||
userName: Nombre de usuario
|
||||
department: Departamento
|
||||
email: Email
|
||||
fi: NIF
|
||||
SSN: NSS
|
||||
extension: Extensión
|
||||
queue: Cola
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ watch(
|
|||
sort-by="code, townFk"
|
||||
option-value="geoFk"
|
||||
option-label="code"
|
||||
option-filter="code"
|
||||
:filter-options="['code', 'geoFk']"
|
||||
hide-selected
|
||||
dense
|
||||
outlined
|
||||
|
|
|
|||
|
|
@ -12,7 +12,13 @@ export default {
|
|||
component: RouterView,
|
||||
redirect: { name: 'EntryMain' },
|
||||
menus: {
|
||||
main: ['EntryList', 'MyEntries', 'EntryLatestBuys', 'EntryStockBought'],
|
||||
main: [
|
||||
'EntryList',
|
||||
'MyEntries',
|
||||
'EntryLatestBuys',
|
||||
'EntryStockBought',
|
||||
'EntryWasteRecalc',
|
||||
],
|
||||
card: ['EntryBasicData', 'EntryBuys', 'EntryNotes', 'EntryDms', 'EntryLog'],
|
||||
},
|
||||
children: [
|
||||
|
|
@ -67,6 +73,15 @@ export default {
|
|||
},
|
||||
component: () => import('src/pages/Entry/EntryStockBought.vue'),
|
||||
},
|
||||
{
|
||||
path: 'waste-recalc',
|
||||
name: 'EntryWasteRecalc',
|
||||
meta: {
|
||||
title: 'wasteRecalc',
|
||||
icon: 'compost',
|
||||
},
|
||||
component: () => import('src/pages/Entry/EntryWasteRecalc.vue'),
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -177,6 +177,7 @@ export default {
|
|||
meta: {
|
||||
title: 'log',
|
||||
icon: 'vn:History',
|
||||
acls: [{ model: 'WorkerLog', props: 'find', accessType: 'READ' }],
|
||||
},
|
||||
component: () => import('src/pages/Worker/Card/WorkerLog.vue'),
|
||||
},
|
||||
|
|
|
|||
|
|
@ -33,7 +33,8 @@ describe('ClaimDevelopment', () => {
|
|||
cy.saveCard();
|
||||
});
|
||||
|
||||
it('should add and remove new line', () => {
|
||||
// TODO: #8112
|
||||
xit('should add and remove new line', () => {
|
||||
cy.wait(['@workers', '@workers']);
|
||||
cy.addCard();
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
describe('ClaimNotes', () => {
|
||||
const saveBtn = '.q-field__append > .q-btn > .q-btn__content > .q-icon';
|
||||
const firstNote = '.q-infinite-scroll :nth-child(1) > .q-card__section--vert';
|
||||
beforeEach(() => {
|
||||
cy.login('developer');
|
||||
cy.visit(`/#/claim/${2}/notes`);
|
||||
|
|
@ -7,7 +9,7 @@ describe('ClaimNotes', () => {
|
|||
it('should add a new note', () => {
|
||||
const message = 'This is a new message.';
|
||||
cy.get('.q-textarea').type(message);
|
||||
cy.get('.q-field__append > .q-btn > .q-btn__content > .q-icon').click(); //save
|
||||
cy.get(':nth-child(1) > .q-card__section--vert').should('have.text', message);
|
||||
cy.get(saveBtn).click();
|
||||
cy.get(firstNote).should('have.text', message);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ describe('EntryMy when is supplier', () => {
|
|||
|
||||
it('should open buyLabel when is supplier', () => {
|
||||
cy.get(
|
||||
'[to="/null/2"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
|
||||
'[to="/null/3"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
|
||||
).click();
|
||||
cy.get('.q-card__actions > .q-btn').click();
|
||||
cy.window().its('open').should('be.called');
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
/// <reference types="cypress" />
|
||||
describe('Ticket descriptor', () => {
|
||||
const toCloneOpt = '[role="menu"] .q-list > :nth-child(5)';
|
||||
const setWeightOpt = '[role="menu"] .q-list > :nth-child(6)';
|
||||
const listItem = '[role="menu"] .q-list .q-item';
|
||||
const toCloneOpt = 'To clone ticket';
|
||||
const setWeightOpt = 'Set weight';
|
||||
const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span';
|
||||
const summaryHeader = '.summaryHeader > div';
|
||||
const weight = 25;
|
||||
|
|
@ -14,7 +15,7 @@ describe('Ticket descriptor', () => {
|
|||
it('should clone the ticket without warehouse', () => {
|
||||
cy.visit('/#/ticket/1/summary');
|
||||
cy.openActionsDescriptor();
|
||||
cy.get(toCloneOpt).click();
|
||||
cy.contains(listItem, toCloneOpt).click();
|
||||
cy.clickConfirm();
|
||||
cy.get(warehouseValue).contains('Warehouse One');
|
||||
cy.get(summaryHeader)
|
||||
|
|
@ -28,7 +29,7 @@ describe('Ticket descriptor', () => {
|
|||
it('should set the weight of the ticket', () => {
|
||||
cy.visit('/#/ticket/10/summary');
|
||||
cy.openActionsDescriptor();
|
||||
cy.get(setWeightOpt).click();
|
||||
cy.contains(listItem, setWeightOpt).click();
|
||||
cy.intercept('POST', /\/api\/Tickets\/\d+\/setWeight/).as('weight');
|
||||
cy.get('.q-dialog input').type(weight);
|
||||
cy.clickConfirm();
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ describe('VnLocation', () => {
|
|||
`${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(3) > .q-icon`
|
||||
).click();
|
||||
cy.get(
|
||||
`#q-portal--dialog--4 > .q-dialog > ${createForm.prefix} > .vn-row > .q-select > ${createForm.sufix} > :nth-child(1) input`
|
||||
`#q-portal--dialog--5 > .q-dialog > ${createForm.prefix} > .vn-row > .q-select > ${createForm.sufix} > :nth-child(1) input`
|
||||
).should('have.value', province);
|
||||
});
|
||||
});
|
||||
|
|
@ -133,6 +133,8 @@ describe('VnLocation', () => {
|
|||
);
|
||||
cy.get('.q-mt-lg > .q-btn--standard').click();
|
||||
cy.get(`${createForm.prefix}`).should('not.exist');
|
||||
cy.waitForElement('.q-form');
|
||||
|
||||
checkVnLocation(postCode, province);
|
||||
});
|
||||
it('Create city', () => {
|
||||
|
|
@ -144,10 +146,12 @@ describe('VnLocation', () => {
|
|||
cy.get(
|
||||
`${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2) > .q-icon`
|
||||
).click();
|
||||
cy.selectOption('#q-portal--dialog--2 .q-select', 'one');
|
||||
cy.get('#q-portal--dialog--2 .q-input').type(province);
|
||||
cy.get('#q-portal--dialog--2 .q-btn--standard').click();
|
||||
cy.selectOption('#q-portal--dialog--3 .q-select', 'one');
|
||||
cy.get('#q-portal--dialog--3 .q-input').type(province);
|
||||
cy.get('#q-portal--dialog--3 .q-btn--standard').click();
|
||||
cy.get('#q-portal--dialog--1 .q-btn--standard').click();
|
||||
cy.waitForElement('.q-form');
|
||||
|
||||
checkVnLocation(postCode, province);
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue