Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Hotel/roomReservationsDetails copy.vue → src/components/Hotel/roomReservationsDetailsNew.vue

@@ -156,12 +156,12 @@
         </tr>
         <template v-for="(item,index) in list">
           <template v-for="(subItem,subIndex) in item.HotelOrderList">
-            <tr v-for="(childItem,childIndex) in subItem.OrderDetailsList">
-              <td v-if="childIndex==0&&subIndex==0" :rowspan="6*item.HotelOrderList.length">
+            <tr v-for="(childItem,childIndex) in subItem.OrderDetailsList" :key="childIndex">
+              <td>
                 {{item.UseTimeStr}}
               </td>
               <!-- 酒店名称 -->
-              <td v-if="childIndex==0" :rowspan="6">
+              <td>
                 <table class="hotelTable">
                   <tr>
                     <td colspan="2">
@@ -195,21 +195,21 @@
                 </table>
               </td>
               <!-- 机位总数/(Y/E/F) -->
-              <td v-if="childIndex==0" :rowspan="6">
+              <td>
                 <p class="link" @click="goUrlT('RegistrationList',subItem.TCID,'报名清单')">
                   {{flightTotal}}/{{subItem.HouseStatistics.RealityYSeatNum}}/{{subItem.HouseStatistics.RealityESeatNum}}/{{subItem.HouseStatistics.RealityFSeatNum}}
                 </p>
               </td>
               <!-- 占床/不占床 -->
-              <td v-if="childIndex==0" :rowspan="6">
+              <td>
                 <p class="link" @click="goUrlT('passengerHouse',subItem.TCID,'房间分配')">
                   {{subItem.RealityHouseGuestNum}}/{{subItem.HouseStatistics.NoNeedBed}}</p>
               </td>
               <!-- 实际用房数 -->
-              <td v-if="childIndex==0" :rowspan="6">
+              <td>
                 {{subItem.RealityHouseTypeCount}}
               </td>
-              <td v-if="childIndex==0" :rowspan="6">
+              <td>
                 <table class="hotelTable">
                   <tr>
                     <td width="70" style="text-align:center;" colspan="2">
@@ -272,6 +272,7 @@
               </td>
               <!-- 房间类型 -->
               <td>
+                <div v-if="childItem.HouseType === 2">
                 {{subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeNameExt}}
                 <template v-if="childIndex==4">
                   <template v-if="subItem.DriverGuideIsRebate==1">
@@ -283,18 +284,20 @@
                 </template>
                 <template v-if="childIndex==5">
                   <br /><span style="color:red;">{{$t('ground.bufanyong')}}</span>
-                </template>
+                </template></div>
               </td>
               <!-- 房间数 -->
               <td>
+                <div v-if="childItem.HouseType === 2">
                 <el-input class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')"
-                  v-model='childItem.HouseTypeCount' :disabled="IsEditHotelPeople==0?true:false"></el-input>
+                  v-model='childItem.HouseTypeCount' :disabled="IsEditHotelPeople==0?true:false"></el-input></div>
               </td>
               <td>
+                <div v-if="childItem.HouseType === 2">
                 <el-input class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(childItem,'BookNum')"
                   @input="calculationPrice(subItem)" v-model='childItem.BookNum'
                   :disabled="IsEditHotelPeople==0?true:false">
-                </el-input>
+                </el-input></div>
               </td>
               <!-- 尚差房间数 -->
               <!-- <td>
@@ -305,6 +308,7 @@
               </td> -->
               <!-- 单价/每人 -->
               <td>
+                <div v-if="childItem.HouseType === 2">
                 <template v-if="childIndex==1">
                   <template v-if="EditBtn||LineId==90">
                     <el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
@@ -322,20 +326,25 @@
                     @input="calculationPrice(subItem)" v-model='childItem.UnitPrice'
                     :disabled="IsEditHotel==0?true:false">
                   </el-input>
-                </template>
+                </template></div>
               </td>
               <!-- 免减人数 -->
               <td>
+                <div v-if="childItem.HouseType === 2">
                 <el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'HotelDiscount')"
                   v-model='childItem.HotelDiscount' @input="calculationPrice(subItem)">
-                </el-input>
+                </el-input></div>
               </td>
               <!-- 金额小计 -->
               <td style="white-space:nowrap;">
-                {{childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)}}
+                <div v-if="childItem.HouseType === 2">
+                  <el-input class='w40' @keyup.native="checkInteger(childItem,'TotalPrice')"
+                  v-model='childItem.TotalPrice' @input="calculationPrice(subItem)">
+                </el-input>
+                </div>
               </td>
               <!-- 返佣类型 -->
-              <td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
+              <td style="white-space:nowrap;" v-if="childIndex==0">
                 <template v-if="subItem.RebateType==1">
                   <span style="color:green">{{$t('ground.hanshui')}}</span>
                 </template>
@@ -345,6 +354,7 @@
               </td>
               <!--返佣-->
               <td>
+                <div v-if="childItem.HouseType === 2">
                 <template v-if="childIndex<4">
                   <el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')"
                     v-model='childItem.RebateRatio'
@@ -358,10 +368,11 @@
                 <template v-if="childIndex==4 && subItem.DriverGuideIsRebate==0">
                   <el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')"
                     v-model='childItem.RebateRatio' @input="calculationPrice(subItem)" :disabled="true"></el-input> %
-                </template>
+                </template></div>
               </td>
               <!--返佣金额-->
               <td>
+                <div v-if="childItem.HouseType === 2">
                 <!--含税-->
                 <template v-if="subItem.RebateType==1">
                   <!--税别-->
@@ -381,29 +392,29 @@
                   <template v-else>
                     {{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2)}}
                   </template>
-                </template>
+                </template></div>
               </td>
               <!-- 入汤税 -->
-              <td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
+              <td style="white-space:nowrap;">
                 {{subItem.InTangTax}}
               </td>
               <!-- 城市税 -->
-              <td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
+              <td style="white-space:nowrap;">
                 {{subItem.CityTax}}
               </td>
               <!-- 停车费 -->
-              <td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
+              <td style="white-space:nowrap;">
                 {{subItem.ParkFee}}
               </td>
               <!-- 金额总计 -->
-              <td v-if="childIndex==0" :rowspan="6" style="white-space:nowrap;">
+              <td style="white-space:nowrap;">
                 {{subItem.TotalPrice}}
                 <template v-if="subItem.NewTotalPrice">
                   <br /><span style="color:red;">{{subItem.NewTotalPrice}}</span>
                 </template>
               </td>
               <!-- 付款方式 -->
-              <td v-if="childIndex==0" :rowspan="6">
+              <td>
                 <table class="hotelTable">
                   <tr>
                     <td width="70" style="text-align:right;">{{$t('hotel.hotel_Currency')}}：</td>
@@ -444,7 +455,7 @@
                   <tr>
                     <td colspan="2" style="height:5px;"></td>
                   </tr>
-                  <tr>
+                  <!-- <tr>
                     <td width="70" style="text-align:right;">{{$t('ground.shurushubie')}}：</td>
                     <td>
                       <el-select class='w135 sel' v-model='subItem.TaxType' :placeholder="$t('pub.pleaseSel')"
@@ -454,7 +465,7 @@
                         <el-option :label="$t('pub.SB')" :value='2'></el-option>
                       </el-select>
                     </td>
-                  </tr>
+                  </tr> -->
                   <tr>
                     <td colspan="2" style="height:5px;"></td>
                   </tr>
@@ -478,7 +489,7 @@
                   <tr>
                     <td colspan="2" style="height:5px;"></td>
                   </tr>
-                  <tr>
+                  <!-- <tr>
                     <td width="70" style="text-align:right;">{{$t('ground.sidaoffkfs')}}：</td>
                     <td>
                       <el-select class='w135 sel' v-model='subItem.DMCPayType' :placeholder="$t('pub.pleaseSel')"
@@ -495,7 +506,7 @@
                         <el-option :label="$t('ground.shuaka')" :value='11'></el-option>
                       </el-select>
                     </td>
-                  </tr>
+                  </tr> -->
                   <tr v-show="subItem.PayStyle==6">
                     <td colspan="2" style="height:5px;"></td>
                   </tr>
@@ -560,7 +571,7 @@
                 </table>
               </td>
               <!-- 操作 -->
-              <td v-if="childIndex==0" :rowspan="5">
+              <td>
                 <template v-if="subItem.OPState==1">
                   <span class="Hotel_red">{{$t('salesModule.OPZD')}}</span>
                 </template>
@@ -961,6 +972,11 @@
             this.CreateBy = res.data.data.CreateBy;
             this.CreateByPhoto = res.data.data.CreateByPhoto;
             this.CreateByAccount = res.data.data.CreateByAccount;
+
+//  in list">
+//           <template v-for="(subItem,subIndex) in item.HotelOrderList">
+//             <tr v-for="(childItem,childIndex) in subItem.OrderDetailsList" :key="childIndex">
+
             if (list != null && list.length > 0) {
               list.forEach((item, sIndex) => {
                 item.HotelOrderList.forEach(subItem => {
@@ -985,6 +1001,8 @@
                   if (subItem.ReserveNo == '' || subItem.ReserveNo == null) {
                     subItem.ReserveNo = this.$route.query.NewCombinationNum;
                   }
+                  subItem.OrderDetailsList = subItem.OrderDetailsList.filter(item => item.HouseType === 2)
+                  console.log('subItem.OrderDetailsList', subItem.OrderDetailsList, subItem.OrderDetailsList.filter(item => item.HouseType === 2))
                   subItem.isShowPop = false;
                   subItem.ckedHotelName = "";
                   //遍历手配
@@ -997,6 +1015,7 @@
                 })
               });
               this.list = list;
+              console.log('this.list', this.list)
               this.$forceUpdate();
             }
           } else {

src/components/dmc/manager/dmcTotalTable.vue

@@ -334,7 +334,7 @@
                 </div>
               </td>
               <td>
-                <div class="fz16 fbold linkspan" @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')">
+                <div class="fz16 fbold linkspan" @click="goUrl([131,14, 90].includes(item.LineId) ? 'roomReservationsDetails' : 'roomReservationsDetailsNew',item,outItem,'订房详情')">
                   <span style="color: #4BCA81;" v-if="item.HotelResult==1">√</span>
                   <span class="colorE95252" v-else>{{item.HotelResult=='-1'?"x":"O"}}</span>
                 </div>
@@ -387,6 +387,9 @@
                   <span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span>
                 </div>
               </td>
+              <td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0'>
+                <span>{{item.OfferId}}</span>
+              </td>
               <td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0' style="width: 150px;">
                 <el-popover width="100" trigger="click" popper-class="DMC_HotelPop">
                   <table style="width: 100%;" border="0" cellspacing="1" class="dmcTotalTable">

src/components/dmc/manager/dmcTotalTable_swt.vue

@@ -379,6 +379,9 @@
                   <span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span>
                 </div>
               </td>
+              <td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0'>
+                <span>{{item.OfferId}}</span>
+              </td>
               <td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0' style="width: 150px;">
                 <el-popover width="100" trigger="click" popper-class="DMC_HotelPop">
                   <table style="width: 100%;" border="0" cellspacing="1" class="dmcTotalTable">

src/router/config.js

@@ -1361,6 +1361,14 @@ export default {
                 title: '订房管理详情'
               },
             },
+            {
+              path: '/roomReservationsDetailsNew', //订房管理详情新版
+              name: 'roomReservationsDetailsNew',
+              component: resolve => require(['@/components/Hotel/roomReservationsDetailsNew'], resolve),
+              meta: {
+                title: '订房管理详情'
+              },
+            },
             {
               path: '/roomReservationsDetails_swt', //订房管理详情 swt旅行社
               name: 'roomReservationsDetails_swt',