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

src/components/TravelManager/TravelList/RegistrationStatistics.vue

@@ -318,7 +318,7 @@
         queryMsg: {
           pageIndex: 1,
           pageSize: 50,
-          LineID: 0,
+          LineId: 0,
           ltID: 0,
           PlaceID: 0,
           OutBranchId: -1,

src/components/TravelManager/TravelList/RegistrationStatistics_Sale.vue

@@ -126,7 +126,7 @@
         <li>
           <span>
             <em>{{$t('advmanager.v_line')}}</em>
-            <el-select class='w150' v-model="queryMsg.LineID" filterable :placeholder="$t('pub.pleaseSel')"
+            <el-select class='w150' v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
               @change="getLineTeamList()">
               <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
               <el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID'
@@ -168,7 +168,6 @@
       <tr>
         <th width="50">{{$t('salesModule.Xu')}}</th>
         <th width="80">{{$t('Operation.Op_chutuan')}}</th>
-
         <th width='200'>系列</th>
         <th width="80">{{$t('fnc.tuanqi')}}</th>
         <th width="80">{{$t('fnc.tuanqi')}}</th>
@@ -287,7 +286,7 @@
         queryMsg: {
           pageIndex: 1,
           pageSize: 50,
-          LineID: 0,
+          LineId: 0,
           ltID: 0,
           OutBranchId: -1,
           QStartDate: "",
@@ -351,7 +350,7 @@
       getLineTeamList() {
         this.queryMsg.ltID = 0;
         let msg = {
-          lineID: this.queryMsg.LineID,
+          lineID: this.queryMsg.LineId,
           isTOOP: 1
         };
         this.apipost("team_post_GetList", msg, res => {