页面修改

src/components/Hotel/roomReservations.vue

@@ -68,8 +68,8 @@
                         <th width="60">{{$t('Airticket.Air_segment')}}</th>
                         <th width="80">{{$t('system.query_flightNum')}}</th>
                         <th width="150">起飞时间</th>
-                        <th width="150">到达时间</th>
-                        <th width="80">经停城市</th>
+                        <th width="80">到达时间</th>
+                        <th width="100">经停城市</th>
                       </tr>
                       <tr v-for="(ds,din) in item.FlightList" :key="din" style="text-align:center;">
                         <td class="_d_name _color_666">
@@ -94,7 +94,7 @@
                       </tr>
                     </table>
                     <el-button slot="reference" class="normalBtn mt5"
-                      style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;color:#fff;'>详情</el-button>
+                      style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>详情</el-button>
                   </el-popover>
                 </div>
               </td>
@@ -135,11 +135,13 @@
               </td>
               <td style="vertical-align: top;">
                 <div :style="{width:150*item.CommonReport.newHotel.length+'px'}">
-                  <div class="w150" v-for="childItem in item.CommonReport.newHotel" style="float:left;border-right:1px solid #d1d1d1;">
+                  <div class="w150" v-for="childItem in item.CommonReport.newHotel"
+                    style="float:left;border-right:1px solid #d1d1d1;">
                     <p class="pDateStyle">{{childItem.CheckInDateStr}}</p>
                     <p @click="goUrlR('HotelManagement',childItem.HotelId,'酒店管理')"
                       class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;">
-                      <span v-if='childItem.HotelOrderState==0' class="colorE95252">（待定）</span>{{childItem.NewHotelName}}
+                      <span v-if='childItem.HotelOrderState==0'
+                        class="colorE95252">（待定）</span>{{childItem.NewHotelName}}
                     </p>
                     <p class="pDateStyle">{{item.CommonReport.HouseStatistics.RealityRoomNum}}</p>
                     <p class="pDateStyle">
@@ -149,7 +151,7 @@
                       <span v-for="x in item.CommonReport.HouseStatistics.HouseTypeList">{{x.HouseTypeCount}}</span>
                       <span v-if="item.CommonReport.HouseStatistics.HouseTypeList.length==0">暂无订房</span>
                     </p>
-                  </div>  
+                  </div>
                 </div>
               </td>
 
@@ -289,35 +291,19 @@
             for (let i = 1; i <= res.data.data.pageData.columnsCount; i++) {
               this.thLengthTitle.push('第' + i + '晚')
             }
-            this.list.forEach(outItem => {
-              outItem.StaticsReportList.forEach(item => {
-                item.CommonReport['valueLength'] = item.CommonReport.HotelOrderListReport.length
-                if (item.CommonReport.HotelOrderListReport.length < res.data.data.pageData.columnsCount) {
-                  let _cha = res.data.data.pageData.columnsCount - item.CommonReport.HotelOrderListReport.length
-                  let _chaArr = new Array()
-                  for (let i = 0; i < _cha; i++) {
-                    _chaArr.push({
-                      'HotelName': ''
+            this.list.forEach(x => {
+              x.StaticsReportList.forEach(y => {
+                y.CommonReport.newHotel = [];
+                if (y.CommonReport.HotelOrderListReport != null && y.CommonReport.HotelOrderListReport
+                  .length > 0) {
+                  y.CommonReport.HotelOrderListReport.forEach(z => {
+                    z.HotelOrderList.forEach(q => {
+                      y.CommonReport.newHotel.push(q);
                     })
-                  }
-                  item.CommonReport.HotelOrderListReport = item.CommonReport.HotelOrderListReport.concat(_chaArr)
+                  })
                 }
-              })
-            })
 
-            this.list.forEach(x=>{
-              x.StaticsReportList.forEach(y=>{
-                  y.CommonReport.newHotel=[];
-                  if(y.CommonReport.HotelOrderListReport!=null && y.CommonReport.HotelOrderListReport.length>0)
-                  {
-                    y.CommonReport.HotelOrderListReport.forEach(z=>{
-                                    z.HotelOrderList.forEach(q=>{
-                                      y.CommonReport.newHotel.push(q);
-                                    })
-                      })
-                  }
-              
-                y.colNum = 9+y.CommonReport.newHotel.length;
+                y.colNum = 9 + y.CommonReport.newHotel.length;
               })
             })
           } else {

src/components/Hotel/roomReservationsDetails.vue

@@ -237,6 +237,9 @@
       //添加酒店
       AddHotel(item, subIndex) {
         var subItem = JSON.parse(JSON.stringify(item.HotelOrderList[subIndex]));
+        subItem.HotelId=0;
+        subItem.HotelName="";
+        subItem.OrderID=0;
         item.HotelOrderList.push(subItem);
       },
       //删除酒店
@@ -321,7 +324,6 @@
         }, res => {
           if (res.data.resultCode == 1) {
             this.list = res.data.data.HotelOrderListReport;
-            console.log("this.list", this.list);
             this.CreateBy = res.data.data.CreateBy;
             this.CreateByPhoto = res.data.data.CreateByPhoto;
             this.CreateByAccount = res.data.data.CreateByAccount;
@@ -364,10 +366,11 @@
         this.$forceUpdate();
       },
       getHotelList(obj) {
-        this.apipost('hotel_post_GetLineHotelList', {
-          IsGetPic: 0,
-          IsGetRemark: 0,
-          //QCity: obj.QCity
+        this.apipost('hotel_post_GetHasStockHotelList', {
+          //1-只查询有库存的酒店
+          IsMoreThanZero:0,
+          Country: "651",
+          sDate:obj.CheckInDateStr
         }, res => {
           if (res.data.resultCode == 1) {
             obj.hotelList = res.data.data;