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

Merge branch 'master' into hotfix_filter_autoUpdate

This commit is contained in:
Javier Segarra 2025-04-29 14:03:54 +02:00
parent 513333c0c2 fd5a4c370e
commit 87cc066844
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/Customer/components/CustomerFileManagementActions.vue
View File

@ -1,9 +1,9 @@
<script setup> <script setup>
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useRoute, useRouter } from 'vue-router'; import { useRoute, useRouter } from 'vue-router';
import { useQuasar } from 'quasar'; import { useQuasar } from 'quasar';
import { usePrintService } from 'composables/usePrintService';
import { downloadFile } from 'src/composables/downloadFile'; import { downloadFile } from 'src/composables/downloadFile';
import CustomerFileManagementDelete from 'src/pages/Customer/components/CustomerFileManagementDelete.vue'; import CustomerFileManagementDelete from 'src/pages/Customer/components/CustomerFileManagementDelete.vue';
@ -12,7 +12,7 @@ const { t } = useI18n();
const quasar = useQuasar(); const quasar = useQuasar();
const route = useRoute(); const route = useRoute();
const router = useRouter(); const router = useRouter();
const { openReport } = usePrintService();
const $props = defineProps({ const $props = defineProps({
id: { id: {
type: Number, type: Number,
@ -24,7 +24,7 @@ const $props = defineProps({
}, },
}); });
const setDownloadFile = () => downloadFile($props.id); const setDownloadFile = () => openReport(`dms/${$props.id}/downloadFile`, {}, '_blank');
const toCustomerFileManagementEdit = () => { const toCustomerFileManagementEdit = () => {
router.push({ router.push({

4
src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
View File

@ -290,7 +290,7 @@ async function getZone(options) {
</template> </template>
</VnSelect> </VnSelect>
<VnSelect <VnSelect
:label="t('ticketList.warehouse')" :label="t('basicData.warehouse')"
v-model="warehouseId" v-model="warehouseId"
option-value="id" option-value="id"
option-label="name" option-label="name"
@ -298,7 +298,7 @@ async function getZone(options) {
hide-selected hide-selected
map-options map-options
:required="true" :required="true"
:rules="validate('ticketList.warehouse')" :rules="validate('basicData.warehouse')"
/> />
</VnRow> </VnRow>
<VnRow class="row q-gutter-md q-mb-md no-wrap"> <VnRow class="row q-gutter-md q-mb-md no-wrap">

1
src/pages/Ticket/locale/en.yml
View File

@ -120,6 +120,7 @@ basicData:
difference: Difference difference: Difference
total: Total total: Total
price: Price price: Price
warehouse: Warehouse
newPrice: New price newPrice: New price
chargeDifference: Charge difference to chargeDifference: Charge difference to
withoutNegatives: Create without negatives withoutNegatives: Create without negatives

1
src/pages/Ticket/locale/es.yml
View File

@ -47,6 +47,7 @@ basicData:
difference: Diferencia difference: Diferencia
total: Total total: Total
price: Precio price: Precio
warehouse: Almacén
newPrice: Nuevo precio newPrice: Nuevo precio
chargeDifference: Cargar diferencia a chargeDifference: Cargar diferencia a
withoutNegatives: Crear sin negativos withoutNegatives: Crear sin negativos