页面修改

src/components/Hotel/roomReservationsDetailsNew.vue

@@ -49,8 +49,8 @@
       <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe" v-loading="loading">
         <tr>
           <th class="fz14" colspan="5">
-            {{$t('visa.v_teaminfo')}}&nbsp;&nbsp;{{$t('leader.leader_Leader')}}:{{LeaderName}}
-            &nbsp;&nbsp;{{$t('leader.leader_Guide')}}:{{GuideName}}.</th>
+            {{$t('visa.v_teaminfo')}}:{{TCNUM}}&nbsp;&nbsp;{{$t('leader.leader_Leader')}}:{{LeaderName}}
+            &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;display:none;">
@@ -137,7 +137,6 @@
           <th width="100">{{$t('ground.fangjianleixing')}}</th>
           <th width="80">{{$t('ground.fangjian')}}<br />{{$t("ground.yudingshu")}}</th>
           <th width="80">{{$t('ground.yudingrenshu')}}</th>
-          <!-- <th width="80">尚差<br />房间数</th> -->
           <th width="80">{{$t('ground.danjiameiren')}}</th>
           <th width="80">{{$t('ground.mianjianrenshu')}}</th>
           <th width="80">{{$t('ground.jinexiaoji')}}</th>
@@ -301,13 +300,6 @@
                   </el-input>
                 </div>
               </td>
-              <!-- 尚差房间数 -->
-              <!-- <td>
-                <p class="pHouseStyle"
-                  :class="{colorRed:childItem.HouseTypeCount-subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeCount<0}">
-                  {{childItem.HouseTypeCount-subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeCount}}
-                </p>
-              </td> -->
               <!-- 单价/每人 -->
               <td>
                 <div v-if="childItem.HouseType === 2">
@@ -975,11 +967,6 @@
             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 => {
@@ -991,10 +978,7 @@
                     Name: subItem.NewHotelName,
                     ID: subItem.NewHotelId
                   });
-                  //默认成日元
-                  if (subItem.CurrencyId == 0) {
-                    subItem.CurrencyId = 3;
-                  }
+
                   subItem.OrderDetailsList.forEach((x, index1) => {
                     x.HouseTypeCount = x.HouseTypeCount.toString();
                     x.UnitPrice = x.UnitPrice.toString();
@@ -1004,11 +988,12 @@
                     subItem.ReserveNo = this.$route.query.NewCombinationNum;
                   }
                   subItem.OrderDetailsList = subItem.OrderDetailsList.filter(item => item.HouseType === 2)
-                  // this.calculationPrice(subItem);
-        const item = subItem.OrderDetailsList.find(item => item.HouseType === 2) || {TotalPrice: 0}
-        subItem.TotalPrice = item.TotalPrice.toFixed(2);
-        // 将金额总计的值赋值给金额小计
-        subItem.OrderDetailsList[0].TotalPrice = Number(subItem.TotalPrice).toFixed(2);
+                  const item = subItem.OrderDetailsList.find(item => item.HouseType === 2) || {
+                    TotalPrice: 0
+                  }
+                  subItem.TotalPrice = item.TotalPrice.toFixed(2);
+                  // 将金额总计的值赋值给金额小计
+                  subItem.OrderDetailsList[0].TotalPrice = Number(subItem.TotalPrice).toFixed(2);
                   subItem.isShowPop = false;
                   subItem.ckedHotelName = "";
                   //遍历手配

src/components/orderCommon/productOrderList.vue

@@ -484,9 +484,6 @@
                 <span v-if="item.CustomerName">客户名称：{{item.CustomerName}}
                 </span>
               </p>
-              <!-- <p v-if="item.PriceOfferUrl&&item.PriceOfferUrl!=''">
-                  <a style="color:blue;" :href="item.PriceOfferUrl" v-if="item.PriceOfferUrl" target="_blank">下载报价单</a>
-                </p> -->
             </div>
           </div>
           <div class="d2" v-if="pagesTitle=='跟团游产品'">
@@ -608,7 +605,8 @@
               <span class="TCL-greenType">{{ item.SaleClearOrderHour
                   }}{{ $t("salesModule.Hour") }}</span>
             </p>
-            <p v-if="item.LineID == 14 && item.HotelOrderListReports && item.HotelOrderListReports.length > 0">
+            <!--日本线和欧洲线显示酒店预定情况-->
+            <p v-if="(item.LineID == 14||item.LineID==168) && item.HotelOrderListReports && item.HotelOrderListReports.length > 0">
               <el-popover width="600" trigger="click" popper-class="PQ_HotelPop">
                 <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj">
                 </commonHotelInfo>