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

Merge pull request 'FIX Merge PR-CUSTOMER' (!309) from fix_Customer_merge into dev
gitea/salix-front/pipeline/head This commit looks good Details 

Reviewed-on: #309
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Javier Segarra 2024-04-22 05:04:51 +00:00
parent ea4f72abf9 edd1b66110
commit c1f64b88b4
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/ui/VnNotes.vue
View File

@ -1,6 +1,6 @@
<script setup> <script setup>
import VnAvatar from 'src/components/ui/VnAvatar.vue'; import VnAvatar from 'src/components/ui/VnAvatar.vue';
import { toDateHourMinSec } from 'src/filters'; import { toDateHourMin } from 'src/filters';
import { ref } from 'vue'; import { ref } from 'vue';
import axios from 'axios'; import axios from 'axios';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
@ -92,7 +92,7 @@ async function insert() {
:name="`${note.worker.user.nickname}`" :name="`${note.worker.user.nickname}`"
:worker-id="note.worker.id" :worker-id="note.worker.id"
/> />
{{ toDateHour(note.created) }} {{ toDateHourMin(note.created) }}
</div> </div>
</QCardSection> </QCardSection>
<QCardSection class="q-pa-xs q-my-none q-py-none"> <QCardSection class="q-pa-xs q-my-none q-py-none">

6
src/pages/Route/Roadmap/RoadmapDescriptor.vue
View File

@ -5,9 +5,9 @@ import { useI18n } from 'vue-i18n';
import CardDescriptor from 'components/ui/CardDescriptor.vue'; import CardDescriptor from 'components/ui/CardDescriptor.vue';
import VnLv from 'components/ui/VnLv.vue'; import VnLv from 'components/ui/VnLv.vue';
import useCardDescription from 'composables/useCardDescription'; import useCardDescription from 'composables/useCardDescription';
import {dashIfEmpty, toDateHour} from 'src/filters'; import { dashIfEmpty, toDateHourMin } from 'src/filters';
import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue'; import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
import RoadmapDescriptorMenu from "pages/Route/Roadmap/RoadmapDescriptorMenu.vue"; import RoadmapDescriptorMenu from 'pages/Route/Roadmap/RoadmapDescriptorMenu.vue';
const $props = defineProps({ const $props = defineProps({
id: { id: {
@ -41,7 +41,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
> >
<template #body="{ entity }"> <template #body="{ entity }">
<VnLv :label="t('Roadmap')" :value="entity?.name" /> <VnLv :label="t('Roadmap')" :value="entity?.name" />
<VnLv :label="t('ETD')" :value="toDateHour(entity?.etd)" /> <VnLv :label="t('ETD')" :value="toDateHourMin(entity?.etd)" />
<VnLv :label="t('Carrier')"> <VnLv :label="t('Carrier')">
<template #value> <template #value>
<span class="link" v-if="entity?.supplier?.id"> <span class="link" v-if="entity?.supplier?.id">

6
src/pages/Route/Roadmap/RoadmapSummary.vue
View File

@ -3,7 +3,7 @@ import { computed, onMounted, onUnmounted, ref } from 'vue';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { QIcon, useQuasar } from 'quasar'; import { QIcon, useQuasar } from 'quasar';
import { dashIfEmpty, toDateHour } from 'src/filters'; import { dashIfEmpty, toDateHourMin } from 'src/filters';
import { useStateStore } from 'stores/useStateStore'; import { useStateStore } from 'stores/useStateStore';
import VnLv from 'components/ui/VnLv.vue'; import VnLv from 'components/ui/VnLv.vue';
import CardSummary from 'components/ui/CardSummary.vue'; import CardSummary from 'components/ui/CardSummary.vue';
@ -44,7 +44,7 @@ const columns = ref([
{ {
name: 'ETA', name: 'ETA',
label: t('ETA'), label: t('ETA'),
field: (row) => toDateHour(row?.eta), field: (row) => toDateHourMin(row?.eta),
sortable: false, sortable: false,
align: 'left', align: 'left',
}, },
@ -91,7 +91,7 @@ const openAddStopDialog = () => {
</span> </span>
</template> </template>
</VnLv> </VnLv>
<VnLv :label="t('ETD')" :value="toDateHour(entity?.etd)" /> <VnLv :label="t('ETD')" :value="toDateHourMin(entity?.etd)" />
<VnLv <VnLv
:label="t('Tractor Plate')" :label="t('Tractor Plate')"
:value="dashIfEmpty(entity?.tractorPlate)" :value="dashIfEmpty(entity?.tractorPlate)"

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

@ -3,7 +3,7 @@ import VnPaginate from 'components/ui/VnPaginate.vue';
import { useStateStore } from 'stores/useStateStore'; import { useStateStore } from 'stores/useStateStore';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { computed, onMounted, onUnmounted, ref } from 'vue'; import { computed, onMounted, onUnmounted, ref } from 'vue';
import { dashIfEmpty, toDateHour } from 'src/filters'; import { dashIfEmpty, toDateHourMin } from 'src/filters';
import { useQuasar } from 'quasar'; import { useQuasar } from 'quasar';
import toCurrency from 'filters/toCurrency'; import toCurrency from 'filters/toCurrency';
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue'; import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
@ -46,7 +46,7 @@ const columns = computed(() => [
{ {
name: 'ETD', name: 'ETD',
label: t('ETD'), label: t('ETD'),
field: (row) => toDateHour(row.etd), field: (row) => toDateHourMin(row.etd),
sortable: true, sortable: true,
align: 'left', align: 'left',
}, },