Skip to content

B
bigwood
Commit 2bd2c795 authored by youjie's avatar youjie
Browse files
Options

no message

parent ff6152be
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 32 deletions
src/components/CharteredBus/order/CharteredBusOrderHeader.vue
View file @ 2bd2c795
<template>
<div class="rounded-borders bg-white row items-center q-pa-md q-mb-md">
<q-select v-if="$q.platform.is.desktop" class="q-mr-md" v-model="search.OrderStatus" @update:model-value="setOrderStatus" dense :options="status" emit-value option-label="StatusName" option-value="StatusId" map-options :label="$t('hotelorder.search.status')" standout />
<q-select v-if="$q.platform.is.desktop" class="q-mr-md" style="min-width: 150px" v-model="search.OrderStatus" @update:model-value="setOrderStatus" dense :options="status" emit-value option-label="StatusName" option-value="StatusId" map-options :label="$t('hotelorder.search.status')" standout />
<q-input v-if="$q.platform.is.desktop" class="q-mr-md" v-model="search.OrderNo" dense standout :label="$t('hotelorder.search.orderNum')" />
<q-field v-if="$q.platform.is.desktop" clearable v-model="dateRangeFormat" :label="$t('hotelorder.search.daterange')" standout class="col-2" style="min-width: 190px" dense @clear="getDateRange">
<div class="self-center full-width no-outline" tabindex="0">{{ dateRangeFormat }}</div>
......
src/components/hotel/order/list/OrderListHeader.vue
View file @ 2bd2c795
<template>
<div class="rounded-borders bg-white row items-center q-pa-md">
<q-select v-if="$q.platform.is.desktop" class="q-mr-md" v-model="search.OrderStatus"
<q-select v-if="$q.platform.is.desktop" class="q-mr-md" style="min-width: 150px" v-model="search.OrderStatus"
@update:model-value="setOrderStatus" dense :options="status" emit-value option-label="StatusName"
option-value="StatusId" map-options :label="$t('hotelorder.search.status')" standout />
<q-input v-if="$q.platform.is.desktop" class="q-mr-md" v-model="search.OrderNo" dense standout
......
src/components/scattered/order/OrderListHeader.vue
View file @ 2bd2c795
<template>
<div class="rounded-borders bg-white row items-center q-pa-md">
<q-select v-if="$q.platform.is.desktop" class="q-mr-md" v-model="search.B2BSelectOrderState" @update:model-value="setOrderStatus" dense :options="status" emit-value option-label="StatusName" option-value="StatusId" map-options :label="$t('hotelorder.search.status')" standout />
<q-select v-if="$q.platform.is.desktop" class="q-mr-md" style="min-width: 150px" v-model="search.B2BSelectOrderState" @update:model-value="setOrderStatus" dense :options="status" emit-value option-label="StatusName" option-value="StatusId" map-options :label="$t('hotelorder.search.status')" standout />
<q-input class="q-mr-md" v-model="search.HotelName" dense standout :label="$t('v101.scatteredOrderList.first')"/>
<div class="col"></div>
<!-- <q-btn v-if="$q.platform.is.mobile" unelevated class="bg-grey-3 hover q-mr-md" :title="$t('morequery')">
......
src/components/ticket/order/TicketOrderHeader.vue
View file @ 2bd2c795
<template>
<div class="rounded-borders bg-white row items-center q-pa-md">
<q-select v-if="$q.platform.is.desktop" class="q-mr-md" v-model="search.OrderStatus" @update:model-value="setOrderStatus" dense :options="status" emit-value option-label="StatusName" option-value="StatusId" map-options :label="$t('hotelorder.search.status')" standout />
<q-select v-if="$q.platform.is.desktop" class="q-mr-md" style="min-width: 150px" v-model="search.OrderStatus" @update:model-value="setOrderStatus" dense :options="status" emit-value option-label="StatusName" option-value="StatusId" map-options :label="$t('hotelorder.search.status')" standout />
<q-input v-if="$q.platform.is.desktop" class="q-mr-md" v-model="search.OrderNo" dense standout :label="$t('hotelorder.search.orderNum')" />
<q-field v-if="$q.platform.is.desktop" clearable v-model="dateRangeFormat" :label="$t('hotelorder.search.daterange')" standout class="col-2" style="min-width: 190px" dense @clear="getDateRange">
<div class="self-center full-width no-outline" tabindex="0">{{ dateRangeFormat }}</div>
......
src/components/vehicle/list/ListHeader.vue
View file @ 2bd2c795
<template>
<div class="rounded-borders bg-white row items-center q-pa-md q-my-md">
<q-select v-if="$q.platform.is.desktop" class="q-mr-md" v-model="searchClone.OfferState" @update:model-value="setOrderStatus" dense :options="status" emit-value option-label="StatusName" option-value="StatusId" map-options :label="$t('hotelorder.search.status')" standout />
<q-input v-if="$q.platform.is.desktop" v-model="searchClone.UseCompName" class="col-2 q-mr-md" reverse-fill-mask dense type="text" standout :label="$t('v102.vehicle.list.s1')" />
<q-select v-if="$q.platform.is.desktop" class="q-mr-md" style="min-width: 150px" v-model="searchClone.OfferState" @update:model-value="setOrderStatus" dense :options="status" emit-value option-label="StatusName" option-value="StatusId" map-options :label="$t('hotelorder.search.status')" standout />
<q-input v-if="$q.platform.is.desktop" class="q-mr-md" type="number" v-model="searchClone.OrderNo" dense standout :label="$t('hotelorder.search.orderNum')" />
<!-- <q-input v-if="$q.platform.is.desktop" v-model="searchClone.UseCompName" class="col-2 q-mr-md" reverse-fill-mask dense type="text" standout :label="$t('v102.vehicle.list.s1')" /> -->
<!-- <q-input v-if="$q.platform.is.desktop" v-model="searchClone.TeamName" class="col-2 q-mr-md" reverse-fill-mask dense type="text" standout :label="$t('v102.vehicle.list.s3')" /> -->
<q-field v-if="$q.platform.is.desktop" stack-label :label="$t('daterange')" standout class="col-2" style="min-width: 190px" dense>
<div class="self-center full-width no-outline" tabindex="0">{{ dateRangeFormat }}</div>
......@@ -20,16 +21,16 @@
<div class="q-my-md" v-if="$q.platform.is.mobile">
<q-select v-model="searchClone.OfferState" @update:model-value="setOrderStatus" dense :options="status" emit-value option-label="StatusName" option-value="StatusId" map-options :label="$t('hotelorder.search.status')" standout />
</div>
<div class="q-my-md">
<!-- <div class="q-my-md">
<q-input v-model="searchClone.UseName" class="col-2" reverse-fill-mask dense type="text" standout :label="$t('v102.vehicle.list.s2')" />
</div>
<div class="q-my-md" v-if="$q.platform.is.mobile">
<q-input v-model="searchClone.UseCompName" class="col-2" reverse-fill-mask dense type="text" standout :label="$t('v102.vehicle.list.s1')" />
</div>
</div> -->
<div class="q-my-md">
<q-input v-model="searchClone.TeamName" class="col-2" reverse-fill-mask dense type="text" standout :label="$t('v102.vehicle.list.s3')" />
</div>
<div class="q-my-md">
<div class="q-my-md" v-if="$q.platform.is.mobile">
<q-input type="number" v-model="searchClone.OrderNo" dense standout :label="$t('hotelorder.search.orderNum')" />
</div>
<div class="q-my-md">
......
src/components/vehicle/list/ListTable.vue
View file @ 2bd2c795
......@@ -12,11 +12,11 @@
<q-btn color="dark" flat size="sm" :label="$t('hotelorder.copy')" v-if="copyId != x.Id" @click="setCopyHandler(x)" />
<q-btn color="cyan" icon="check" outline size="sm" :label="$t('hotelorder.copyed')" v-else></q-btn>
</div>
<!-- <div class="col text-center f12 text-grey-6">
<span>{{ $t('v102.ticket.sj') }}：{{ x.UseCompName }}/{{
<div class="col text-center f12 text-grey-6">
<!-- <span>{{ $t('v102.ticket.sj') }}：{{ x.UseCompName }}/{{
x.UseName
}}</span>
</div> -->
}}</span> -->
</div>
<div class="f12 text-grey-6">{{ $t('hotelorder.createTime') }}：{{ x.CreateDate }}</div>
<div class="q-ml-md f12" :class="[x.typeInfo.Color]">
<q-icon :name="x.typeInfo.Icon" />
......@@ -100,14 +100,17 @@
</template>
<template v-slot:body-cell-HandFittingFee="props">
<q-td :props="props" :colspan="x.DetailList.length" v-if="props.rowIndex == 0" >
{{ moneyFormat(x.ShouPeiFee)?moneyFormat(x.ShouPeiFee):$t('v102.vehicle.nomoney') }}
<div class="q-mt-sm" v-if="x.ShouPeiFee==0">
<div class="q-mt-sm" v-if="x.OfferState!=2">
<q-btn size="sm" dense outline color="primary" v-if="x.ContractUrl">
<a class="text-primary" style="text-decoration:none"
:href="x.ContractUrl">{{ $t('v101.downloadHands') }}</a>
</q-btn>
<span class="text-grey-500 f12">{{ $t('v101.noneHands') }}</span>
</div>
<template v-else>
{{ moneyFormat(x.ShouPeiFee)?moneyFormat(x.ShouPeiFee):$t('v102.vehicle.nomoney') }}
</template>
</q-td>
</template>
......@@ -127,11 +130,10 @@
<div class="f12 text-grey">{{ $t('hotelorder.orderMoney') }}</div>
<div class="dark q-ml-xl">
<span class="din text-subtitle1">
<!-- {{ moneyFormat(x.totalMoney) }} -->
{{ x.totalMoney.toFixed(2) }}
{{ moneyFormat(x.totalMoney)>0?moneyFormat(x.totalMoney):$t('v102.vehicle.nomoney') }}
<!-- {{ x.totalMoney.toFixed(2) }} -->
</span>
<span class="f12">
<!-- {{ $t('unit.jp') }} -->
<span class="f12" v-if="moneyFormat(x.totalMoney)>0">
{{x.CurrencyCode}}
</span>
</div>
......@@ -141,7 +143,7 @@
</div>
</div>
<div class="rounded-borders q-pa-sm justify-between" :class="{ column: $q.platform.is.desktop, 'row items-center': $q.platform.is.mobile, 'bg-green-1': x.OfferState != 1, 'bg-grey-2': x.OfferState == 1 }">
<q-list dense v-if="x.OfferState != 3" :class="{ 'row items-center justify-between full-width': $q.platform.is.mobile }">
<q-list dense v-if="x.OfferState != 2" :class="{ 'row items-center justify-between full-width': $q.platform.is.mobile }">
<q-item v-if="x.OfferState == 1" class="text-negative" clickable v-close-popup @click="cancel(x.Id)">
<q-item-section>
<q-item-label>{{ $t('hotelorder.opera.cancel') }}</q-item-label>
......@@ -152,18 +154,17 @@
<q-item-label>{{ $t('hotelorder.opera.edit') }}</q-item-label>
</q-item-section>
</q-item>
<q-item class="text-positive" clickable v-close-popup @click="details(x.Id)">
<!-- <q-item class="text-positive" clickable v-close-popup @click="details(x.Id)">
<q-item-section>
<q-item-label>{{$t('v102.vehicle.list.s9')}}</q-item-label>
</q-item-section>
</q-item>
</q-item> -->
</q-list>
<div v-else>
<div class="f12 text-green-4">{{ $t('hotelorder.payed') }}</div>
<div class="text-subtitle1 din text-green-14">
{{ x.totalMoney.toFixed(2) }}
{{ moneyFormat(x.totalMoney) }}
<span class="text-green-4 f12">
<!-- {{ $t('unit.jp') }} -->
{{x.CurrencyCode}}
</span>
</div>
......@@ -227,7 +228,6 @@ export default defineComponent({
CancelRemark: '',
Id: 0,
loading: false,
loading: false,
pages: {
pageIndex: 1,
pageSize: 5,
......@@ -334,9 +334,11 @@ export default defineComponent({
$router.push({ path: `/vehicle/addEditVehicle${data.Id ? '/' + data.Id : ''}` })
},
getList() {
data.loading = true
let param = Object.assign(data.pages, search.msg)
HotelService.vehicleList(param)
.then(r => {
data.loading = false
if (r.data.resultCode == ApiResult.SUCCESS) {
r.data.data.pageData.forEach((x: any) => {
x.typeInfo = data.status.find(y => y.StatusId == x.OfferState) ?? data.status[1]
......
src/i18n/zh-TW/index.ts
View file @ 2bd2c795
......@@ -987,7 +987,8 @@ export default {
ms: '訂單明細',
ds: '訂單總天數',
nt: '沒有訂單信息',
zuo: '座'
zuo: '座',
nomoney: '暫未報價',
},
CharteredBus:{
jiesongdianfw: '接送點範圍',
......
src/pages/vehicle/addEditVehicle.vue
View file @ 2bd2c795
......@@ -47,8 +47,14 @@
<div>
<div class="text-h6 q-mb-md">{{ $t('v102.vehicle.dindanxinxi') }}</div>
<q-table separator="cell" :hide-bottom="search.details.length>0?true:false" :pagination="{ rowsPerPage: 100000 }" :rows="search.details" bordered :columns="cols" class="sticky-right-column-table light-border col no-shadow">
<template v-slot:body-cell-UseDate="props">
<q-td :props="props" style="width: 160px;">
{{props.row.UseDate}}
<span class="q-pl-sm text-grey-6">{{$t('v102.vehicle.di')}}{{props.row.DayNum}}{{$t('v102.vehicle.tian')}}</span>
</q-td>
</template>
<template v-slot:body-cell-UseType="props">
<q-td :props="props">
<q-td :props="props" style="width: 150px;">
<q-select unelevated v-model="props.row.UseType" dense :options="listvehicle" emit-value option-label="Name" option-value="Id" map-options :label="$t('v102.vehicle.title9')" standout :rules="[ val => val || '']" :ref="guestUseType" >
</q-select>
</q-td>
......@@ -63,7 +69,7 @@
</q-td>
</template>
<template v-slot:body-cell-operation="props">
<q-td :props="props">
<q-td :props="props" style="width: 90px;">
<q-btn class="q-ml-sm" color="warning" size="sm" unelevated :label="$t('v102.vehicle.tatle.th6')" @click="deleteLine(props.rowindex)"/>
</q-td>
</template>
......@@ -108,7 +114,7 @@
</span>
</div>
<div class="text-right">
<q-btn color="primary" unelevated class="q-px-lg" :disable="!isCheck" :label="`${!search.Id?$t('v102.ticket.sb'):$t('v102.CharteredBus.bianji')}`" @click="submit"/>
<q-btn :loading="loading" color="primary" unelevated class="q-px-lg" :disable="!isCheck" :label="`${!search.Id?$t('v102.ticket.sb'):$t('v102.CharteredBus.bianji')}`" @click="submit"/>
</div>
</div>
</div>
......@@ -203,7 +209,7 @@ export default defineComponent({
pages: '',
cols: [
{ name: 'UseDate', label: t('v102.vehicle.tatle.th1'), field: (row: any) => row.UseDate, align: 'left' },
{ name: 'DayNum', label: t('v102.vehicle.tatle.th2'), field: (row: any) => row.DayNum, align: 'left' },
// { name: 'DayNum', label: t('v102.vehicle.tatle.th2'), field: (row: any) => row.DayNum, align: 'left' },
{ name: 'UseType', label: t('v102.vehicle.tatle.th3'), field: (row: any) => row, align: 'left' },
{ name: 'TripInfo', label: t('v102.vehicle.tatle.th4'), field: (row: any) => row, align: 'left' },
{ name: 'operation', label: t('v102.vehicle.tatle.th5'), field: (row: any) => row, align: 'left' }
......@@ -294,7 +300,7 @@ export default defineComponent({
.then(r => {
if (r.data.resultCode == ApiResult.SUCCESS) {
r.data.data.forEach((x:any)=>{
x.labelName = `${x.Name}(${x.SeatNum}${$t('v102.vehicle.zuo')})`
x.labelName = `${x.Name}(${x.SeatNum}${t('v102.vehicle.zuo')})`
})
data.vehicletop = r.data.data
......@@ -451,9 +457,10 @@ export default defineComponent({
if(!flag) return
if(!guestRefArr) return
data.loading = true
HotelService.vehicletripbus(data.search)
.then(r => {
data.loading = false
if (r.data.resultCode == ApiResult.SUCCESS) {
data.isCheck = false
context.emit('refresh')
......@@ -463,6 +470,7 @@ export default defineComponent({
}
})
.catch(e => {
data.loading = false
message.errorMsg(e.message)
})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment