forked from verdnatura/salix-front
Merge pull request '#6243 load warehouses & iron out column width' (!449) from 6243-fixColumnWidth into dev
Reviewed-on: verdnatura/salix-front#449 Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
commit
fcc41f0e57
|
@ -1,7 +1,8 @@
|
|||
<script setup>
|
||||
import { computed, ref } from 'vue';
|
||||
import { onBeforeMount, computed, ref } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { Notify } from 'quasar';
|
||||
import axios from 'axios';
|
||||
import VnPaginate from 'components/ui/VnPaginate.vue';
|
||||
import { useSession } from 'src/composables/useSession';
|
||||
import { toDate } from 'filters/index';
|
||||
|
@ -29,7 +30,6 @@ const columns = computed(() => [
|
|||
field: (row) => row.hasCmrDms,
|
||||
align: 'center',
|
||||
sortable: true,
|
||||
headerStyle: 'padding-left: 35px',
|
||||
},
|
||||
{
|
||||
name: 'ticketFk',
|
||||
|
@ -62,7 +62,6 @@ const columns = computed(() => [
|
|||
field: (row) => toDate(row.shipped),
|
||||
align: 'center',
|
||||
sortable: true,
|
||||
headerStyle: 'padding-left: 33px',
|
||||
},
|
||||
{
|
||||
name: 'warehouseFk',
|
||||
|
@ -77,6 +76,11 @@ const columns = computed(() => [
|
|||
field: (row) => row.cmrFk,
|
||||
},
|
||||
]);
|
||||
|
||||
onBeforeMount(async () => {
|
||||
const { data } = await axios.get('Warehouses');
|
||||
warehouses.value = data;
|
||||
});
|
||||
function getApiUrl() {
|
||||
return new URL(window.location).origin;
|
||||
}
|
||||
|
@ -187,7 +191,6 @@ function downloadPdfs() {
|
|||
</QPageSticky>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.list {
|
||||
padding-top: 15px;
|
||||
|
@ -204,4 +207,10 @@ function downloadPdfs() {
|
|||
#false {
|
||||
background-color: $negative;
|
||||
}
|
||||
:deep(.q-table th) {
|
||||
max-width: 80px;
|
||||
}
|
||||
:deep(.q-table th:nth-child(3)) {
|
||||
max-width: 100px;
|
||||
}
|
||||
</style>
|
||||
|
|
Loading…
Reference in New Issue