酒店变更调整

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -815,7 +815,7 @@
                       <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
                         <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
                           :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
-                          @SetShouPeiShu="SetShouPeiShu(item.TCID, item.ShouPeiStatus)"></commonHotelInfo>
+                          @SetShouPeiShu="SetShouPeiShu(item.TCID, item.ShouPeiStatus)" @success="getControlList()"></commonHotelInfo>
                         <span slot="reference"
                           style="cursor: pointer; text-decoration: underline">{{ $t("salesModule.HotelOrder") }}
                           <font style="color: #e95252; text-decoration: none">
@@ -2248,6 +2248,7 @@
           showCaozuoTime: true, //操作时间
           caiwu: true, //显示财务单据
           colspanLength: 6, //跨行
+          showChange:true,//显示可变更酒店
         },
         //更新可售机票数量
         updateAirticketObj: {
@@ -3971,6 +3972,8 @@
       if (routeName == "TravelControlList2") {
         this.queryMsg.TeamType = 0;
       }
+      //测试添加
+      this.queryMsg.TCNUM='KIX3U07250505C';
       this.getControlList();
       this.getTeamList();
       this.getTravelTeamList();

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -552,7 +552,7 @@
                       <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
                         <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
                           :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
-                          @SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
+                          @SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)" @success="getControlList"></commonHotelInfo>
                         <span slot="reference"
                           style="cursor:pointer;text-decoration:underline;">{{$t('salesModule.HotelOrder')}}
                           <font style="color:#e95252;text-decoration:none;">
@@ -1541,7 +1541,8 @@
           ShowRebateRatio: false, //显示返佣比列
           ShowSupplier: true, //是否显示供应商
           showCaozuoTime: true, //操作时间
-          colspanLength: 5 //跨行
+          colspanLength: 6, //跨行
+          showChange: true, //显示可变更酒店
         },
         remarkMsg: {
           TCID: 0,
@@ -2787,7 +2788,8 @@
         this.queryMsg.StartGroupDate = nowDate;
       }
       if (this.queryCommonData.IsParentCompany != 1 && userInfo.RB_Branch_id != 49 && userInfo.RB_Branch_id != 1224 &&
-        userInfo.RB_Branch_id != 1249 && userInfo.RB_Branch_id != 1252 && userInfo.RB_Branch_id != 1253&& userInfo.RB_Branch_id != 1216) {
+        userInfo.RB_Branch_id != 1249 && userInfo.RB_Branch_id != 1252 && userInfo.RB_Branch_id != 1253 && userInfo
+        .RB_Branch_id != 1216) {
         this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id);
       }
       //默认查询全部团队状态

src/components/dmc/manager/dmcTotalTable.vue

@@ -378,7 +378,7 @@
                   <el-popover width="1100" trigger="click" popper-class="DMC_HotelPop">
                     <commonHotelInfo :HotelObj="item.PriceHotelResult" :showHotelObj="showHotelObj" :TCID="item.TCID"
                       :DMCNum="item.DMCNum" :TCNUM="item.TCNUMS"
-                      @SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
+                      @SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)" @success="getList"></commonHotelInfo>
                     <span slot="reference" class="price"
                       style="cursor:pointer;text-decoration:underline;">{{$t('ground.jiudianxinxi')}}</span>
                   </el-popover>
@@ -706,7 +706,8 @@
           ShowSupplier: false, //是否显示供应商
           caiwu: true, //操作时间
           showCaozuoTime: true, //操作时间
-          colspanLength: 6 //跨行
+          colspanLength: 6, //跨行
+          showSureHotel:true, 
         },
         pickerBeginDateBefore: {
           disabledDate: time => {