Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
bigwood
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
罗超
bigwood
Commits
78daa3c5
Commit
78daa3c5
authored
Apr 13, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
d5998868
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
20 deletions
+13
-20
scheduledTrip.ts
src/api/scheduledTrip.ts
+1
-1
TripOrderHeader.vue
src/components/trip/order/TripOrderHeader.vue
+4
-4
TripOrderList.vue
src/components/trip/order/TripOrderList.vue
+3
-10
TripOrder.vue
src/pages/scheduledTrip/TripOrder.vue
+2
-2
tools.ts
src/utils/tools.ts
+3
-3
No files found.
src/api/scheduledTrip.ts
View file @
78daa3c5
...
...
@@ -5,7 +5,7 @@ import requestJava from './requestJava'
class
scheduledTripService
{
// 取消跟团订单列表
static
async
B2BRemoveOrder
(
param
:
any
):
Promise
<
HttpResponse
>
{
return
request
Java
(
'/api/b2b/user/sellorder_post_B2BRemove
Order'
,
param
)
return
request
(
'sellorder_post_B2BRemoveMy
Order'
,
param
)
}
// 跟团订单列表
static
async
GetTravelOrderB2BList
(
param
:
any
):
Promise
<
HttpResponse
>
{
...
...
src/components/trip/order/TripOrderHeader.vue
View file @
78daa3c5
<
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=
"
realS
earch.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=
"
realS
earch.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=
"
s
earch.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=
"
s
earch.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=
"
realS
earch.orderState"
class=
"text-cyan"
dense
>
<q-tabs
v-model=
"
s
earch.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
,
realS
earch
,
s
earch
,
searchCnt
}
}
...
...
src/components/trip/order/TripOrderList.vue
View file @
78daa3c5
...
...
@@ -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
...
...
src/pages/scheduledTrip/TripOrder.vue
View file @
78daa3c5
...
...
@@ -29,8 +29,8 @@ export default defineComponent({
}
const
search
=
reactive
({
orderType
:
-
1
,
//1跟团订单
queryDays
:
0
,
//10天内
orderState
:
0
,
//订单状态
queryDays
:
1
0
,
//10天内
orderState
:
2
,
//订单状态
CustomerId
:
CustomerId
,
//用户id
})
// search.OrderId = currentRouter.currentRoute.value.params.orderId
...
...
src/utils/tools.ts
View file @
78daa3c5
...
...
@@ -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.c
heck'
),
t
(
'v103.scheduledTrip.orderStatus.cancel
'
)]
let
color
=
[
''
,
'positive'
,
'dark'
,
'orange'
,
'negative'
,
'
orange'
,
'negativ
e'
]
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.c
ancel'
),
t
(
'v103.scheduledTrip.orderStatus.check
'
)]
let
color
=
[
''
,
'positive'
,
'dark'
,
'orange'
,
'negative'
,
'
negative'
,
'orang
e'
]
let
icons
=
[
''
,
'update'
,
'done'
,
'offline_bolt'
,
'cached'
,
'
cached'
,
'offline_bolt
'
]
text
.
forEach
((
x
,
i
:
number
)
=>
{
status
.
push
({
StatusId
:
i
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment