酒店详情页面修改

src/components/Hotel/roomReservationsDetails.vue

@@ -31,7 +31,7 @@
       <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe" v-loading="loading">
         <tr>
           <th class="fz14" colspan="8">团队信息</th>
-          <th class="fz14" colspan="13">地接操作信息</th>
+          <th class="fz14" colspan="16">地接操作信息</th>
         </tr>
         <tr>
           <th width="120">入住时间</th>
@@ -49,7 +49,11 @@
           <th width="80">单价/每人</th>
           <th width="80">免减人数</th>
           <th width="80">金额小计</th>
+          <th width="80">返佣类型</th>
           <th width="80">返佣</th>
+          <th width="80">入汤税</th>
+          <th width="80">城市税</th>
+          <th width="80">停车费</th>
           <th width="100">金额总计</th>
           <th width="250">付款方式&订团号&备注</th>
           <th width="80">操作</th>
@@ -57,11 +61,11 @@
         <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="5*item.HotelOrderList.length">
+              <td v-if="childIndex==0&&subIndex==0" :rowspan="6*item.HotelOrderList.length">
                 {{item.UseTimeStr}}
               </td>
               <!-- 酒店名称 -->
-              <td v-if="childIndex==0" :rowspan="5">
+              <td v-if="childIndex==0" :rowspan="6">
                 <table class="hotelTable">
                   <tr>
                     <td colspan="2">
@@ -96,23 +100,31 @@
 
               </td>
               <!-- 机位总数/(Y/E/F) -->
-              <td v-if="childIndex==0" :rowspan="5">
+              <td v-if="childIndex==0" :rowspan="6">
                 <p class="link" @click="goUrlT('RegistrationList',item.TCID,'报名清单')">
                   {{flightTotal}}/{{subItem.HouseStatistics.RealityYSeatNum}}/{{subItem.HouseStatistics.RealityESeatNum}}/{{subItem.HouseStatistics.RealityFSeatNum}}
                 </p>
               </td>
               <!-- 占床/不占床 -->
-              <td v-if="childIndex==0" :rowspan="5">
+              <td v-if="childIndex==0" :rowspan="6">
                 <p class="link" @click="goUrlT('passengerHouse',item.TCIDS,'房间分配')">
                   {{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}}</p>
               </td>
               <!-- 实际用房数 -->
-              <td v-if="childIndex==0" :rowspan="5">
+              <td v-if="childIndex==0" :rowspan="6">
                 {{subItem.HouseStatistics.RealityRoomNum}}
               </td>
               <!-- 房间类型 -->
               <td>
                 {{subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeName}}
+                <template v-if="childIndex==4">
+                  <template v-if="subItem.DriverGuideIsRebate==1">
+                    <br />返佣
+                  </template>
+                  <template v-else-if="subItem.DriverGuideIsRebate==0">
+                    <br /><span style="color:red;">不返佣</span>
+                  </template>
+                </template>
               </td>
               <!-- 房间数 -->
               <td>
@@ -122,7 +134,7 @@
               <td>
                 {{subItem.HouseStatistics.HouseTypeList[childIndex].HouseGuestNum}}
               </td>
-              <td v-if="childIndex==0" :rowspan="5">
+              <td v-if="childIndex==0" :rowspan="6">
                 <table class="hotelTable">
                   <tr>
                     <td width="70" style="text-align:center;" colspan="2">
@@ -176,12 +188,10 @@
                 <el-input class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')"
                   v-model='childItem.HouseTypeCount' :disabled="childIndex<4?true:false"></el-input>
               </td>
-
               <td>
                 <el-input class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(childItem,'BookNum')"
                   @input="calculationPrice(subItem)" v-model='childItem.BookNum' :disabled="childIndex<4?true:false">
                 </el-input>
-
               </td>
               <!-- 尚差房间数 -->
               <td>
@@ -207,21 +217,45 @@
               <td style="white-space:nowrap;">
                 {{childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)}}
               </td>
+              <!-- 返佣类型 -->
+              <td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
+                <template v-if="subItem.RebateType==1">
+                  含税
+                </template>
+                <template v-else>
+                  <span style="color:red"> 不含税</span>
+                </template>
+              </td>
               <!--返佣-->
               <td>
-                <p class="pHouseStyle link">
+                <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 v-else>
                   <el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')"
                     v-model='childItem.RebateRatio' @input="calculationPrice(subItem)"
                     :disabled="IsEditHotel==0?true:false"></el-input> %
-                  <span style="display:none;" class="spanlink" @click="goUrl('HotelInfo',childItem,'酒店管理')">设置</span>
-                </p>
+                </template>
+              </td>
+              <!-- 入汤税 -->
+              <td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
+                {{subItem.InTangTax}}
+              </td>
+              <!-- 城市税 -->
+              <td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
+                {{subItem.CityTax}}
+              </td>
+              <!-- 停车费 -->
+              <td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
+                {{subItem.ParkFee}}
               </td>
               <!-- 金额总计 -->
-              <td v-if="childIndex==0" :rowspan="5" style="white-space:nowrap;">
+              <td v-if="childIndex==0" :rowspan="6" style="white-space:nowrap;">
                 {{subItem.TotalPrice}}
               </td>
               <!-- 付款方式 -->
-              <td v-if="childIndex==0" :rowspan="5">
+              <td v-if="childIndex==0" :rowspan="6">
                 <table class="hotelTable">
                   <tr>
                     <td width="70" style="text-align:right;">订房状态：</td>
@@ -609,7 +643,7 @@
       },
       getList() {
         this.loading = true;
-        this.apipost('dmcstatistics_get_GetHotelStaticsDetail', {
+        this.apipost('dmcstatistics_get_GetHotelStaticsDetail_V2', {
           TCIDs: this.$route.query.id,
           NewCombinationNum: this.$route.query.NewCombinationNum
         }, res => {
@@ -651,15 +685,26 @@
       },
       calculationPrice(obj) {
         let totalPrice = 0;
-        obj.OrderDetailsList.forEach(item => {
+        obj.OrderDetailsList.forEach((item, index) => {
           //税别
           if (obj.TaxType == 2) {
-            totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item.RebateRatio /
-              100);
+            if (index == 4) {
+              if (obj.DriverGuideIsRebate == 1) {
+                totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item.RebateRatio /
+                  100);
+              } else {
+                totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
+              }
+            } else {
+              totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item.RebateRatio /
+                100);
+            }
+
           } else {
             totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
           }
         })
+        totalPrice += obj.ParkFee + obj.CityTax + obj.InTangTax;
         obj.TotalPrice = totalPrice.toFixed(2);
         this.$forceUpdate();
       },

src/components/dmc/manager/dmcTotalTable.vue

@@ -465,7 +465,6 @@
                     style="padding-top:5px;padding-bottom:4px;">
                     地接对供应商备注:{{outItem.PriceCommonList[index].SupplierRemarks}}
                   </div>
-
                   <div v-show="outItem.PriceCommonList[0].SupplierToDmcRemarks!=''" class="colorE95252"
                     style="padding-top:5px;padding-bottom:4px;">
                     供应商对地接备注:{{outItem.PriceCommonList[index].SupplierToDmcRemarks}}