Commit 78daa3c5 authored by youjie's avatar youjie

no message

parent d5998868
......@@ -5,7 +5,7 @@ import requestJava from './requestJava'
class scheduledTripService {
// 取消跟团订单列表
static async B2BRemoveOrder(param:any):Promise<HttpResponse>{
return requestJava('/api/b2b/user/sellorder_post_B2BRemoveOrder',param)
return request('sellorder_post_B2BRemoveMyOrder',param)
}
// 跟团订单列表
static async GetTravelOrderB2BList(param:any):Promise<HttpResponse>{
......
<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" style="min-width: 150px" v-model="realSearch.orderState" @update:model-value="setorderState" dense :options="status" emit-value option-label="StatusName" option-value="StatusId" map-options :label="$t('hotelorder.search.status')" standout />
<q-select class="q-mr-md" style="min-width: 150px" v-model="realSearch.queryDays" @update:model-value="setorderDay" dense :options="Days" emit-value option-label="StatusName" option-value="StatusId" map-options :label="$t('v103.scheduledTripOrder.setorderday')" standout />
<q-select v-if="$q.platform.is.desktop" class="q-mr-md" style="min-width: 150px" v-model="search.orderState" @update:model-value="setorderState" dense :options="status" emit-value option-label="StatusName" option-value="StatusId" map-options :label="$t('hotelorder.search.status')" standout />
<q-select class="q-mr-md" style="min-width: 150px" v-model="search.queryDays" @update:model-value="setorderDay" dense :options="Days" emit-value option-label="StatusName" option-value="StatusId" map-options :label="$t('v103.scheduledTripOrder.setorderday')" standout />
<div class="col"></div>
<q-btn color="primary" unelevated :label="$t('query')" @click="setQueryHandler" />
</div>
<div class="rounded-borders bg-white q-pa-sm q-mt-md mobile-only">
<q-tabs v-model="realSearch.orderState" class="text-cyan" dense>
<q-tabs v-model="search.orderState" class="text-cyan" dense>
<q-tab :name="x.StatusId" :label="x.StatusName" v-for="x in status" @click="setorderState(x.StatusId)" />
</q-tabs>
</div>
......@@ -62,7 +62,7 @@ export default defineComponent({
return {
...toRefs(data),
...methods,
realSearch,
search,
searchCnt
}
}
......
......@@ -44,8 +44,8 @@
</div>
<span class="fz14 text-orange-7">{{$t('v103.scheduledTripOrder.paid')}}:<span class="fz17">CNY {{moneyFormat(x.customerPayMoney)}}</span> </span>
<div class="q-pt-sm text-right" v-if="x.orderState==1||x.orderState==2">
<!-- <q-btn color="primary" unelevated size="sm"
@click="cancel(x)">{{$t('hotelm.cancel')}}</q-btn> -->
<q-btn color="primary" unelevated size="sm"
@click="cancel(x)">{{$t('hotelm.cancel')}}</q-btn>
</div>
</div>
</div>
......@@ -137,7 +137,7 @@ export default defineComponent({
scheduledTripService.B2BRemoveOrder({ID:obj.orderId})
.then(r => {
if (r.data.resultCode == ApiResult.SUCCESS) {
methods.getList()
methods.initOrders()
methods.GetWaitDealOrderPageList()
message.successMsg(`${t('success')}`)
} else {
......@@ -160,13 +160,6 @@ export default defineComponent({
if (r.data.resultCode == ApiResult.SUCCESS) {
r.data.data.pageData&&r.data.data.pageData.forEach((x: any) => {
x.typeInfo = data.status.find(y => y.StatusId == x.orderState) ?? data.status[1]
// x.SendType = data.sends.find(y => y.Id == x.MailingState) ?? data.sends[0]
// x.Money = 0
// let Money = 0
// x.DetailList.forEach((y:any)=>{
// Money+=y.Money
// })
// x.Money= Number(Money+x.MailingMoney)
})
data.orders = r.data.data.pageData
data.pages.pageCount = r.data.data.pageCount
......
......@@ -29,8 +29,8 @@ export default defineComponent({
}
const search = reactive({
orderType: -1,//1跟团订单
queryDays: 0,//10天内
orderState: 0,//订单状态
queryDays: 10,//10天内
orderState: 2,//订单状态
CustomerId: CustomerId,//用户id
})
// search.OrderId = currentRouter.currentRoute.value.params.orderId
......
......@@ -196,9 +196,9 @@ export function getHotelOrderStatus():Array<StandardStatus>{
// 行程订单状态
export function getTripOrderStatus():Array<StandardStatus>{
let status=[] as Array<StandardStatus>
let text = [t('v103.scheduledTrip.orderStatus.normal'),t('v103.scheduledTrip.orderStatus.apply1'),t('v103.scheduledTrip.orderStatus.apply2'),t('v103.scheduledTrip.orderStatus.apply3'),t('v103.scheduledTrip.orderStatus.check'),t('v103.scheduledTrip.orderStatus.cancel')]
let color = ['','positive','dark','orange','negative','orange','negative']
let icons = ['','update','done','offline_bolt','cached','offline_bolt','cached']
let text = [t('v103.scheduledTrip.orderStatus.normal'),t('v103.scheduledTrip.orderStatus.apply1'),t('v103.scheduledTrip.orderStatus.apply2'),t('v103.scheduledTrip.orderStatus.apply3'),t('v103.scheduledTrip.orderStatus.cancel'),t('v103.scheduledTrip.orderStatus.check')]
let color = ['','positive','dark','orange','negative','negative','orange']
let icons = ['','update','done','offline_bolt','cached','cached','offline_bolt']
text.forEach((x,i:number)=>{
status.push({
StatusId:i,
......
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