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

src/components/SalesModule/enrollTotal.vue

@@ -183,7 +183,7 @@
       </tr>
       <tbody v-for="(item,index) in list" :key="index">
       <tr>
-          <td rowspan="2">
+        <td rowspan="3">
           <p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
           <p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单', 'groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}
             <el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
@@ -273,6 +273,14 @@
           <button class="normalBtn" style="margin-left:0;width:95px;padding:0" @click="getSalerInfo(item)">修改业务员</button>
         </td>
       </tr>
+      <tr style="height:20px">
+        <td colspan="15" class="RL_Order" style="height:20px">
+          <span style="font-size: 14px;color: #333333">名单:</span>
+          <span v-for="(childItem) in item.guestList" >{{childItem.userName}}&nbsp;&nbsp;</span>
+          <!--            <span v-else>暂无名单</span>-->
+          <span style="display: block;font-size: 14px;color: #333333">房间信息：{{item.orderGuestHouseStr}}</span>
+        </td>
+      </tr>
       <tr>
         <td colspan="3" class="groupTourOrder_remarks" style="height: 40px;">
           <div>
@@ -687,14 +695,14 @@
 </script>
 
 <style>
-.groupts .underline{
+  .groupts .underline{
     text-decoration: underline;
     margin: 5px;
     text-align: center;
   }
-.color_red_order{
+  .color_red_order{
     color: #e95252 !important;
-}
+  }
   .enrollTotalSearch {
     width: 100%;
     min-height: auto;
@@ -764,12 +772,12 @@
     background: #fff;
     text-align: left;
   }
-.enrollTotalSearchTable tbody tr:last-child {
+  .enrollTotalSearchTable tbody tr:last-child {
     border-bottom: 2px solid #333;
-}
-.enrollTotalSearchTable tr:first-child td:first-child {
+  }
+  .enrollTotalSearchTable tr:first-child td:first-child {
     border-bottom: 2px solid #333;
-}
+  }
   .enrollTotalSearchTable tr td {
     height: 80px;
     padding: 10px;