Skip to content

B
bigwood
Commit 21d6b218 authored by youjie's avatar youjie
Browse files
Options

no message

parent a605d710
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 23 deletions
src/components/hotel/list/ListHeader.vue
View file @ 21d6b218
...@@ -11,9 +11,11 @@ ...@@ -11,9 +11,11 @@
@range-end="dateRangeHandler"></q-date> @range-end="dateRangeHandler"></q-date>
</q-popup-proxy> </q-popup-proxy>
</q-field> </q-field>
<n-select v-if="$q.platform.is.desktop" filterable @update:value="changeHotel" class="q-ml-lg col-2" <!-- <n-select v-if="$q.platform.is.desktop" filterable @update:value="changeHotel" class="q-ml-lg col-2"
style="min-width: 190px" clearable v-model:value="search.HotelChooseArray" :placeholder="$t('hotel.searchName')" style="min-width: 190px" clearable v-model:value="search.HotelChooseArray" :placeholder="$t('hotel.searchName')"
multiple :options="cacheHotels" max-tag-count="responsive" size="large" value-field="ID" label-field="Name" /> multiple :options="cacheHotels" max-tag-count="responsive" size="large" value-field="ID" label-field="Name" /> -->
<q-input v-if="$q.platform.is.desktop" class="q-ml-lg col-2" style="min-width: 190px" v-model="search.HotelName" reverse-fill-mask dense type="text"
standout :label="$t('hotel.searchName')" />
<div class="col"></div> <div class="col"></div>
<q-btn unelevated class="bg-grey-3 hover q-mr-md" icon="shopping_cart" :title="$t('hotel.car.shoppingTitle')" <q-btn unelevated class="bg-grey-3 hover q-mr-md" icon="shopping_cart" :title="$t('hotel.car.shoppingTitle')"
@click="rightCarOpen = true"> @click="rightCarOpen = true">
...@@ -43,9 +45,11 @@ ...@@ -43,9 +45,11 @@
</q-field> </q-field>
</div> </div>
<div v-if="$q.platform.is.mobile"> <div v-if="$q.platform.is.mobile">
<n-select filterable style="min-width: 190px" clearable v-model:value="search.HotelChooseArray" <!-- <n-select filterable style="min-width: 190px" clearable v-model:value="search.HotelChooseArray"
:placeholder="$t('hotel.searchName')" multiple :options="cacheHotels" max-tag-count="responsive" :placeholder="$t('hotel.searchName')" multiple :options="cacheHotels" max-tag-count="responsive"
size="large" value-field="ID" label-field="Name" /> size="large" value-field="ID" label-field="Name" /> -->
<q-input v-model="search.HotelName" reverse-fill-mask dense type="text"
standout :label="$t('hotel.searchName')" />
</div> </div>
<div class="q-my-md"> <div class="q-my-md">
<q-select v-model="search.Star" dense :options="hotelsRates" emit-value option-label="name" <q-select v-model="search.Star" dense :options="hotelsRates" emit-value option-label="name"
...@@ -218,6 +222,7 @@ export default defineComponent({ ...@@ -218,6 +222,7 @@ export default defineComponent({
if (search.Province > 0) setCnt++ if (search.Province > 0) setCnt++
if (search.StartDate.length > 0) setCnt++ if (search.StartDate.length > 0) setCnt++
if (search.HotelChooseArray.length > 0) setCnt++ if (search.HotelChooseArray.length > 0) setCnt++
if (search.HotelName) setCnt++
} }
if (search.Star != 0) setCnt++ if (search.Star != 0) setCnt++
if (search.MaxPrice.length > 0) setCnt++ if (search.MaxPrice.length > 0) setCnt++
...@@ -225,7 +230,7 @@ export default defineComponent({ ...@@ -225,7 +230,7 @@ export default defineComponent({
return setCnt return setCnt
}) })
methods.initAddress() methods.initAddress()
methods.initHotels() // methods.initHotels() //检索酒店名称下拉
watch(cars.value, (n, o) => { watch(cars.value, (n, o) => {
localStorage.setItem(DirtionmaryHelper.HOTEL_HOTELCARS_CACHE, JSON.stringify(cars.value)) localStorage.setItem(DirtionmaryHelper.HOTEL_HOTELCARS_CACHE, JSON.stringify(cars.value))
}) })
......
src/components/vehicle/vehicleDetails.vue
View file @ 21d6b218
<template> <template>
<q-card class="bg-white q-pa-lg column" style="max-width: 600px; min-width: 375px; width: 50%;"> <q-card class="bg-white q-pa-lg column" style="max-width: 600px; min-width: 375px; width: 50%;">
<div class="row justify-between" :class="{'q-px-lg q-mb-lg':$q.platform.is.desktop,'q-mb-md':$q.platform.is.mobile}">
<div class="text-weight-bold" :class="{'fz20':$q.platform.is.desktop,'fz16':$q.platform.is.mobile}">
<span class="inline-block">{{ $t('v102.vehicle.list.s9') }}</span>
</div>
<q-icon class="text-grey-13 cursor-pointer" name="close" :size="$q.platform.is.desktop?'md':'sm'" v-close-popup></q-icon>
</div>
<div> <div>
<div class="text-h6 q-mb-md">{{ $t('v102.vehicle.list.s9') }}</div> <div class="row" :style="{'width':$q.platform.is.mobile?'80vw':'','overflow': $q.platform.is.mobile?'hidden':'auto'}">
<q-table separator="cell" :hide-bottom="postMsg&&postMsg.details?true:false" :pagination="{ rowsPerPage: 100000 }" :rows="postMsg.details" bordered :columns="cols" class="sticky-right-column-table light-border col no-shadow"> <q-table separator="cell" :hide-bottom="postMsg&&postMsg.details?true:false" :pagination="{ rowsPerPage: 100000 }" :rows="postMsg.details" bordered :columns="cols" class="sticky-right-column-table light-border col no-shadow">
<template v-slot:body-cell-UseDate="props"> <template v-slot:body-cell-UseDate="props">
<q-td :props="props" style="width: 130px;"> <q-td :props="props" style="width: 130px;">
<div class="room-item f12 text-grey-6"> <div class="room-item f12 text-grey-6">
<span class="q-mr-md"> <span class="q-mr-md">
{{ props.row.UseDate }}</span> {{ props.row.UseDate }}</span>
<span class="q-mr-md"> {{ $t('v102.vehicle.di') }}{{props.row.DayNum}}{{ $t('v102.vehicle.tian') }} </span> <span class="q-mr-md"> {{ $t('v102.vehicle.di') }}{{props.row.DayNum}}{{ $t('v102.vehicle.tian') }} </span>
</div> </div>
</q-td> </q-td>
</template> </template>
</q-table> </q-table>
</div>
<div class="row justify-between q-py-lg"> <div class="row justify-between q-py-lg">
<span> <span>
<span class="text-grey-6">{{ $t('v102.vehicle.list2.s29') }}：</span> <span class="text-grey-6">{{ $t('v102.vehicle.list2.s29') }}：</span>
...@@ -27,11 +34,11 @@ ...@@ -27,11 +34,11 @@
</span> </span>
</div> </div>
<div class="row"> <div class="row">
<span class="col-6" v-if="postMsg.Remark"> <span v-if="postMsg.Remark" :class="{'col-6':$q.platform.is.desktop,'col-12':$q.platform.is.mobile}">
<span class="text-grey-6">{{ $t('v102.vehicle.list2.s26') }}：</span> <span class="text-grey-6">{{ $t('v102.vehicle.list2.s26') }}：</span>
{{ postMsg.Remark }} {{ postMsg.Remark }}
</span> </span>
<span class="col-6" v-if="postMsg.AttentionInfo"> <span v-if="postMsg.AttentionInfo" :class="{'col-6':$q.platform.is.desktop,'col-12':$q.platform.is.mobile}">
<span class="text-grey-6">{{ $t('v102.vehicle.list2.s27') }}：</span> <span class="text-grey-6">{{ $t('v102.vehicle.list2.s27') }}：</span>
{{ postMsg.AttentionInfo }} {{ postMsg.AttentionInfo }}
</span> </span>
...@@ -47,7 +54,7 @@ import HotelService from '../../api/vehicle' ...@@ -47,7 +54,7 @@ import HotelService from '../../api/vehicle'
import { DirtionmaryHelper } from '../../config/dictionary' import { DirtionmaryHelper } from '../../config/dictionary'
import { defineComponent, toRefs, watch, reactive, inject, ref, onMounted } from 'vue' import { defineComponent, toRefs, watch, reactive, inject, ref, onMounted } from 'vue'
import { ApiResult } from '../../@types/enumHelper' import { ApiResult } from '../../@types/enumHelper'
import useScrollModule from '../../module/scrollbar/scrollModule' import useScrollModule from 'src/module/scrollbar/scrollModule'
import { date } from 'quasar' import { date } from 'quasar'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import message from '../../utils/message' import message from '../../utils/message'
...@@ -63,6 +70,7 @@ export default defineComponent({ ...@@ -63,6 +70,7 @@ export default defineComponent({
const qDateProxy = ref(null) as any const qDateProxy = ref(null) as any
const { t } = useI18n() const { t } = useI18n()
const data = reactive({ const data = reactive({
scrollStyle: {} as any,
loading: false, loading: false,
subUnitPrice: 0 as any, subUnitPrice: 0 as any,
subStopBusPrice: 0 as any, subStopBusPrice: 0 as any,
...@@ -78,6 +86,7 @@ export default defineComponent({ ...@@ -78,6 +86,7 @@ export default defineComponent({
{ name: 'RoomPrice', label: t('v102.vehicle.list2.s23'), field: (row: any) => row.RoomPrice, align: 'left' } { name: 'RoomPrice', label: t('v102.vehicle.list2.s23'), field: (row: any) => row.RoomPrice, align: 'left' }
] as any[], ] as any[],
}) })
data.scrollStyle = useScrollModule().scrollStyle
onMounted(() => { onMounted(() => {
if (props.Id && props.Id > 0) { if (props.Id && props.Id > 0) {
methods.detailsinit() methods.detailsinit()
......
src/pages/hotel/HotelList.vue
View file @ 21d6b218
...@@ -39,7 +39,8 @@ export default defineComponent({ ...@@ -39,7 +39,8 @@ export default defineComponent({
PriceLevel: 0, PriceLevel: 0,
Supplier: 0, Supplier: 0,
MaxPrice: '', MaxPrice: '',
MinPrice: '' MinPrice: '',
HotelName: ''
}) })
provide(DirtionmaryHelper.HOTEL_QUERY_PARAM, search) provide(DirtionmaryHelper.HOTEL_QUERY_PARAM, search)
......
src/pages/vehicle/addEditVehicle.vue
View file @ 21d6b218
...@@ -294,7 +294,7 @@ export default defineComponent({ ...@@ -294,7 +294,7 @@ export default defineComponent({
if (r.data.resultCode == ApiResult.SUCCESS) { if (r.data.resultCode == ApiResult.SUCCESS) {
r.data.data.forEach((x:any)=>{ r.data.data.forEach((x:any)=>{
x.labelName = `${x.Name}(${x.SeatNum})` x.labelName = `${x.Name}(${x.SeatNum})`
}) })
data.vehicletop = r.data.data data.vehicletop = r.data.data
} else { } else {
...@@ -423,7 +423,7 @@ export default defineComponent({ ...@@ -423,7 +423,7 @@ export default defineComponent({
}, },
// 关闭 // 关闭
down() { down() {
$router.push({ path: `/vehicle/order/0` }) $router.push({ path: `/vehicle/order/0/0` })
}, },
// 确定 // 确定
submit() { submit() {
......
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