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

src/components/TravelManager/TravelList/RegistrationStatistics.vue

@@ -157,9 +157,11 @@
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='queryCommonData.loading'>
       <tr>
         <th width="50">{{$t('active.ad_xuhao')}}</th>
-        <th width="80">{{$t('Operation.Op_chutuan')}}</th>
-        <th width='200'>{{$t('Operation.Op_TeamName')}}</th>
+        <th width="60">{{$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="100">航空公司代码</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>
@@ -181,6 +183,8 @@
             {{item.StartCityName}}</td>
           <td>{{item.LtName}}</td>
           <td>{{item.StartDateStr}}</td>
+          <td>{{item.TCNUM}}({{item.TCID}})</td>
+          <td>{{item.AlCode}}</td>
           <td>{{item.InOut}}</td>
           <td>{{item.InOutTime}}</td>
           <td>{{item.B2CMemberPrice}}</td>
@@ -349,11 +353,14 @@
       },
       DownLoadFile() {
         this.Info("正在下载文件...")
+        this.queryCommonData.loading=true;
         this.GetLocalFile(
           "travel_get_DownTravelPriceOrderStatistics",
           this.queryMsg,
-          "报名统计.xls"
-        );
+          "报名统计.xls",
+           res => {
+            this.queryCommonData.loading = false;
+          });
       },
       goUrl(path, id, NameStr) {
         if (id > 0) {