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

7658-devToTest_2428 #508

Merged
alexm merged 392 commits from 7658-devToTest_2428 into test 2024-07-02 10:38:20 +00:00
Conversation 0 Commits 392 Files Changed 131 +10 -13
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d29bf09535 - Show all commits

2
src/components/ui/VnImg.vue
View File

@ -32,7 +32,7 @@ const url = computed(
() => () =>
`/api/${$props.storage}/${$props.collection}/${$props.size}/${$props.id}/download?access_token=${token}&${timeStamp.value}` `/api/${$props.storage}/${$props.collection}/${$props.size}/${$props.id}/download?access_token=${token}&${timeStamp.value}`
); );
const reload = (emit = false) => { const reload = () => {
timeStamp.value = `timestamp=${Date.now()}`; timeStamp.value = `timestamp=${Date.now()}`;
}; };
defineExpose({ defineExpose({

1
src/pages/Account/Card/AccountBasicData.vue
View File

@ -3,7 +3,6 @@ import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import VnSelect from 'src/components/common/VnSelect.vue'; import VnSelect from 'src/components/common/VnSelect.vue';
import FormModel from 'components/FormModel.vue'; import FormModel from 'components/FormModel.vue';
import VnRow from 'components/ui/VnRow.vue';
import VnInput from 'src/components/common/VnInput.vue'; import VnInput from 'src/components/common/VnInput.vue';
import { ref, watch } from 'vue'; import { ref, watch } from 'vue';

1
src/pages/Route/RouteList.vue
View File

@ -1,5 +1,4 @@
<script setup> <script setup>
import { useStateStore } from 'stores/useStateStore';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { computed, onMounted, ref } from 'vue'; import { computed, onMounted, ref } from 'vue';
import { dashIfEmpty, toHour } from 'src/filters'; import { dashIfEmpty, toHour } from 'src/filters';

2
src/pages/Route/RouteRoadmap.vue
View File

@ -128,7 +128,7 @@ function confirmRemove() {
.onOk(() => refreshKey.value++); .onOk(() => refreshKey.value++);
} }
function navigateToRoadmapSummary(event, { id }) { function navigateToRoadmapSummary(_, { id }) {
router.push({ name: 'RoadmapSummary', params: { id } }); router.push({ name: 'RoadmapSummary', params: { id } });
} }
</script> </script>

17
src/pages/Ticket/Card/TicketSale.vue
View File

@ -353,15 +353,14 @@ const newOrderFromTicket = async () => {
}; };
const goToLog = (saleId) => { const goToLog = (saleId) => {
//TODO: Redireccionar cuando exista la vista TicketLog router.push({
// router.push({ name: 'TicketLog',
// name: 'TicketLog', params: {
// params: { originId: route.params.id,
// originId: route.params.id, changedModel: 'Sale',
// changedModel: 'Sale', changedModelId: saleId,
// changedModelId: saleId, },
// }, });
// });
}; };
const changeTicketState = async (val) => { const changeTicketState = async (val) => {