页面修改

src/components/Hotel/roomReservationsDetailsNew.vue

@@ -42,10 +42,7 @@
           <span v-if="IsOperation==1" style="color:red;font-size:14px;">{{$t('ground.yizhidanbng')}}</span>
         </li>
       </ul>
-      {{$t('ground.jisuan1')}} <br />
-      {{$t('ground.jisuan2')}} <br />
-      {{$t('ground.sidaobsuan')}}<br />
-      付款方式是现付的，必須上传手配书.
+
     </div>
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; " :style="{height: boxHeight + 'px'}"
       class="ownScrollbarStyle" ref="ownScrollbarStyle">
@@ -56,7 +53,7 @@
             &nbsp;&nbsp;{{$t('leader.leader_Guide')}}:{{GuideName}}.</th>
           <th class="fz14" colspan="17">
             <el-tooltip class="item" effect="dark" content="批量上传手配书" placement="top-start"
-              style="float:left;margin-left:20px;">
+              style="float:left;margin-left:20px;display:none;">
               <el-popover placement="bottom" popper-class="piliangPop" width="400" trigger="click"
                 v-model="isShowPiliangPop">
                 <table class="dmcSetTable roomReserSet" border="0" cellspacing="0" cellpadding="0">
@@ -273,7 +270,10 @@
               <!-- 房间类型 -->
               <td>
                 <div v-if="childItem.HouseType === 2">
-                {{subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeNameExt}}
+                  <template
+                    v-if="subItem.HouseStatistics.HouseTypeList&&subItem.HouseStatistics.HouseTypeList.length>1">
+                    {{subItem.HouseStatistics.HouseTypeList[1].HouseTypeNameExt}}
+                  </template>
                   <template v-if="childIndex==4">
                     <template v-if="subItem.DriverGuideIsRebate==1">
                       <br /><span style="color:green">{{$t('hotel.hotel_commission')}}</span>
@@ -290,14 +290,16 @@
               <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></div>
+                    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></div>
+                  </el-input>
+                </div>
               </td>
               <!-- 尚差房间数 -->
               <!-- <td>
@@ -310,7 +312,7 @@
               <td>
                 <div v-if="childItem.HouseType === 2">
                   <template v-if="childIndex==1">
-                  <template v-if="EditBtn||LineId==90">
+                    <template v-if="EditBtn">
                       <el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
                         @input="calculationPrice(subItem)" v-model='childItem.UnitPrice'></el-input>
                     </template>
@@ -333,7 +335,8 @@
                 <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></div>
+                  </el-input>
+                </div>
               </td>
               <!-- 金额小计 -->
               <td style="white-space:nowrap;">
@@ -696,7 +699,7 @@
             BookNum: 0
           },
         ],
-        ChooseCountry:"651"
+        ChooseCountry: "651"
       }
     },
     components: {
@@ -945,12 +948,12 @@
           IsCombine: '',
           NewTCIDs: ''
         }
-        if(this.$route.query.OrderType){
+        if (this.$route.query.OrderType) {
           msg = {
             TCIDs: this.$route.query.id,
             OrderType: this.$route.query.OrderType
           }
-        }else{
+        } else {
           msg = {
             TCIDs: this.$route.query.id,
             NewCombinationNum: this.$route.query.NewCombinationNum,
@@ -973,9 +976,9 @@
             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">
+            //  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) => {
@@ -1002,7 +1005,8 @@
                     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))
+                  console.log('subItem.OrderDetailsList', subItem.OrderDetailsList, subItem.OrderDetailsList
+                    .filter(item => item.HouseType === 2))
                   subItem.isShowPop = false;
                   subItem.ckedHotelName = "";
                   //遍历手配
@@ -1241,13 +1245,10 @@
       if (this.$route.query.LineId) {
         this.LineId = this.$route.query.LineId;
       }
-      if(this.LineId==90)
-      {
-        this.ChooseCountry=2;
-      }
-      else if(this.LineId==14)
-      {
-        this.ChooseCountry=651;
+      if (this.LineId == 90) {
+        this.ChooseCountry = 2;
+      } else if (this.LineId == 14) {
+        this.ChooseCountry = 651;
       }
       this.GetAuth();
       this.getAllCurrency();

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -670,7 +670,7 @@
                     <span class="TCL-greenType">{{item.SaleClearOrderHour}}{{$t('salesModule.Hour')}}</span>
                   </p>
                   <p
-                    v-if="(item.LineID==14 || item.LineID==90) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
+                    v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
                     <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"