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

#6942 improve invoiceIn #220

Merged
jorgep merged 63 commits from 6942-improveInvoceIn into dev 2024-05-29 07:03:46 +00:00
Conversation 6 Commits 63 Files Changed 34 +239 -251
3 changed files with 239 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e10e06bcd4 - Show all commits

7
src/components/FetchData.vue
View File

@ -1,5 +1,5 @@
<script setup>
import { h, onMounted } from 'vue';
import { onMounted } from 'vue';
import axios from 'axios';
const $props = defineProps({
@ -24,7 +24,7 @@ const $props = defineProps({
default: '',
},
limit: {
type: String,
type: [String, Number],
default: '',
},
jorgep commented 2024-03-07 14:08:43 +00:00
Review
Copy Link

Elimino el warning de consola.

Elimino el warning de consola.
params: {
@ -60,3 +60,6 @@ async function fetch(fetchFilter = {}) {
}
}
</script>
<template>
<template></template>
</template>

2
src/components/common/VnSelectFilter.vue
View File

@ -151,7 +151,7 @@ watch(modelValue, (newValue) => {
@on-fetch="(data) => setOptions(data)"
:where="where || { [optionValue]: value }"
:limit="limit"
:order-by="orderBy"
:sort-by="sortBy"
:fields="fields"
/>
jorgep commented 2024-03-07 14:08:58 +00:00
Outdated
Review
Copy Link

Elimino warning de consola.

Elimino warning de consola.
<QSelect

79
src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
View File

@ -3,14 +3,13 @@ import { ref, computed } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { useQuasar } from 'quasar';
import axios from 'axios';
import { useArrayData } from 'src/composables/useArrayData';
import { downloadFile } from 'src/composables/downloadFile';
import FormModel from 'components/FormModel.vue';
import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
import FetchData from 'src/components/FetchData.vue';
import axios from 'axios';
import VnRow from 'components/ui/VnRow.vue';
const quasar = useQuasar();
const route = useRoute();
@ -22,6 +21,7 @@ const arrayData = useArrayData('InvoiceIn');
const invoiceIn = computed(() => arrayData.store.data);
jorgep marked this conversation as resolved Outdated
jsegarra commented 2024-05-27 10:46:34 +00:00
Outdated
Review
Copy Link

Usar useRoute().meta.moduleName

Usar useRoute().meta.moduleName
const userConfig = ref(null);
const expenses = ref([]);
const currencies = ref([]);
const currenciesRef = ref();
const companies = ref([]);
@ -174,6 +174,7 @@ async function upsert() {
@on-fetch="(data) => (userConfig = data)"
auto-load
/>
<FetchData url="Expenses" auto-load @on-fetch="(data) => (expenses = data)" />
<FormModel
v-if="invoiceIn"
:url="`InvoiceIns/${route.params.id}`"
@ -181,8 +182,7 @@ async function upsert() {
:auto-load="true"
>
<template #form="{ data }">
<div class="row q-gutter-md q-mb-md">
<div class="col">
<VnRow>
<VnSelectFilter
:label="t('supplierFk')"
v-model="data.supplierFk"
@ -203,29 +203,21 @@ async function upsert() {
</QItem>
</template>
</VnSelectFilter>
</div>
<div class="col">
<QInput
clearable
clear-icon="close"
:label="t('Supplier ref')"
v-model="data.supplierRef"
/>
</div>
</div>
<div class="row q-gutter-md q-mb-md">
<div class="col">
</VnRow>
<VnRow>
<QInput
:label="t('Expedition date')"
v-model="data.issued"
:mask="dateMask"
>
<template #append>
<QIcon
name="event"
class="cursor-pointer"
:fill-mask="fillMask"
>
<QIcon name="event" class="cursor-pointer" :fill-mask="fillMask">
<QPopupProxy
cover
transition-show="scale"
@ -245,8 +237,6 @@ async function upsert() {
</QIcon>
</template>
</QInput>
</div>
<div class="col">
<QInput
:label="t('Operation date')"
v-model="data.operated"
@ -275,18 +265,23 @@ async function upsert() {
</QIcon>
</template>
</QInput>
</div>
</div>
<div class="row q-gutter-md q-mb-md">
<div class="col">
<QInput
</VnRow>
<VnRow>
<VnSelectFilter
:label="t('Undeductible VAT')"
v-model="data.deductibleExpenseFk"
clearable
clear-icon="close"
/>
</div>
<div class="col">
:options="expenses"
option-value="id"
option-label="id"
:filter-options="['id', 'name']"
>
<template #option="scope">
<QItem v-bind="scope.itemProps">
{{ `${scope.opt.id}: ${scope.opt.name}` }}
</QItem>
</template>
</VnSelectFilter>
<QInput
:label="t('Document')"
v-model="data.dmsFk"
@ -333,10 +328,8 @@ async function upsert() {
</QBtn>
</template>
</QInput>
</div>
</div>
<div class="row q-gutter-md q-mb-md">
<div class="col">
</VnRow>
<VnRow>
<QInput
:label="t('Entry date')"
v-model="data.bookEntried"
@ -366,8 +359,7 @@ async function upsert() {
</QIcon>
</template>
</QInput>
</div>
<div class="col">
<QInput
:label="t('Accounted date')"
v-model="data.booked"
@ -397,10 +389,8 @@ async function upsert() {
</QIcon>
</template>
</QInput>
</div>
</div>
<div class="row q-gutter-md q-mb-md">
<div class="col">
</VnRow>
<VnRow>
<VnSelectFilter
:label="t('Currency')"
v-model="data.currencyFk"
@ -408,8 +398,7 @@ async function upsert() {
option-value="id"
option-label="code"
/>
</div>
<div class="col">
<VnSelectFilter
v-if="companiesRef"
:label="t('Company')"
@ -418,17 +407,13 @@ async function upsert() {
option-value="id"
option-label="code"
/>
</div>
</div>
<div class="row q-gutter-md q-mb-md">
<div class="col">
</VnRow>
<VnRow>
<QCheckbox
:label="t('invoiceIn.summary.booked')"
v-model="data.isBooked"
/>
</div>
<div class="col"></div>
</div>
</VnRow>
</template>
</FormModel>
<QDialog ref="editDmsRef">