Skip to content

B
bigwood
Commit 7ed63a3c authored by youjie's avatar youjie
Browse files
Options

no message

parent c3a41c55
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 55 deletions
src/components/vehicle/list/ListTable.vue
View file @ 7ed63a3c
......@@ -26,7 +26,7 @@
<div class="mobile-only">
<div class="row justify-between">
<div class="q-mr-md">
<q-btn :color="x.MailingState == 1 ? 'cyan' : 'negative'" unelevated disable size="sm" :label="`${x.MailingState == 1 ? $t('hotelorder.orderType.guest') : $t('hotelorder.orderType.tour')}`"></q-btn>
<q-btn :color="search.OrderType == 4 ?'cyan' : (search.OrderType == 2 ?'negative':'positive')" unelevated disable size="sm" :label="$t('v102.vehicle.travelvehicle')"></q-btn>
</div>
<div class="q-ml-md f12" :class="[x.typeInfo.Color]">
<q-icon :name="x.typeInfo.Icon" />
......@@ -49,7 +49,7 @@
</div>
<div class="q-mt-md row">
<q-table separator="cell" :hide-bottom="!x.Remark" :pagination="{ rowsPerPage: 100 }" :rows="[x]" bordered :columns="cols" class="sticky-rightrowspan-column-table light-border col no-shadow">
<q-table separator="cell" :hide-bottom="!x.CreateRemark" :pagination="{ rowsPerPage: 100 }" :rows="[x]" bordered :columns="cols" class="sticky-rightrowspan-column-table light-border col no-shadow">
<template v-slot:body-cell-UseCompName="props">
<q-th :props="props">
<div>
......@@ -68,6 +68,9 @@
</div>
</q-th>
</template>
<template v-slot:bottom>
<div class="msl text-negative">{{ $t('v101.hotelRemark') }}：{{ x.CreateRemark }}</div>
</template>
</q-table>
</div>
......@@ -75,21 +78,8 @@
<div class="pay row text-grey rounded-borders" :class="{ 'bg-grey-2 q-mt-md': $q.platform.is.mobile, col: $q.platform.is.desktop }">
</div>
<div class="col desktop-only"></div>
<div class="rounded-borders bg-grey-2 q-pa-md" :class="{ 'q-mx-md': $q.platform.is.desktop, 'q-mt-md': $q.platform.is.mobile }">
<!-- style="border-bottom: 1px dashed #ddd" -->
<div class="row items-center justify-between q-mb-sm q-pb-sm" >
<div class="f12 text-grey">{{ $t('v102.vehicle.title8') }}</div>
<div class="dark q-ml-xl">
<span class="din text-subtitle1">{{ x.UseDayNum }}</span>
<span class="f12">{{ x.CurrencyCode }}</span>
</div>
</div>
<!-- <div class="text-right">
<q-btn dense outline color="accent" size="sm" class="q-mt-sm" :label="$t('hotelorder.payinfo')" @click="ViewPayment"></q-btn>
</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 == 1" :class="{ 'row items-center justify-between full-width': $q.platform.is.mobile }">
<q-list dense :class="{ 'row items-center justify-between full-width': $q.platform.is.mobile }">
<q-item v-if="x.OfferState == 2" class="text-negative" clickable v-close-popup @click="cancel(x.Id)">
<q-item-section>
<q-item-label>{{ $t('hotelorder.opera.cancel') }}</q-item-label>
......@@ -106,20 +96,15 @@
</q-item-section>
</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.Money.toFixed(2) }}
<span class="text-green-4 f12">{{ $t('unit.jp') }}</span>
</div>
</div> -->
</div>
</div>
<div v-if="x.OfferState == 5">
<div class="q-mt-md q-pa-sm row items-center rounded-borders bg-orange-1" style="border-width: 0 5px; border-style: solid; border-color: #ffb74d">
<div class="text-subtitle2 text-weight-bolder text-grey-900">{{ $t('v101.cancelRemark') }}：</div>
<div class="f12 text-grey-600 q-ml-sm col">{{ x.CancelRemark ? x.CancelRemark : $t('v101.selfCancle') }}</div>
<div class="f12 text-grey-900">{{ x.CancelEmpName }} {{ x.CancelTime }}</div>
<div class="f12 text-grey-900">{{ x.CancelRemark }}
<!-- {{ x.CancelTime }} -->
</div>
</div>
</div>
</q-card>
......@@ -137,23 +122,6 @@
<vehicle-details @close="close" :Id='Id' @refresh="refresh">
</vehicle-details>
</q-dialog>
<!-- 取消弹窗 -->
<q-dialog v-model="cancelshow">
<q-card flat class="q-px-lg" style="width: 30vw;">
<q-card-section class="q-pa-sm">
<div class="text-h6">{{ $t('v102.vehicle.add3') }}</div>
</q-card-section>
<q-card-section>
<q-input v-model="CancelRemark" :label="$t('v102.vehicle.add4')" :rows="3" filled type="textarea" />
</q-card-section>
<q-card-actions align="right" class="bg-white">
<q-btn flat dense color="dark" :label="$t('close')" class="q-mr-sm" @click="cancelshow = true"
v-close-popup />
<q-btn unelevated dense color="accent q-px-md" :label="$t('v102.vehicle.add5')"
@click="cancellations" />
</q-card-actions>
</q-card>
</q-dialog>
</template>
<script lang="ts">
......@@ -179,7 +147,6 @@ export default defineComponent({
const data = reactive({
copyId: 0,
showdetails: false,
cancelshow: false,
CancelRemark: '',
Id: 0,
loading: false,
......@@ -199,21 +166,13 @@ export default defineComponent({
{ name: 'PickUpInfo', label: t('v102.vehicle.title3'), field: (row: any) => row, align: 'left' },
{ name: 'PeopleNum', label: t('v102.vehicle.title6'), field: (row: any) => row.PeopleNum, align: 'left' },
{ name: 'StartDate', label: t('v102.vehicle.title7'), field: (row: any) => row.StartDate, align: 'left' },
{ name: 'UseDayNum', label: t('v102.vehicle.title8'), field: (row: any) => row.UseDayNum, align: 'left' },
{ name: 'BusTypeName', label: t('v102.vehicle.title9'), field: (row: any) => row.BusTypeName, align: 'left' },
{ name: 'UseName', label: t('v102.vehicle.title10'), field: (row: any) => row.GuideInfo, align: 'left' },
{ name: 'TeamName', label: t('v102.vehicle.title11'), field: (row: any) => row.TeamName, align: 'left' },
] as any,
})
// if ($q.platform.is.desktop) {
// if ($q.screen.gt.md) {
// data.pages.PageSize = 12
// } else {
// data.pages.PageSize = 9
// }
// } else {
// data.pages.PageSize = 10
// }
const search = inject(DirtionmaryHelper.TICKET_QUERY_PARAM) as any
watch(search, (n, o) => {
......@@ -259,17 +218,25 @@ export default defineComponent({
message.errorMsg(e.message)
})
},
// 取消订单
cancel(item: any) {
data.cancelshow = true
data.Id = item
data.Id = item
$q.dialog({
title: t('dialog.titles.horder'),
message: t('dialog.contents.horder'),
cancel: true,
persistent: true
}).onOk(() => {
methods.cancellations()
})
},
// 取消用车
cancellations() {
HotelService.cancellation(data.Id, data.CancelRemark)
.then(r => {
if (r.data.resultCode == ApiResult.SUCCESS) {
data.cancelshow = false
methods.getList()
message.successMsg(`${t('success')}`)
} else {
message.errorMsg(r.data.message)
}
......
src/pages/vehicle/addEditVehicle.vue
View file @ 7ed63a3c
......@@ -394,7 +394,6 @@ export default defineComponent({
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
for(let i=0;i<data.search.details.length;i++){
......@@ -402,11 +401,14 @@ export default defineComponent({
refArrB.value[i].validate()
guestRefArr= !refArr.value[i].hasError&&!refArrB.value[i].hasError
}
if(!flag) return
if(!guestRefArr) return
HotelService.vehicletripbus(data.search)
.then(r => {
if (r.data.resultCode == ApiResult.SUCCESS) {
data.isCheck = false
context.emit('refresh')
$router.push({ path: '/vehicle/order' })
} else {
......
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