Commit 6c1f6bd7 authored by 黄奎's avatar 黄奎

新增代付款取消订单

parent 5f713436
...@@ -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) {
......
...@@ -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>
......
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