diff --git a/CHANGELOG.md b/CHANGELOG.md index e34523545..fd8a900b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- (Worker) => Se crea la sección Taquilla + ### Fixed - (General) => Se vuelven a mostrar los parámetros en la url al aplicar un filtro diff --git a/package.json b/package.json index 063cf6de4..7be20a842 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "salix-front", - "version": "24.20.0", + "version": "24.22.0", "description": "Salix frontend", "productName": "Salix", "author": "Verdnatura", diff --git a/quasar.config.js b/quasar.config.js index dd7a91002..b59c62eeb 100644 --- a/quasar.config.js +++ b/quasar.config.js @@ -29,7 +29,7 @@ module.exports = configure(function (/* ctx */) { // app boot file (/src/boot) // --> boot files are part of "main.js" // https://v2.quasar.dev/quasar-cli/boot-files - boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar.defaults'], + boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar', 'quasar.defaults'], // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css css: ['app.scss'], diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue index c6a5d665a..6344edd01 100644 --- a/src/components/CreateBankEntityForm.vue +++ b/src/components/CreateBankEntityForm.vue @@ -58,23 +58,19 @@ onMounted(async () => { > diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue index d38ff94df..2d626ed99 100644 --- a/src/components/CreateNewProvinceForm.vue +++ b/src/components/CreateNewProvinceForm.vue @@ -40,24 +40,20 @@ const onDataSaved = (dataSaved) => { > diff --git a/src/components/CreateThermographForm.vue b/src/components/CreateThermographForm.vue index 60c531529..061c47712 100644 --- a/src/components/CreateThermographForm.vue +++ b/src/components/CreateThermographForm.vue @@ -54,51 +54,42 @@ const onDataSaved = (dataSaved) => { > diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue index de4724e55..000de4336 100644 --- a/src/components/CrudModel.vue +++ b/src/components/CrudModel.vue @@ -81,6 +81,7 @@ defineExpose({ hasChanges, saveChanges, getChanges, + formData, }); async function fetch(data) { diff --git a/src/components/EditPictureForm.vue b/src/components/EditPictureForm.vue index 2adbf5f83..a51ca11ad 100644 --- a/src/components/EditPictureForm.vue +++ b/src/components/EditPictureForm.vue @@ -246,61 +246,55 @@ const makeRequest = async () => {
-
- -
+
-
- - - - -
+ + + +
-
- -
+
import { ref, reactive, computed } from 'vue'; import { useI18n } from 'vue-i18n'; -import { useRoute } from 'vue-router'; import VnRow from 'components/ui/VnRow.vue'; import FetchData from 'components/FetchData.vue'; @@ -12,10 +11,16 @@ import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue'; import axios from 'axios'; import { dashIfEmpty } from 'src/filters'; +const props = defineProps({ + url: { + type: String, + required: true, + }, +}); + const emit = defineEmits(['itemSelected']); const { t } = useI18n(); -const route = useRoute(); const itemFilter = { include: [ @@ -73,7 +78,7 @@ const tableColumns = computed(() => [ { label: t('entry.buys.color'), name: 'ink', - field: 'inkName', + field: (row) => row?.ink?.name, align: 'left', }, ]); @@ -100,7 +105,7 @@ const fetchResults = async () => { } filter.where = where; - const { data } = await axios.get(`Entries/${route.params.id}/lastItemBuys`, { + const { data } = await axios.get(props.url, { params: { filter: JSON.stringify(filter) }, }); tableRows.value = data; @@ -147,48 +152,32 @@ const selectItem = ({ id }) => {

{{ t('Filter item') }}

-
- -
-
- -
-
- -
-
- -
-
- -
+ + + + +
{

{{ t('Filter travels') }}

-
- -
-
- -
-
- -
-
- -
-
- -
+ + + + +
{ async function fetch() { try { - const { data } = await axios.get($props.url, { + let { data } = await axios.get($props.url, { params: { filter: JSON.stringify($props.filter) }, }); + + if (Array.isArray(data)) data = data[0] ?? {}; + state.set($props.model, data); originalData.value = data && JSON.parse(JSON.stringify(data)); diff --git a/src/components/RegularizeStockForm.vue b/src/components/RegularizeStockForm.vue index 098f8464d..4f97033b3 100644 --- a/src/components/RegularizeStockForm.vue +++ b/src/components/RegularizeStockForm.vue @@ -50,13 +50,11 @@ const onDataSaved = (data) => { >