页面修改

src/components/Hotel/roomReservationsDetails.vue

@@ -34,8 +34,8 @@
       class="ownScrollbarStyle" ref="ownScrollbarStyle">
       <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe" v-loading="loading">
         <tr>
-          <th class="fz14" colspan="8">团队信息&nbsp;&nbsp;领队:{{LeaderName}} &nbsp;&nbsp;导游:{{GuideName}}.</th>
-          <th class="fz14" colspan="16">地接操作信息</th>
+          <th class="fz14" colspan="5">团队信息&nbsp;&nbsp;领队:{{LeaderName}} &nbsp;&nbsp;导游:{{GuideName}}.</th>
+          <th class="fz14" colspan="17">地接操作信息</th>
         </tr>
         <tr>
           <th width="120">入住时间</th>
@@ -43,10 +43,8 @@
           <th width="120">机位总数<br />(Y/E/F)</th>
           <th width="80">占床/<br />不占床</th>
           <th width="80">实际<br />用房数</th>
-          <th width="100">房间类型</th>
-          <th width="70">房间数</th>
-          <th width="70">房间<br />人数</th>
           <th width="170">修改酒店/供应商</th>
+          <th width="100">房间类型</th>
           <th width="80">房间<br />预定数</th>
           <th width="80">预定人数</th>
           <th width="80">尚差<br />房间数</th>
@@ -113,35 +111,13 @@
               <!-- 占床/不占床 -->
               <td v-if="childIndex==0" :rowspan="6">
                 <p class="link" @click="goUrlT('passengerHouse',item.TCIDS,'房间分配')">
-                  {{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}}</p>
+                  {{subItem.RealityHouseGuestNum}}/{{subItem.HouseStatistics.NoNeedBed}}</p>
               </td>
               <!-- 实际用房数 -->
               <td v-if="childIndex==0" :rowspan="6">
-                {{subItem.HouseStatistics.RealityRoomNum}}
-              </td>
-              <!-- 房间类型 -->
-              <td>
-                {{subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeNameExt}}
-                <template v-if="childIndex==4">
-                  <template v-if="subItem.DriverGuideIsRebate==1">
-                    <br /><span style="color:green">返佣</span>
-                  </template>
-                  <template v-else-if="subItem.DriverGuideIsRebate==0">
-                    <br /><span style="color:red;">不返佣</span>
-                  </template>
-                </template>
-                 <template v-if="childIndex==5">
-                    <br /><span style="color:red;">不返佣</span>
-                </template>
-              </td>
-              <!-- 房间数 -->
-              <td>
-                {{subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeCount}}
-              </td>
-              <!-- 房间人数 -->
-              <td>
-                {{subItem.HouseStatistics.HouseTypeList[childIndex].HouseGuestNum}}
+                {{subItem.RealityHouseTypeCount}}
               </td>
+              
               <td v-if="childIndex==0" :rowspan="6">
                 <table class="hotelTable">
                   <tr>
@@ -191,6 +167,21 @@
                   </tr>
                 </table>
               </td>
+              <!-- 房间类型 -->
+              <td>
+                {{subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeNameExt}}
+                <template v-if="childIndex==4">
+                  <template v-if="subItem.DriverGuideIsRebate==1">
+                    <br /><span style="color:green">返佣</span>
+                  </template>
+                  <template v-else-if="subItem.DriverGuideIsRebate==0">
+                    <br /><span style="color:red;">不返佣</span>
+                  </template>
+                </template>
+                 <template v-if="childIndex==5">
+                    <br /><span style="color:red;">不返佣</span>
+                </template>
+              </td>
               <!-- 房间数 -->
               <td>
                 <el-input class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')"
@@ -478,7 +469,8 @@
         checkedsubIndex: '',
         loading: false,
         boxHeight: 0,
-
+        //合团的团期编号
+        NewTCIDs:"",
         //供应商列表
         SupplierList: [],
         ckedHotelId: 0,
@@ -706,7 +698,8 @@
         this.apipost('dmcstatistics_get_GetHotelStaticsDetail_V2', {
           TCIDs: this.$route.query.id,
           NewCombinationNum: this.$route.query.NewCombinationNum,
-          IsCombine:this.IsCombine
+          IsCombine:this.IsCombine,
+          NewTCIDs:this.NewTCIDs
         }, res => {
           if (res.data.resultCode == 1) {
             this.IsOperation = res.data.data.IsOperation;
@@ -934,6 +927,7 @@
       this.flightTotal = this.$route.query.flightTotal;
       this.GuestNum = this.$route.query.GuestNum;
       this.IsCombine=this.$route.query.IsCombine;
+      this.NewTCIDs=this.$route.query.NewTCIDs;
       let width = window.innerWidth - 50;
       let height = window.innerHeight - 65 - 55;
       this.boxHeight = height;

src/components/LeaderManagement/leaderReimbursement.vue

@@ -183,10 +183,10 @@
               {{subItem.HotelName!=subItem.NewHotelName?""+subItem.NewHotelName:""}}
             </td>
             <td v-if="childIndex==0" :rowspan="6">
-              {{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}}
+              {{subItem.RealityHouseGuestNum}}/{{subItem.HouseStatistics.NoNeedBed}}
             </td>
             <td v-if="childIndex==0" :rowspan="6">
-              {{subItem.HouseStatistics.RealityRoomNum}}
+              {{subItem.RealityHouseTypeCount}}
             </td>
             <td>
               <span v-if="childItem.HouseType === 1">单间</span>

src/components/dmc/manager/dmcTotalTable.vue

@@ -843,7 +843,8 @@
             'NewCombinationNum': outItem.NewCombinationNum,
             'LeaderName': obj.LeaderName,
             'GuideName': obj.GuideName,
-            'IsCombine':outItem.PriceCommonList.length>1,//是否是合团
+            'IsCombine':outItem.PriceCommonList.length>1, 
+            'NewTCIDs':outItem.TCIDS,
             blank: 'y',
             tab: title
           }
@@ -1026,7 +1027,6 @@
         "-" +
         myDate.getDate();
       this.msg.StartDate = nowDate;
-      
       //this.msg.CombinationNum = 'JVS0727OTC-MUA';
       this.getLineList();
       this.getList();