Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
罗超
SuperMan
Commits
6c1f6bd7
Commit
6c1f6bd7
authored
May 13, 2025
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增代付款取消订单
parent
5f713436
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
18 deletions
+40
-18
HotelOrderTotal.vue
src/components/TravelManager/TravelList/HotelOrderTotal.vue
+36
-18
OpHotelOrderDetail.vue
...omponents/TravelManager/TravelList/OpHotelOrderDetail.vue
+4
-0
No files found.
src/components/TravelManager/TravelList/HotelOrderTotal.vue
View file @
6c1f6bd7
...
@@ -685,7 +685,6 @@
...
@@ -685,7 +685,6 @@
var
flag
=
item
.
Source
==
4
&&
(
item
.
OrderStatus
==
1
||
item
.
OrderStatus
==
5
)
&&
(
this
var
flag
=
item
.
Source
==
4
&&
(
item
.
OrderStatus
==
1
||
item
.
OrderStatus
==
5
)
&&
(
this
.
isHaveThirdHotelOrderAuth
||
.
isHaveThirdHotelOrderAuth
||
item
.
CreateBy
==
this
.
currentUserInfo
.
EmployeeId
)
item
.
CreateBy
==
this
.
currentUserInfo
.
EmployeeId
)
console
.
log
(
"checkCancelAuth"
,
logStr
,
flag
);
return
flag
;
return
flag
;
},
},
GetSupperOrderEditAuth
()
{
GetSupperOrderEditAuth
()
{
...
@@ -883,7 +882,6 @@
...
@@ -883,7 +882,6 @@
this
.
msg
.
pageIndex
=
1
;
this
.
msg
.
pageIndex
=
1
;
this
.
currentPage
=
1
this
.
currentPage
=
1
},
},
getEmployee
()
{
//员工
getEmployee
()
{
//员工
this
.
apipost
(
'admin_get_EmployeeGetList'
,
this
.
employeeMsg
,
res
=>
{
this
.
apipost
(
'admin_get_EmployeeGetList'
,
this
.
employeeMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
...
@@ -915,26 +913,46 @@
...
@@ -915,26 +913,46 @@
//点击取消道旅操作
//点击取消道旅操作
cancelDiDaorder
(
item
)
{
cancelDiDaorder
(
item
)
{
let
msg
=
{
let
msg
=
{
OrderID
:
item
.
OrderID
,
BookingID
:
item
.
ThirdOrderNo
,
BookingID
:
item
.
ThirdOrderNo
,
CancelBy
:
this
.
currentUserInfo
.
EmployeeId
,
CancelBy
:
this
.
currentUserInfo
.
EmployeeId
,
CancelType
:
1
CancelType
:
1
}
}
this
.
apipost
(
//已支付的取消
"dmc_post_GetDiDaBookingCancel"
,
if
(
item
.
OrderStatus
==
5
)
{
msg
,
this
.
apipost
(
res
=>
{
"dmc_post_GetDiDaBookingCancel"
,
if
(
res
.
data
.
resultCode
==
1
)
{
msg
,
this
.
didaCancelOrderMsg
.
Amount
=
res
.
data
.
data
.
Amount
;
res
=>
{
this
.
didaCancelOrderMsg
.
BookingID
=
res
.
data
.
data
.
BookingID
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
didaCancelOrderMsg
.
ConfirmID
=
res
.
data
.
data
.
ConfirmID
;
this
.
didaCancelOrderMsg
.
Amount
=
res
.
data
.
data
.
Amount
;
this
.
didaCancelOrderMsg
.
Currency
=
res
.
data
.
data
.
Currency
;
this
.
didaCancelOrderMsg
.
BookingID
=
res
.
data
.
data
.
BookingID
;
this
.
cancelDidaOrderDialog
=
true
;
this
.
didaCancelOrderMsg
.
ConfirmID
=
res
.
data
.
data
.
ConfirmID
;
}
else
{
this
.
didaCancelOrderMsg
.
Currency
=
res
.
data
.
data
.
Currency
;
this
.
Error
(
res
.
data
.
message
);
this
.
cancelDidaOrderDialog
=
true
;
}
}
else
{
},
this
.
Error
(
res
.
data
.
message
);
null
}
);
},
null
);
}
//未支付的取消
else
{
this
.
apipost
(
"post_AdminCancelThirdHotelOrder"
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
Success
(
this
.
$t
(
'sm.quxiaocg'
));
this
.
getList
();
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
}
},
},
//点击收款
//点击收款
getShouKuan
(
obj
)
{
getShouKuan
(
obj
)
{
...
...
src/components/TravelManager/TravelList/OpHotelOrderDetail.vue
View file @
6c1f6bd7
...
@@ -401,6 +401,10 @@
...
@@ -401,6 +401,10 @@
<li
class=
"HS2_title"
>
{{
$t
(
'hotel.order_Number'
)
}}
</li>
<li
class=
"HS2_title"
>
{{
$t
(
'hotel.order_Number'
)
}}
</li>
<li>
{{
details
.
model
.
ThirdOrderNo
}}
</li>
<li>
{{
details
.
model
.
ThirdOrderNo
}}
</li>
</ul>
</ul>
<ul>
<li
class=
"HS2_title"
>
{{
$t
(
'hotel.hotel_OrderStates'
)
}}
</li>
<li
style=
"color:red"
>
{{
details
.
model
.
OrderStateStr
}}
</li>
</ul>
</div>
</div>
<div
class=
"HS_div2One"
>
<div
class=
"HS_div2One"
>
<ul>
<ul>
...
...
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