旅客名单下载

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1176,7 +1176,8 @@
                     item.SalePlatList.push(parseInt(y))
                   })
                 }
-              })
+                //console.log("HotelOrderListReports",item.HotelOrderListReports);
+              });
             }
           },
           err => {}
@@ -1782,7 +1783,7 @@
       if (this.queryCommonData.IsParentCompany != 1) {
         this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id)
       }
-      this.getControlList()
+      this.getControlList();
     }
   }
 

src/components/TravelManager/TravelList/TravelpassengerList.vue

@@ -55,8 +55,8 @@
       v-loading="QueryMsg.loading"
     >
       <tr>
-        <th width="50">ID</th>
-        <th width="50">分房</th>
+        <th width="50">房间数</th>
+        <th width="50">房号</th>
         <th width="130">酒店及房型</th>
         <th width="130">旅客姓名</th>
         <th width="110">英文姓</th>
@@ -82,8 +82,8 @@
       </tr>
       <tbody v-for="(item,index) in QueryMsg.dataList" :key="index">
         <tr v-for="(subItem,subIndex) in item">
-          <td>{{subItem.Number}}</td>
-          <td>{{subItem.HouseNo!="10000"?subItem.HouseNo:""}}</td>
+          <td v-if="subIndex==0" :rowspan="subItem.RowsCount">{{index+1}}</td>
+          <td v-if="subIndex==0" :rowspan="subItem.RowsCount"></td>
           <td>{{getHouseTypeStr(subItem)}}</td>        
           <td>{{subItem.GuestName}}</td>
           <td>{{subItem.ESurName}}</td>
@@ -106,11 +106,11 @@
           </td>
           <td>{{subItem.VisaType}}</td>
         </tr>
-        <tr height="30">
+        <!-- <tr height="30">
           <td colspan="21" align="left">
             <span class="colorE95252" style="text-align:left">备注：{{item[0].Remarks}}</span>
           </td>
-        </tr>
+        </tr> -->
       </tbody>
     </table>
   </div>