1

src/components/Hotel/roomReservationsDetails.vue

@@ -26,16 +26,16 @@
           <span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能在修改!</span>
         </li>
       </ul>
-      税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br/>
-      税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100) <br/>
+      税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br />
+      税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100) <br />
       司导间【月结】不计入总金额
     </div>
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; " :style="{height: boxHeight + 'px'}"
       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')"
@@ -198,7 +189,8 @@
               </td>
               <td>
                 <el-input class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(childItem,'BookNum')"
-                  @input="calculationPrice(subItem)" v-model='childItem.BookNum' :disabled="IsEditHotelPeople==0?true:false">
+                  @input="calculationPrice(subItem)" v-model='childItem.BookNum'
+                  :disabled="IsEditHotelPeople==0?true:false">
                 </el-input>
               </td>
               <!-- 尚差房间数 -->
@@ -238,13 +230,13 @@
               <td>
                 <template v-if="childIndex<4">
                   <el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')"
-                    v-model='childItem.RebateRatio' @input="SetRebateRatio(subItem,childItem.RebateRatio),calculationPrice(subItem)"
+                    v-model='childItem.RebateRatio'
+                    @input="SetRebateRatio(subItem,childItem.RebateRatio),calculationPrice(subItem)"
                     :disabled="IsEditHotel==0?true:false"></el-input> %
                 </template>
                 <template v-if="childIndex==5">
                   <el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')"
-                    v-model='childItem.RebateRatio' @input="calculationPrice(subItem)"
-                    :disabled="true"></el-input> %
+                    v-model='childItem.RebateRatio' @input="calculationPrice(subItem)" :disabled="true"></el-input> %
                 </template>
                 <template v-if="childIndex==4 && subItem.DriverGuideIsRebate==0">
                   <el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')"
@@ -355,12 +347,12 @@
                       <el-select class='w135 sel' v-model='subItem.DMCPayType' :placeholder="$t('pub.pleaseSel')"
                         :disabled="IsEditHotel==0?true:false" @change="calculationPrice(subItem)">
                         <el-option label='请选择' :value='0'></el-option>
-                        <el-option label='月结' :value='9' ></el-option>
-                        <el-option label='现付' :value='1' ></el-option>
+                        <el-option label='月结' :value='9'></el-option>
+                        <el-option label='现付' :value='1'></el-option>
                         <el-option label='签单' :value='2'></el-option>
-                        <el-option label='实物抵扣' :value='3' ></el-option>
+                        <el-option label='实物抵扣' :value='3'></el-option>
                         <el-option label='预付' :value='4'></el-option>
-                        <el-option label='预付款抵扣' :value='5' ></el-option>
+                        <el-option label='预付款抵扣' :value='5'></el-option>
                         <el-option label='公司合团支付' :value='6'></el-option>
                       </el-select>
                     </td>
@@ -457,6 +449,8 @@
   export default {
     data() {
       return {
+        //当前登录用户
+        CurrentUserInfo: {},
         defaultSelectValue: 0,
         list: [],
         roomList: [],
@@ -478,7 +472,8 @@
         checkedsubIndex: '',
         loading: false,
         boxHeight: 0,
-
+        //合团的团期编号
+        NewTCIDs: "",
         //供应商列表
         SupplierList: [],
         ckedHotelId: 0,
@@ -492,8 +487,8 @@
         IsOperation: 1,
         LeaderName: "", //领队名称
         GuideName: "", //导游名称
-        IsEditHotelPeople:0,//是否有修改人数权限[0-不能修改，1-可以修改]
-        IsCombine:false,//是否是合团，true-是合团，false-不是合团
+        IsEditHotelPeople: 0, //是否有修改人数权限[0-不能修改，1-可以修改]
+        IsCombine: false, //是否是合团，true-是合团，false-不是合团
       }
     },
     components: {
@@ -503,11 +498,9 @@
     },
     methods: {
       //付款方式切换
-      PayChange(subItem)
-      {
-         if(subItem.PayStyle>0)
-         {
-            subItem.DMCPayType=subItem.PayStyle;
+      PayChange(subItem) {
+        if (subItem.PayStyle > 0) {
+          subItem.DMCPayType = subItem.PayStyle;
         }
       },
       //调用子组件方法
@@ -577,12 +570,10 @@
         this.$refs[str][0].getCheckHotel();
       },
       //输入返佣自动前面4个房型赋值
-      SetRebateRatio(subItem,newValue)
-      {
-         subItem.OrderDetailsList.forEach((sItem,sIndex)=>{
-             if(sIndex<4)
-             {
-                sItem.RebateRatio=newValue;
+      SetRebateRatio(subItem, newValue) {
+        subItem.OrderDetailsList.forEach((sItem, sIndex) => {
+          if (sIndex < 4) {
+            sItem.RebateRatio = newValue;
           }
         });
       },
@@ -706,18 +697,24 @@
         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;
             this.IsEditHotel = res.data.data.IsEditHotel;
-            this.IsEditHotelPeople=res.data.data.IsEditHotelPeople;
+            this.IsEditHotelPeople = res.data.data.IsEditHotelPeople;
+            if (this.CurrentUserInfo.EmployeeId == 615) {
+              this.IsEditHotel = 1;
+              this.IsEditHotelPeople = 1;
+              
+            }
             let list = res.data.data.HotelOrderListReport;
             this.CreateBy = res.data.data.CreateBy;
             this.CreateByPhoto = res.data.data.CreateByPhoto;
             this.CreateByAccount = res.data.data.CreateByAccount;
             if (list != null && list.length > 0) {
-              list.forEach((item,sIndex) => {
+              list.forEach((item, sIndex) => {
                 item.HotelOrderList.forEach(subItem => {
                   subItem.hotelList.push({
                     Name: subItem.NewHotelName,
@@ -749,22 +746,19 @@
       calculationPrice(obj) {
         let totalPrice = 0;
         obj.OrderDetailsList.forEach((item, index) => {
-          var tempPrice=0;
-          var coefficient=1;
+          var tempPrice = 0;
+          var coefficient = 1;
           //税别
-          if(obj.TaxType == 2)
-          {
-            coefficient=1+0.08;
+          if (obj.TaxType == 2) {
+            coefficient = 1 + 0.08;
           }
-          if(index==4 && obj.DMCPayType==9)
-          {
-             tempPrice=0;
-          }
-          else
-          {
-             tempPrice= item.UnitPrice * (item.BookNum - item.HotelDiscount) * (coefficient - item.RebateRatio / 100);
+          if (index == 4 && obj.DMCPayType == 9) {
+            tempPrice = 0;
+          } else {
+            tempPrice = item.UnitPrice * (item.BookNum - item.HotelDiscount) * (coefficient - item.RebateRatio /
+              100);
           }
-          totalPrice+=tempPrice;
+          totalPrice += tempPrice;
         })
         totalPrice += obj.ParkFee + obj.CityTax + obj.InTangTax;
         obj.TotalPrice = totalPrice.toFixed(2);
@@ -928,12 +922,15 @@
       },
     },
     mounted() {
+      let userInfo = this.getLocalStorage()
+      this.CurrentUserInfo = userInfo;
       this.LeaderName = this.$route.query.LeaderName;
       this.GuideName = this.$route.query.GuideName;
       this.TCNUM = this.$route.query.TCNUM;
       this.flightTotal = this.$route.query.flightTotal;
       this.GuestNum = this.$route.query.GuestNum;
-      this.IsCombine=this.$route.query.IsCombine;
+      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();