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

src/components/TravelManager/TravelList/RegistrationStatistics.vue

@@ -157,10 +157,10 @@
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='queryCommonData.loading'>
       <tr>
         <th width="50">{{$t('active.ad_xuhao')}}</th>
-        <th width="60">{{$t('Operation.Op_chutuan')}}</th>
+        <th width="100">{{$t('Operation.Op_chutuan')}}</th>
         <th width='120'>{{$t('Operation.Op_TeamName')}}</th>
         <th width="80">{{$t('fnc.tuanqi')}}</th>
-        <th width="130">团期编号</th>
+        <th width="80">团期编号</th>
         <th width="80">{{$t('Operation.Op_jinchudian')}}</th>
         <th width="100">{{$t('Operation.Op_ArriveTime')}}</th>
         <th width="50">{{$t('Operation.Op_price')}}</th>
@@ -179,7 +179,7 @@
           'Rs_Start4':item.StartCityNum==4,'Rs_Start5':item.StartCityNum==5,'Rs_Start6':item.StartCityNum==6,
           'Rs_Start7':item.StartCityNum==7,'Rs_Start8':item.StartCityNum==8,'Rs_Start9':item.StartCityNum==9,
           'Rs_Start10':item.StartCityNum==10,'Rs_Start11':item.StartCityNum==11,'Rs_Start12':item.StartCityNum==12,'Rs_Start13':item.StartCityNum==13}">
-            {{item.StartCityName}}</td>
+            {{item.StartCityName}} ({{item.OutBranchName}})</td>
           <td>{{item.LtName}}</td>
           <td>{{item.StartDateStr}} {{item.AlCode}}</td>
           <td><span title="点击跳转到团控列表" :class="item.TCID>0?'RS_RedType PingFangSC Order_RS':'Order_RS'"  @click="goUrlTCList('TravelControlList',item.TCNUM,'团控列表')">{{item.TCID}}</span></td>