页面修改

src/components/Hotel/ChangeHotel.vue

@@ -18,7 +18,6 @@
         </tr>
         <tr>
           <th width="120">入住时间</th>
- 
           <th width="200">选择酒店</th>
           <th width="120">机位数(Y/E/F)</th>
           <th width="120">占床/不占床</th>
@@ -38,9 +37,6 @@
               <td v-if="childIndex==0&&subIndex==0" :rowspan="5*item.HotelOrderList.length" class="tdCenter">
                 {{item.UseTimeStr}}
               </td>
-              <!-- <td v-if="childIndex==0" :rowspan="5" class="tdCenter">
-                <el-checkbox v-model='subItem.IsChecked'></el-checkbox>
-              </td> -->
               <td v-if="childIndex==0" :rowspan="5" class="tdLeft">
                 <p class="link" style="word-break: normal;" @click="goUrlR('HotelManagement',HotelId.HotelId,'酒店管理')">
                   {{subItem.HotelName}}</p>
@@ -67,7 +63,9 @@
                 {{subItem.HouseStatistics.HouseTypeList[childIndex].HouseGuestNum}}
               </td>
               <td v-if="childIndex==0" :rowspan="5" class="tdLeft">
-                {{subItem.NewHotelName}}
+ 
+                 <template v-if="subItem.HotelName!=subItem.NewHotelName" ><span style="color:red;">{{subItem.NewHotelName}}</span></template>
+                 <template v-else>{{subItem.NewHotelName}}</template>
               </td>
               <td class="tdCenter">
                 {{childItem.HouseTypeCount}}
@@ -153,6 +151,7 @@
           this.Loading = false;
           if (res.data.resultCode == 1) {
             this.DataList = res.data.data.HotelOrderListReport;
+            console.log("this.DataList",this.DataList)
           } else {
             this.Error(res.data.message);
           }

src/components/Hotel/roomReservationsDetails.vue

@@ -126,8 +126,8 @@
                 <table class="hotelTable">
                   <tr>
                     <td width="70" style="text-align:center;" colspan="2">
-                      <span style="color:red">{{subItem.NewHotelName}}</span>
-                      <el-popover placement="right" width="540" trigger="click" v-model="subItem.isShowPop">
+                      <span style="color:green">{{subItem.NewHotelName}}</span>
+                      <el-popover placement="right" width="540" trigger="click" v-model="subItem.isShowPop" v-if="subItem.OPState!=1">
                         <comCheckHotel :ref="'comCheckHotel'+index+subIndex+''" v-on:childHotel="childHotelList"
                           :UseDate="item.UseTimeStr">
                         </comCheckHotel>
@@ -137,6 +137,9 @@
                           酒店选择
                         </el-button>
                       </el-popover>
+                      <template v-else>
+                          <br /> <span class="Hotel_red">OP-指定，不能更换酒店.</span>
+                      </template>
                     </td>
                   </tr>
                   <tr>
@@ -340,18 +343,17 @@
               </td>
               <!-- 操作 -->
               <td v-if="childIndex==0" :rowspan="5">
-                <!--v-if="subItem.OPState!=1"-->
                 <template v-if="subItem.OPState==1">
-                  <span class="Hotel_red">OP选房确认</span>
+                  <span class="Hotel_red">OP-指定</span>
                 </template>
                 <template v-if="IsOperation!=1">
                   <el-tooltip class="item" effect="dark" content="保存" placement="top-start">
                     <el-button icon="iconfont icon-baocun1" @click="SaveSingle(subItem)" type="primary"></el-button>
                   </el-tooltip>
-                  <el-tooltip class="item" effect="dark" content="新增" placement="top-start">
+                  <el-tooltip class="item" effect="dark" content="新增" v-if="subItem.OPState!=1" placement="top-start">
                     <el-button @click='AddHotel(item,subIndex)' icon="iconfont icon-tianjia" type="primary"></el-button>
                   </el-tooltip>
-                  <el-tooltip v-if="item.HotelOrderList.length>1" class="item" effect="dark" content="删除"
+                  <el-tooltip v-if="item.HotelOrderList.length>1 && subItem.OPState!=1" class="item" effect="dark" content="删除"
                     placement="top-start">
                     <el-button type="primary" icon="iconfont icon-shanchu" @click='DeleteHotel(item,subIndex)'>
                     </el-button>
@@ -361,9 +363,6 @@
                     <commonHotelLog  :ref="'comHotelLog'+index+subIndex+''"> </commonHotelLog>
                     <div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;" @click="GetHotelLog(subItem,index,subIndex)">日志</div>
                    </el-popover>
-                <!--<template v-else>
-                    <span class="Hotel_red">OP选房确认</span>
-                </template> -->
               </td>
             </tr>
           </template>
@@ -854,6 +853,9 @@
     color: red;
   }
 
+ 
+
+
   .roomReservationsDetailsTalbe .hotelTable {
     border: none;
   }

src/components/commonPage/commonPriceHotelInfo.vue

+<style>
+  .comHotelOperation {
+    margin-top: 10px;
+  }
+
+  .comHotelOperation tr td {
+    text-align: left;
+    width: 50%;
+    padding: 5px 0;
+  }
+
+  .comHotelOperation .tdRight {
+    text-align: right;
+    width: 20%;
+  }
+
+  .comHotelOperation .tdLeft {
+    text-align: left;
+    padding-left: 5px;
+    width: 30%;
+  }
+
+</style>
+
+<template>
+  <div>
+    <div>
+      <table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
+        <tr>
+          <th width="120">日期</th>
+          <th style="width:150px;">团期</th>
+          <th style="width:100px;">状态</th>
+        </tr>
+        <template v-for="(item,index) in  HotelPriceList">
+          <tr >
+             
+        
+          </tr>
+        </template>
+      </table>
+    </div>
+ 
+  </div>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        loading: false,
+        HotelPriceList:[],
+        queryMsg:{
+          HotelId:0,
+          UseTime:"",
+        }
+      };
+    },
+    methods: {
+      //获取日志
+      getHotelPriceList(HotelId, timeStr) {
+        this.HotelPriceList=[];
+        this.loading = true;
+        if (HotelId) {
+          this.queryMsg.HotelId = HotelId;
+        }
+        if (timeStr) {
+          this.queryMsg.UseTime = timeStr;
+        }
+        this.apipost('travel_get_GetHotelUsePriceListService', this.queryMsg, res => {
+          this.loading = false;
+          if (res.data.resultCode == 1) {
+            this.HotelLogsList = res.data.data;
+            console.log("this.HotelLogsList",this.HotelLogsList);
+          }
+        }, err => {})
+      },
+    },
+    mounted() {}
+  };
+
+</script>

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -859,6 +859,12 @@
               <span v-if="childItem.UseCount>0 && subItem.SubList.length==1">
                 <span style="color:red;white-space:nowrap;cursor:pointer;" @click="DeleteStock(subItem)">删除</span>
               </span>
+              <span>
+                <el-popover width="300" trigger="click" popper-class="DMC_HotelPop">
+                    <commonPHInfo :name='"comPriceHotelInfo"+subIndex+childIndex' :ref='"comPriceHotelInfo"+subIndex+childIndex' ></commonPHInfo>
+                    <span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;" @click="GetHotelUsePriceList(childItem.HotelId,subItem.UseDay,subIndex,childIndex)">库存情况</span>
+                </el-popover>
+              </span>
             </td>
           </tr>
         </template>
@@ -914,6 +920,7 @@
 </template>
 <script>
   import TravelPriceFlightList from "../TravelGroupControl/TravelPriceFlightList.vue";
+  import commonPriceHotelInfo from "../../commonPage/commonPriceHotelInfo.vue";
   export default {
     props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid", "TeamType"],
     data() {
@@ -1007,7 +1014,17 @@
         lessPriceData: [],
       };
     },
+   components: {
+      commonPHInfo:commonPriceHotelInfo
+    },
     methods: {
+      //调用子组件方法
+      GetHotelUsePriceList(HotelId,UseDay,index,hotelSubIndex)
+      {
+       // let str = `comPriceHotelInfo${index}${hotelSubIndex}`;
+       // console.log(this.$refs[str]);
+      //  this.$refs[str][0].getHotelPriceList(HotelId, UseDay);
+      },
       //点击折叠
       fold() {
         if (this.isFold == "") {