页面修改

src/components/TravelManager/TravelList/HotelOrderTotal.vue

@@ -328,9 +328,9 @@
 
     <table class="SalesHotelOrderTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
-        <th width="50">{{$t('hotel.order_Number')}}</th>
+        <th width="70">{{$t('hotel.order_Number')}}</th>
         <th width="105">{{$t('salesModule.ThirdOrderNum')}}</th>
-        <th width="100">{{$t('visa.v_tuanhao')}}</th>
+        <th width="120">{{$t('visa.v_tuanhao')}}</th>
         <th>{{$t('hotel.hotel_roomnumber')}}</th>
         <th>{{$t('hotel.hotel_Currency')}}</th>
         <th>{{$t('sm.zonge')}}</th>
@@ -339,7 +339,6 @@
         <th>{{$t('sm.youhuijine')}}</th>
         <th>{{$t('Operation.Op_daishou')}}</th>
         <th>{{$t('hotel.hotel_OrderStates')}}</th>
-        <th>{{$t('fnc.cjshijian')}}</th>
         <th>预定信息</th>
         <th>{{$t('salesModule.CancelFee')}}</th>
         <th width="110">{{$t('fnc.khxinxi')}}</th>
@@ -375,10 +374,13 @@
           <td>
             <span :class="item.OrderStatus=='已取消'?'color_red_order':''">{{item.OrderStatus}}</span>
           </td>
-          <td>{{item.CreateDateStr}}</td>
           <td style="text-align:left;padding:3px;">
             {{item.HotelName}}({{item.HotelCode}}) <br />
             {{item.CheckInStr}}(入住)-{{item.CheckOutStr}}(离开)
+            <template v-if="item.ContractInfo&&item.ContractInfo.RoomName">
+              <br />
+              房型:{{item.ContractInfo.RoomName}}
+            </template>
             <template v-if="item.ContractInfo&&item.ContractInfo.guestLastName&&item.ContractInfo.guestFirstName">
               <br />
               联系人:{{item.ContractInfo.guestLastName}} {{item.ContractInfo.guestFirstName}}
@@ -418,9 +420,6 @@
                               (儿童)
                             </template>
                           </font>
-                          <template v-if="thirdIndex!=subItem.GuestInfo.length-1">
-                            ，
-                          </template>
                         </template>
                       </td>
                     </tr>
@@ -428,13 +427,14 @@
                 </div>
                 <font slot="reference" style="color:blue;cursor:pointer;">入住信息</font>
               </el-popover>
-
             </template>
           </td>
           <td>{{item.CancelFee}}</td>
           <td>{{item.CustomerName}}<br />{{item.CustomerPhone}}</td>
-          <td>{{item.CreateByStr}}</td>
-          <!-- <td>{{item.EndTime}}</td> -->
+          <td>{{item.CreateByStr}}
+            <br />
+            {{item.CreateDateStr}}
+          </td>
           <td>
             <el-row>
               <el-button-group>

src/components/TravelManager/TravelList/OpHotelOrderDetail.vue

@@ -408,7 +408,10 @@
             <li>
               <div v-if="details.model.Source==4">
                 <template v-if="details.parmResultRoomInfo">
-                  {{ getRoomType(details.parmResultRoomInfo.roomType) }}
+                  <template v-if="details.parmResultRoomInfo.RoomName">
+                   <font style="color:blue;"> {{details.parmResultRoomInfo.RoomName}}</font>
+                  </template>
+                  床型: {{ getRoomType(details.parmResultRoomInfo.roomType) }}
                 </template>
               </div>
               <div v-else>