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

src/components/Hotel/roomQuery.vue

@@ -123,6 +123,8 @@
           <th width="100">出发地</th>
           <th width="80">公司团号</th>
           <th width="150">航班</th>
+          <th width="100">领队</th>
+          <th width="100">导游</th>
           <th width="100">系列</th>
           <th width="80">机位总数<br />(Y/E/F)</th>
           <th width="100">使用时间</th>
@@ -160,6 +162,12 @@
                         </span><br />
                       </template>
                     </td>
+                    <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
+                      {{item.LeaderName}}
+                    </td>
+                    <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
+                      {{item.GuideName}}
+                    </td>
                     <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
                       {{item.LineteamName}}
                     </td>
@@ -373,6 +381,7 @@
               });
             }
             this.dataList = sourceData;
+            console.log("this.dataList",this.dataList)
           } else {
             this.$message.error(res.data.message)
           }