diff --git a/src/App.vue b/src/App.vue index f5db252..4ffd97a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,5 +1,5 @@ - + - Fiche n° {{ currentTicket.code }} - {{ currentTicket.first_name }} + + Fiche n° {{ currentTicket.code }} - {{ currentTicket.first_name }} {{ currentTicket.last_name }} + + @@ -144,7 +152,7 @@ onMounted(async () => { Archiver les fiches en cours ? + class="fa-solid fa-box-archive"> Archiver les fiches en cours diff --git a/src/components/Messenger.vue b/src/components/Messenger.vue index 720d5c8..2732f27 100644 --- a/src/components/Messenger.vue +++ b/src/components/Messenger.vue @@ -111,12 +111,14 @@ const goToShipment = computed(() => { {{ currentTicket.email }} + Voir la commande Voir l'expédition + @@ -151,10 +153,10 @@ const goToShipment = computed(() => { + :href="'/interface/ase_get_doc.php?prj=pharmamp&display=html&id='+document.id"> - + diff --git a/src/components/base/Modal.vue b/src/components/base/Modal.vue index 2bd10bd..86f7f78 100644 --- a/src/components/base/Modal.vue +++ b/src/components/base/Modal.vue @@ -17,6 +17,11 @@ const props = defineProps({ }) const refModal = ref(null) +const emit = defineEmits(['hide-modal']); +const onHide = () => { + emit('hide-modal'); +}; + const show = computed(() => { return props.show @@ -30,6 +35,7 @@ let BsModal = null onMounted(() => { BsModal = new Modal(refModal.value) + refModal.value.addEventListener('hide.bs.modal', onHide); }) watch(show, async (to, from) => { diff --git a/vite.config.js b/vite.config.js index 4fafc53..f5aa921 100644 --- a/vite.config.js +++ b/vite.config.js @@ -15,6 +15,10 @@ export default defineConfig({ '/App': { target: 'https://gta-pprod.parapharmacie-et-medicament.com/', changeOrigin: true, + }, + '/interface': { + target: 'https://gta-pprod.parapharmacie-et-medicament.com/', + changeOrigin: true, } } },