Skip to content

B
bigwood
Commit 58b13ff5 authored by youjie's avatar youjie
Browse files
Options

no message

parent 88578d75
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 34 deletions
src/components/vehicle/list/ListTable.vue
View file @ 58b13ff5
...@@ -53,31 +53,34 @@ ...@@ -53,31 +53,34 @@
<template v-slot:body-cell-Id="props"> <template v-slot:body-cell-Id="props">
<!--未提交报价，可以修改--> <!--未提交报价，可以修改-->
<q-td :prop="props"> <q-td :prop="props">
<div :class="{'column':$q.platform.is.mobile}">
<span @click="mask(props.row.Id)" v-if="props.row.Status == 0 && props.row.OfferState == 1"> <span @click="mask(props.row.Id)" v-if="props.row.Status == 0 && props.row.OfferState == 1">
<q-btn class="col q-mr-md fz12" color="primary" unelevated <q-btn class="col q-mr-md fz12" color="primary" unelevated
:label="$t('v102.vehicle.list.s5')" /> :label="$t('v102.vehicle.list.s5')" />
</span> </span>
<span @click="cancel(props.row.Id)"> <span @click="cancel(props.row.Id)" :class="{'q-mt-sm':$q.platform.is.mobile}">
<q-btn class="col q-mr-md fz12" color="grey-6" unelevated <q-btn class="col q-mr-md fz12" color="grey-6" unelevated
:label="$t('v102.vehicle.add3')" /> :label="$t('v102.vehicle.add3')" />
</span> </span>
<!--申请报价--> <!--申请报价-->
<span v-if="props.row.OfferState == 1 && props.row.Status == 0" <span v-if="props.row.OfferState == 1 && props.row.Status == 0"
@click="ApplyTripBus(props.row)"> @click="ApplyTripBus(props.row)" :class="{'q-mt-sm':$q.platform.is.mobile}">
<q-btn class="col q-mr-md fz12" unelevated color="primary" <q-btn class="col q-mr-md fz12" unelevated color="primary"
:label="$t('v102.vehicle.list.s8')" /> :label="$t('v102.vehicle.list.s8')" />
</span> </span>
<!--弹窗显示详细信息--> <!--弹窗显示详细信息-->
<span @click="details(props.row.Id)" v-if="props.row.OfferState == 3"> <span @click="details(props.row.Id)" v-if="props.row.OfferState == 3" :class="{'q-mt-sm':$q.platform.is.mobile}">
<q-btn class="col q-mr-md fz12" color="primary" unelevated <q-btn class="col q-mr-md fz12" color="primary" unelevated
:label="$t('v102.vehicle.list.s9')" /> :label="$t('v102.vehicle.list.s9')" />
</span> </span>
<!--确认报价--> <!--确认报价-->
<span v-if="props.row.OfferState == 3 && props.row.Status == 0" <span v-if="props.row.OfferState == 3 && props.row.Status == 0"
@click="sureBusPrice(props.row)"> @click="sureBusPrice(props.row)" :class="{'q-mt-sm':$q.platform.is.mobile}">
<q-btn class="col q-mr-md fz12" color="primary" unelevated <q-btn class="col q-mr-md fz12" color="primary" unelevated
:label="$t('v102.vehicle.list.s10')" /> :label="$t('v102.vehicle.list.s10')" />
</span> </span>
</div>
</q-td> </q-td>
</template> </template>
</q-table> </q-table>
......
src/pages/vehicle/addEditVehicle.vue
View file @ 58b13ff5
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</div> </div>
<div> <div>
<div class="row items-center"> <div class="row items-center">
<q-input type="number" dense standout v-model="search.PeopleNum" class="" :class="{'col q-mr-md':$q.platform.is.desktop,'col-12 q-mt-sm':$q.platform.is.mobile}" :placeholder="$t('v102.vehicle.title6')" :rules="[ val => val && val.length > 0 || ' ']" ref="guestPeopleNum"/> <q-input type="number" dense standout v-model="search.PeopleNum" class="" :class="{'col q-mr-md':$q.platform.is.desktop,'col-12 q-mt-sm':$q.platform.is.mobile}" :placeholder="$t('v102.vehicle.title6')" :rules="[ val => val && val > 0 || ' ']" ref="guestPeopleNum"/>
<q-field :class="{'q-py-md':$q.platform.is.desktop,'q-pt-sm':$q.platform.is.mobile}" standout :model-value="search.StartDate" class="col height text-dark cursor-pointer q-mr-md" ref="guestStartDate"> <q-field :class="{'q-py-md':$q.platform.is.desktop,'q-pt-sm':$q.platform.is.mobile}" standout :model-value="search.StartDate" class="col height text-dark cursor-pointer q-mr-md" ref="guestStartDate">
<template v-slot:control> <template v-slot:control>
<div class="self-center full-width no-outline" tabindex="0"> <div class="self-center full-width no-outline" tabindex="0">
...@@ -55,9 +55,10 @@ ...@@ -55,9 +55,10 @@
</template> </template>
<template v-slot:body-cell-TripInfo="props"> <template v-slot:body-cell-TripInfo="props">
<q-td :props="props"> <q-td :props="props">
<div class="ellipsis w100">{{props.row.TripInfo?props.row.TripInfo:$t('v102.CharteredBus.sjcp.c9')}}</div> <!-- <div class="ellipsis w100">{{props.row.TripInfo?props.row.TripInfo:$t('v102.CharteredBus.sjcp.c9')}}</div> -->
<q-input dense standout autofocus v-model="props.row.TripInfo" readonly :placeholder="$t('v102.CharteredBus.sjcp.c9')" :rules="[ val => val && val.length > 0 || ' ']" :ref="guestTripInfo" />
<q-popup-edit v-model="props.row.TripInfo" buttons> <q-popup-edit v-model="props.row.TripInfo" buttons>
<q-input type="textarea" dense standout autofocus v-model="props.row.TripInfo" :placeholder="$t('v102.CharteredBus.sjcp.c9')" :rules="[ val => val && val.length > 0 || ' ']" :ref="guestTripInfo" /> <q-input type="textarea" dense standout autofocus v-model="props.row.TripInfo" :placeholder="$t('v102.CharteredBus.sjcp.c9')" />
</q-popup-edit> </q-popup-edit>
</q-td> </q-td>
</template> </template>
...@@ -386,8 +387,12 @@ export default defineComponent({ ...@@ -386,8 +387,12 @@ export default defineComponent({
guestGuideInfo.value.validate() guestGuideInfo.value.validate()
guestTeamName.value.validate() guestTeamName.value.validate()
guestUseBusType.value.validate() guestUseBusType.value.validate()
let flag = false
// !guestUseCompName.value.hasError && !guestUseName.value.hasError &&
flag = !guestPickUpInfo.value.hasError && !guestGoFlightInfo.value.hasError && !guestBackFlightInfo.value.hasError && !guestPeopleNum.value.hasError && !guestStartDate.value.hasError && !guestUseDayNum.value.hasError && !guestGuideInfo.value.hasError && !guestTeamName.value.hasError && !guestUseBusType.value.hasError
if(!flag) return
let guestRefArr = false let guestRefArr = false
for(let i=0;i<data.search.details.length;i++){ for(let i=0;i<data.search.details.length;i++){
refArr.value[i].validate() refArr.value[i].validate()
...@@ -396,11 +401,6 @@ export default defineComponent({ ...@@ -396,11 +401,6 @@ export default defineComponent({
} }
if(!guestRefArr) return if(!guestRefArr) return
let flag = false
// !guestUseCompName.value.hasError && !guestUseName.value.hasError &&
flag = !guestPickUpInfo.value.hasError && !guestGoFlightInfo.value.hasError && !guestBackFlightInfo.value.hasError && !guestPeopleNum.value.hasError && !guestStartDate.value.hasError && !guestUseDayNum.value.hasError && !guestGuideInfo.value.hasError && !guestTeamName.value.hasError && !guestUseBusType.value.hasError
&& !guestRefArr
if(!flag) return
HotelService.vehicletripbus(data.search) HotelService.vehicletripbus(data.search)
.then(r => { .then(r => {
if (r.data.resultCode == ApiResult.SUCCESS) { if (r.data.resultCode == ApiResult.SUCCESS) {
......
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