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

src/components/dmc/manager/dmcTotalTable.vue

@@ -57,12 +57,13 @@
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle">
       <table border="0" cellspacing="1" cellpadding="0" class="dmcTotalTable" v-loading="loading">
         <tr>
-          <th colspan="10">公司通用信息</th>
+          <th colspan="11">公司通用信息</th>
           <th colspan="5">团队需求表</th>
           <th colspan="7">地接op操作</th>
         </tr>
         <tr>
           <th width="130">序号</th>
+          <th width="75">出团公司</th>
           <th width="75">出发地</th>
           <th width="80">航班时间</th>
           <th width="125">公司团号</th>
@@ -94,6 +95,9 @@
               <td>
                 {{item.StartCityNames}}
               </td>
+              <td>
+                {{item.OutBranchName}}
+              </td>
               <td>
                 <div class="w120">
                   {{item.FlightDate}}
@@ -264,7 +268,7 @@
               </td>
             </tr>
             <tr>
-              <td colspan="21" style="text-align: left!important;padding:0 20px;">
+              <td colspan="22" style="text-align: left!important;padding:0 20px;">
                 <div class="link">
                   <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')" style="padding-top:4px;">{{item.Titles}}</p>
                   <div v-if="outItem.StaticsReportList[index].DMCNum && outItem.StaticsReportList[index].DMCNum!=''" class="colorE95252" style="padding-top:5px;">地接备注团号:{{outItem.StaticsReportList[index].DMCNum}}</div>