Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/head This commit looks good
Details
This commit is contained in:
commit
73c6dcfdd1
|
@ -247,6 +247,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
|
|||
}
|
||||
|
||||
function updateStateParams() {
|
||||
if (!route?.path) return;
|
||||
const newUrl = { path: route.path, query: { ...(route.query ?? {}) } };
|
||||
if (store?.searchUrl)
|
||||
newUrl.query[store.searchUrl] = JSON.stringify(store.currentFilter);
|
||||
|
|
|
@ -194,14 +194,14 @@ const getItemPackagingType = (ticketSales) => {
|
|||
redirect="ticket"
|
||||
>
|
||||
<template #column-nickname="{ row }">
|
||||
<span class="link">
|
||||
<span class="link" @click.stop>
|
||||
{{ row.nickname }}
|
||||
<CustomerDescriptorProxy :id="row.clientFk" />
|
||||
</span>
|
||||
</template>
|
||||
|
||||
<template #column-routeFk="{ row }">
|
||||
<span class="link">
|
||||
<span class="link" @click.stop>
|
||||
{{ row.routeFk }}
|
||||
<RouteDescriptorProxy :id="row.routeFk" />
|
||||
</span>
|
||||
|
@ -218,7 +218,7 @@ const getItemPackagingType = (ticketSales) => {
|
|||
<span v-else> {{ toCurrency(row.totalWithVat) }}</span>
|
||||
</template>
|
||||
<template #column-state="{ row }">
|
||||
<span v-if="row.invoiceOut">
|
||||
<span v-if="row.invoiceOut" @click.stop>
|
||||
<span :class="{ link: row.invoiceOut.ref }">
|
||||
{{ row.invoiceOut.ref }}
|
||||
<InvoiceOutDescriptorProxy :id="row.invoiceOut.id" />
|
||||
|
|
|
@ -99,7 +99,7 @@ const travelDialogRef = ref(false);
|
|||
const tableRef = ref();
|
||||
const travel = ref(null);
|
||||
const userParams = ref({
|
||||
dated: Date.vnNew(),
|
||||
dated: Date.vnNew().toJSON(),
|
||||
});
|
||||
|
||||
const filter = ref({
|
||||
|
@ -219,6 +219,7 @@ function round(value) {
|
|||
data-key="StockBoughts"
|
||||
url="StockBoughts/getStockBought"
|
||||
save-url="StockBoughts/crud"
|
||||
search-url="StockBoughts"
|
||||
order="reserve DESC"
|
||||
:right-search="false"
|
||||
:is-editable="true"
|
||||
|
|
|
@ -18,7 +18,7 @@ const $props = defineProps({
|
|||
required: true,
|
||||
},
|
||||
});
|
||||
const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}&date=${$props.dated}`;
|
||||
const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}&dated=${$props.dated}`;
|
||||
const columns = [
|
||||
{
|
||||
align: 'left',
|
||||
|
|
|
@ -27,7 +27,7 @@ onMounted(async () => {
|
|||
<VnFilterPanel
|
||||
:data-key="props.dataKey"
|
||||
:search-button="true"
|
||||
search-url="table"
|
||||
search-url="StockBoughts"
|
||||
@set-user-params="setUserParams"
|
||||
>
|
||||
<template #tags="{ tag, formatFn }">
|
||||
|
@ -36,12 +36,19 @@ onMounted(async () => {
|
|||
<span>{{ formatFn(tag.value) }}</span>
|
||||
</div>
|
||||
</template>
|
||||
<template #body="{ params }">
|
||||
<template #body="{ params, searchFn }">
|
||||
<QItem class="q-my-sm">
|
||||
<QItemSection>
|
||||
<VnInputDate
|
||||
id="date"
|
||||
v-model="params.dated"
|
||||
@update:model-value="
|
||||
(value) => {
|
||||
params.dated = value;
|
||||
setUserParams(params);
|
||||
searchFn();
|
||||
}
|
||||
"
|
||||
:label="t('Date')"
|
||||
is-outlined
|
||||
/>
|
||||
|
|
|
@ -268,6 +268,7 @@ onMounted(() => (stateStore.rightDrawer = false));
|
|||
:label="t('basicData.price')"
|
||||
type="number"
|
||||
min="0"
|
||||
step="any"
|
||||
/>
|
||||
</template>
|
||||
</VnTable>
|
||||
|
|
|
@ -105,11 +105,14 @@ watch(
|
|||
<template #option="{ itemProps, opt }">
|
||||
<QItem v-bind="itemProps">
|
||||
<QItemSection v-if="opt.code">
|
||||
<QItemLabel>{{ opt.code }}</QItemLabel>
|
||||
<QItemLabel caption
|
||||
>{{ opt.town?.province?.name }},
|
||||
{{ opt.town?.province?.country?.name }}</QItemLabel
|
||||
>
|
||||
<QItemLabel>
|
||||
{{ `${opt.code}, ${opt.town?.name}` }}
|
||||
</QItemLabel>
|
||||
<QItemLabel caption>
|
||||
{{
|
||||
`${opt.town?.province?.name}, ${opt.town?.province?.country?.name}`
|
||||
}}
|
||||
</QItemLabel>
|
||||
</QItemSection>
|
||||
</QItem>
|
||||
</template>
|
||||
|
|
|
@ -22,7 +22,12 @@ const agencies = ref([]);
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<FetchData url="agencies" @on-fetch="(data) => (agencies = data)" auto-load />
|
||||
<FetchData
|
||||
url="AgencyModes"
|
||||
:filter="{ fields: ['id', 'name'] }"
|
||||
@on-fetch="(data) => (agencies = data)"
|
||||
auto-load
|
||||
/>
|
||||
<VnFilterPanel
|
||||
:data-key="props.dataKey"
|
||||
:search-button="true"
|
||||
|
|
|
@ -73,6 +73,7 @@ const columns = computed(() => [
|
|||
inWhere: true,
|
||||
attrs: {
|
||||
url: 'AgencyModes',
|
||||
fields: ['id', 'name'],
|
||||
},
|
||||
},
|
||||
columnField: {
|
||||
|
|
Loading…
Reference in New Issue