道旅酒店

src/components/TravelManager/TravelList/HotelOrderTotal.vue

@@ -150,6 +150,15 @@
     <div class="flexOne SalesHotelOrder">
     <div class="query-box">
       <ul>
+        <li>
+        <span>
+            <em>订单来源</em>
+            <el-select v-model='msg.Source' filterable :placeholder="$t('pub.pleaseSel')">
+                <el-option v-for="item in ThirdOrderSourceEnumEnumList" :label='item.Name' :value='item.Id' :key='item.Id'>
+                </el-option>
+            </el-select>
+            </span>
+        </li>
         <li>
           <span>
             <em>{{$t('hotel.hotel_OrderStates')}}</em>
@@ -159,6 +168,9 @@
             </el-select>
             </span>
         </li>
+
+
+        
         <li>
             <span>
                 <em>{{$t('sm.company')}}</em>
@@ -347,8 +359,9 @@
                     <el-tooltip class="item" effect="dark" :content="$t('sm.daifukuan')" placement="top-start">
                       <el-button type="primary" icon="iconfont icon-fukuan2" @click="getShouKuan(item)" ></el-button>
                     </el-tooltip>
-                    <el-tooltip class="item" effect="dark" :content="$t('sm.exitOrder')" placement="top-start">
-                      <el-button type="info" v-if="item.IsCanOrder == 0" icon="iconfont icon-quxiao1" @click="cancelHTorder(item.ThirdOrderNo)"></el-button>
+                    <el-tooltip class="item" effect="dark" :content="$t('sm.exitOrder')" placement="top-start"  v-if="item.IsCanOrder == 0" >
+                      <el-button type="info" v-if="item.Source==2" icon="iconfont icon-quxiao1" @click="cancelHTorder(item.ThirdOrderNo)"></el-button>
+                      <el-button type="info" v-else-if="item.Source==4" icon="iconfont icon-quxiao1" @click="cancelDiDaorder(item)"></el-button>
                     </el-tooltip>
                     <el-tooltip class="item" effect="dark" :content="$t('pub.sureBtn')" placement="top-start">
                       <el-button  type="success" icon="iconfont icon-duigou" v-if="item.IsCanClear == 0" @click="queren(1, item.OrderID)" ></el-button>
@@ -370,7 +383,7 @@
             </td>
         </tr>
         <tr>
-            <td colspan="8" style="text-align:left;width:600px">
+            <td colspan="9" style="text-align:left;width:600px">
                 <div class="clearfix">
                     <div class="SH_beizhu" style="">
                         {{$t('pub.pubRemark')}}：
@@ -457,6 +470,21 @@
       </div>
     </el-dialog>
 
+    <el-dialog title="取消订单确认" width="400px" :visible.sync="cancelDidaOrderDialog" center :before-close="closeChangeMachie">
+      <el-form label-width="110px">
+          <el-form-item label="取消罚金">
+             {{didaCancelOrderMsg.Amount}}
+          </el-form-item>
+          <el-form-item label="币种">
+             {{didaCancelOrderMsg.Currency}}
+          </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+          <button class="hollowFixedBtn" @click="cancelDidaOrderDialog=false">{{$t('pub.cancelBtn')}}</button>
+          <button class="normalBtn" type="primary" @click="querenDidaCancelOrder">{{$t('pub.sureBtn')}}</button>
+      </div>
+    </el-dialog>
+
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
       :page-size=msg.pageSize :total=total>
     </el-pagination>
@@ -477,7 +505,8 @@ export default {
           StartTime:'',
           EndTime:'',
           CStartTime:'',
-          CEndTime:''
+          CEndTime:'',
+          Source:'4'
       },
       TCID: '',
       GLOrderID: '',
@@ -491,7 +520,16 @@ export default {
         //日元不含税价
         totalChargeableRateInfoTaxOut:0
       },
+      didaCancelOrderMsg:{
+        BookingID:"",
+        ConfirmID:"",
+        Currency:"",
+        Amount:0,
+        CancelBy:0,
+        CancelType:""
+      },
       updatePriceDialog:false,
+      cancelDidaOrderDialog:false,
       StartTimeBefore: {
         disabledDate: time => {
             if (this.msg.EndTime == null) {
@@ -563,6 +601,7 @@ export default {
       //统计快
       TotalMsg:[],
       searchList: [],
+      ThirdOrderSourceEnumEnumList:[],
       loading2: false,
       dialogFormVisible: false,
       //员工ID
@@ -589,6 +628,15 @@ export default {
         }
       },err => {});
     },
+
+    getThirdOrderSourceEnumEnumList(){
+      this.apipost("sellorder_post_GetThirdOrderSourceEnumEnumList",{ },res => {
+        if (res.data.resultCode == 1) {
+        this.ThirdOrderSourceEnumEnumList=res.data.data;
+        }
+      },err => {});
+    },
+    
     //获取当前信息
     getThisMsg(item){
       this.updatePriceDialog=true;
@@ -655,6 +703,37 @@ export default {
           });
       });
     },
+
+    querenDidaCancelOrder(){
+      let userInfo = this.getLocalStorage();
+      let EmployeeId = userInfo.EmployeeId;
+      this.didaCancelOrderMsg.CancelBy=EmployeeId,
+      this.didaCancelOrderMsg.CancelType= 2;
+      this.$confirm("确认取消订单", this.$t('tips.tips'), {
+          confirmButtonText: this.$t('pub.sureBtn'),
+          cancelButtonText: this.$t('pub.cancelBtn'),
+          type: 'warning'
+      }).then(() => {
+          this.apipost('dmc_post_GetDiDaBookingCancelConfirm',this.didaCancelOrderMsg,res=>{
+              if(res.data.resultCode==1){
+                this.cancelDidaOrderDialog=false;
+                this.didaCancelOrderMsg.Amount=0;
+                this.didaCancelOrderMsg.Currency="";
+                this.didaCancelOrderMsg.ConfirmID="";
+                this.didaCancelOrderMsg.BookingID="";
+                  this.Success(res.data.message);
+                  this.getList();
+              }else{
+                  this.Error(res.data.message);
+              }
+          },err=>{})
+      }).catch(() => {
+          this.$message({
+              type: 'info',
+              message: this.$t('ios.yi') + this.$t('pub.cancelBtn')
+          });
+      });
+    },
     goOrderDetails(ID){
       this.$router.push({
         name: 'OpHotelOrderDetail',
@@ -759,6 +838,35 @@ export default {
       null
     );
    },
+
+      //点击取消道旅操作
+      cancelDiDaorder(item){
+      let userInfo = this.getLocalStorage();
+      let EmployeeId = userInfo.EmployeeId;
+      let msg ={
+        BookingID:item.ThirdOrderNo,
+          CancelBy:EmployeeId,
+          CancelType:1
+      }
+      this.apipost(
+      "dmc_post_GetDiDaBookingCancel",
+      msg,
+      res => {
+        if (res.data.resultCode == 1) { 
+          console.log("res.data.data",res.data.data);
+          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
+    );
+   },
    //点击收款
    getShouKuan(obj){
      let TCIDARR = obj.TCID ? [obj.TCID] : [];
@@ -798,6 +906,7 @@ export default {
     this.getDepartmentMsg.RB_Branch_Id=userInfo.RB_Branch_id;   //公司
     this.EmployeeId=userInfo.EmployeeId //员工
     this.getCompanyList()
+    this.getThirdOrderSourceEnumEnumList();
     this.getDepartment()
     this.getEmployee()
     this.getList();

src/router/config.js

@@ -1015,6 +1015,30 @@ export default {
                 title: '酒店预定订单'
               },
             },
+            {
+              path: '/didaHotelList', //道旅酒店检索
+              name: 'didaHotelList',
+              component: resolve => require(['@/components/Hotel/DiDa/HotelList'], resolve),
+              meta: {
+                title: '道旅酒店检索'
+              },
+            },
+            {
+              path: '/HotelDetails', //道旅酒店详情
+              name: 'HotelDetails',
+              component: resolve => require(['@/components/Hotel/DiDa/HotelDetails'], resolve),
+              meta: {
+                title: '道旅酒店详情'
+              },
+            },
+            {
+              path: '/HotelSure', //道旅酒店详情
+              name: 'HotelSure',
+              component: resolve => require(['@/components/Hotel/DiDa/HotelSure'], resolve),
+              meta: {
+                title: '道旅酒店预定'
+              },
+            },
             {
               path: '/CarDealerOrder', //车订单
               name: 'CarDealerOrder',