新增代付款取消订单

src/components/TravelManager/TravelList/HotelOrderTotal.vue

@@ -685,7 +685,6 @@
         var flag = item.Source == 4 && (item.OrderStatus == 1 || item.OrderStatus == 5) && (this
           .isHaveThirdHotelOrderAuth ||
           item.CreateBy == this.currentUserInfo.EmployeeId)
-        console.log("checkCancelAuth", logStr, flag);
         return flag;
       },
       GetSupperOrderEditAuth() {
@@ -883,7 +882,6 @@
         this.msg.pageIndex = 1;
         this.currentPage = 1
       },
-
       getEmployee() { //员工
         this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
           if (res.data.resultCode == 1) {
@@ -915,26 +913,46 @@
       //点击取消道旅操作
       cancelDiDaorder(item) {
         let msg = {
+          OrderID: item.OrderID,
           BookingID: item.ThirdOrderNo,
           CancelBy: this.currentUserInfo.EmployeeId,
           CancelType: 1
         }
-        this.apipost(
-          "dmc_post_GetDiDaBookingCancel",
-          msg,
-          res => {
-            if (res.data.resultCode == 1) {
-              this.didaCancelOrderMsg.Amount = res.data.data.Amount;
-              this.didaCancelOrderMsg.BookingID = res.data.data.BookingID;
-              this.didaCancelOrderMsg.ConfirmID = res.data.data.ConfirmID;
-              this.didaCancelOrderMsg.Currency = res.data.data.Currency;
-              this.cancelDidaOrderDialog = true;
-            } else {
-              this.Error(res.data.message);
-            }
-          },
-          null
-        );
+        //已支付的取消
+        if (item.OrderStatus == 5) {
+          this.apipost(
+            "dmc_post_GetDiDaBookingCancel",
+            msg,
+            res => {
+              if (res.data.resultCode == 1) {
+                this.didaCancelOrderMsg.Amount = res.data.data.Amount;
+                this.didaCancelOrderMsg.BookingID = res.data.data.BookingID;
+                this.didaCancelOrderMsg.ConfirmID = res.data.data.ConfirmID;
+                this.didaCancelOrderMsg.Currency = res.data.data.Currency;
+                this.cancelDidaOrderDialog = true;
+              } else {
+                this.Error(res.data.message);
+              }
+            },
+            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) {

src/components/TravelManager/TravelList/OpHotelOrderDetail.vue

@@ -401,6 +401,10 @@
             <li class="HS2_title">{{$t('hotel.order_Number')}}</li>
             <li>{{details.model.ThirdOrderNo}}</li>
           </ul>
+            <ul>
+            <li class="HS2_title">{{$t('hotel.hotel_OrderStates')}}</li>
+            <li style="color:red">{{details.model.OrderStateStr}}</li>
+          </ul>
         </div>
         <div class="HS_div2One">
           <ul>