diff --git a/src/components/AttachmentsModal.vue b/src/components/AttachmentsModal.vue index e0bb95d..7090d09 100644 --- a/src/components/AttachmentsModal.vue +++ b/src/components/AttachmentsModal.vue @@ -8,10 +8,12 @@ const { getAttachmentLoad, loading, attachments } = useAttachments(); onMounted(() => { + console.log('se ejcyta attach'); getAttachmentLoad(); }) const clearLoad = () => { + loadStore.openAttachmentsModal = false; loadStore.currentLoad = null; } diff --git a/src/components/CardLoad.vue b/src/components/CardLoad.vue index 3880b40..a4b75fb 100644 --- a/src/components/CardLoad.vue +++ b/src/components/CardLoad.vue @@ -13,13 +13,19 @@ } }) - const setLoad = () => { + const openAttachmentsModal = () => { loadsStore.currentLoad = props.load; + loadsStore.openAttachmentsModal = true; } const openEditModal = () => { - loadsStore.openModalEdit = true; loadsStore.currentLoad = props.load + loadsStore.openModalEdit = true; + } + + const openProposalsModal = () => { + loadsStore.currentLoad = props.load + loadsStore.openProposalsModal = true; } @@ -74,7 +80,7 @@ type="button" data-toggle="modal" data-target="#attachmentModal" class="btn-primary-sm" - @click="setLoad" + @click="openAttachmentsModal" > Evidencias @@ -86,7 +92,9 @@ > Editar carga diff --git a/src/components/ProposalsModal.vue b/src/components/ProposalsModal.vue new file mode 100644 index 0000000..534e219 --- /dev/null +++ b/src/components/ProposalsModal.vue @@ -0,0 +1,142 @@ + + + + + \ No newline at end of file diff --git a/src/components/VehicleInfo.vue b/src/components/VehicleInfo.vue new file mode 100644 index 0000000..0f1e2a4 --- /dev/null +++ b/src/components/VehicleInfo.vue @@ -0,0 +1,35 @@ + + + + + \ No newline at end of file diff --git a/src/stores/loads.js b/src/stores/loads.js index 3df1559..830f18a 100644 --- a/src/stores/loads.js +++ b/src/stores/loads.js @@ -4,9 +4,12 @@ import api from "../lib/axios"; export const useLoadsStore = defineStore('load', () => { const companyid = localStorage.getItem('id'); - const currentLoad = ref(null); - const loads = ref([]) - const openModalEdit = ref(false); + const currentLoad = ref(null); + const loads = ref([]) + const proposalsOfLoads = ref([]); + const openModalEdit = ref(false); + const openAttachmentsModal = ref(false); + const openProposalsModal = ref(false); const getCompanyLoads = async(filterQuery) => { @@ -19,7 +22,6 @@ export const useLoadsStore = defineStore('load', () => { console.log(filterStr); try { const endpoint = `/loads?company=${companyid}&${filterStr}`; - console.log(endpoint); const {data} = await api.get(endpoint); loads.value = data.data; } catch (error) { @@ -28,11 +30,28 @@ export const useLoadsStore = defineStore('load', () => { } } + const getProposalsOfLoads = async(filterQuery) => { + try { + const endpoint = `/proposals/?load=${filterQuery}`; + console.log(endpoint); + const {data} = await api.get(endpoint); + console.log(data); + proposalsOfLoads.value = data.data; + } catch (error) { + proposalsOfLoads.value = []; + console.log(error); + } + } + return { - currentLoad, openModalEdit, + openProposalsModal, + openAttachmentsModal, + getProposalsOfLoads, getCompanyLoads, loads, + currentLoad, + proposalsOfLoads, } }); \ No newline at end of file diff --git a/src/views/LoadsPublishedView.vue b/src/views/LoadsPublishedView.vue index 345b628..5cfbe8b 100644 --- a/src/views/LoadsPublishedView.vue +++ b/src/views/LoadsPublishedView.vue @@ -6,6 +6,7 @@ import AttachmentsModal from '../components/AttachmentsModal.vue'; import { useLoadsStore } from '../stores/loads'; import FormLoadModal from '../components/FormLoadModal.vue'; +import ProposalsModal from '../components/ProposalsModal.vue'; const companyStore = useCompanyStore(); const loadStore = useLoadsStore(); @@ -65,8 +66,9 @@