Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/leaderPay2.vue

@@ -549,7 +549,8 @@
         </tr>
         <tr>
           <th width="180">使用日期</th>
-          <th width="180">酒店名称</th>
+          <th width="180">原酒店</th>
+           <th width="180">实际入住酒店</th>
           <th width="">房间类型</th>
           <th width="">预定人数 </th>
           <th width="">单价/人</th>
@@ -569,6 +570,9 @@
               </td>
               <td v-if="subIndex==0 && childIndex == 0" :rowspan="item.row">
                 {{subItem.HotelName}}
+              </td>
+                <td v-if="subIndex==0 && childIndex == 0" :rowspan="item.row">
+                {{subItem.NewHotelName}}
               </td>
               <td>
                 <span v-if="childItem.HouseType === 1">单间</span>