8315-devToTest #1094

Merged
alexm merged 253 commits from 8315-devToTest into test 2024-12-18 10:31:55 +00:00
1 changed files with 61 additions and 65 deletions
Showing only changes of commit 997a6d18bc - Show all commits

View File

@ -86,71 +86,67 @@ async function getVideoList(expeditionId, timed) {
<template> <template>
<Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()"> <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
<QScrollArea class="fit"> <QList bordered separator style="max-width: 318px">
<QList bordered separator style="max-width: 318px"> <QItem v-if="lastExpedition && videoList.length">
<QItem v-if="lastExpedition && videoList.length"> <QItemSection>
<QItemSection> <QItemLabel class="text-h6">
<QItemLabel class="text-h6"> {{ t('ticket.boxing.selectTime') }} ({{ time.min }}-{{
{{ t('ticket.boxing.selectTime') }} ({{ time.min }}-{{ time.max
time.max }})
}}) </QItemLabel>
</QItemLabel> <QRange
<QRange v-model="time"
v-model="time" @change="getVideoList(lastExpedition, time)"
@change="getVideoList(lastExpedition, time)" :min="0"
:min="0" :max="24"
:max="24" :step="1"
:step="1" :left-label-value="time.min + ':00'"
:left-label-value="time.min + ':00'" :right-label-value="time.max + ':00'"
:right-label-value="time.max + ':00'" label
label markers
markers snap
snap color="primary"
color="primary" />
/> </QItemSection>
</QItemSection> </QItem>
</QItem> <QItem v-if="lastExpedition && videoList.length">
<QItem v-if="lastExpedition && videoList.length"> <QItemSection>
<QItemSection> <QSelect
<QSelect color="primary"
color="primary" v-model="slide"
v-model="slide" :options="videoList"
:options="videoList" :label="t('ticket.boxing.selectVideo')"
:label="t('ticket.boxing.selectVideo')" emit-value
emit-value map-options
map-options >
> <template #prepend>
<template #prepend> <QIcon name="schedule" />
<QIcon name="schedule" /> </template>
</template> </QSelect>
</QSelect> </QItemSection>
</QItemSection> </QItem>
</QItem> <QItem
<QItem v-for="expedition in expeditions"
v-for="expedition in expeditions" :key="expedition.id"
:key="expedition.id" @click="getVideoList(expedition.id)"
@click="getVideoList(expedition.id)" clickable
clickable v-ripple
v-ripple >
> <QItemSection>
<QItemSection> <QItemLabel class="text-h6">#{{ expedition.id }}</QItemLabel>
<QItemLabel class="text-h6">#{{ expedition.id }}</QItemLabel> </QItemSection>
</QItemSection> <QItemSection>
<QItemSection> <QItemLabel caption>{{ t('globals.created') }}</QItemLabel>
<QItemLabel caption>{{ t('globals.created') }}</QItemLabel> <QItemLabel>
<QItemLabel> {{ date.formatDate(expedition.created, 'YYYY-MM-DD HH:mm:ss') }}
{{ </QItemLabel>
date.formatDate(expedition.created, 'YYYY-MM-DD HH:mm:ss') <QItemLabel caption>{{ t('globals.item') }}</QItemLabel>
}} <QItemLabel>{{ expedition.packagingItemFk }}</QItemLabel>
</QItemLabel> <QItemLabel caption>{{ t('ticket.boxing.worker') }}</QItemLabel>
<QItemLabel caption>{{ t('globals.item') }}</QItemLabel> <QItemLabel>{{ expedition.userName }}</QItemLabel>
<QItemLabel>{{ expedition.packagingItemFk }}</QItemLabel> </QItemSection>
<QItemLabel caption>{{ t('ticket.boxing.worker') }}</QItemLabel> </QItem>
<QItemLabel>{{ expedition.userName }}</QItemLabel> </QList>
</QItemSection>
</QItem>
</QList>
</QScrollArea>
</Teleport> </Teleport>
<QCard> <QCard>