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

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -360,7 +360,7 @@
                   </div>
                 </div>
                 <button class="normalBtn TC_SearchBtn"
-                  @click="getControlList(),resetPageIndex(),queryCommonData.showWarningSearch=false">{{$t('pub.searchBtn')}}</button>
+                  @click="resetPageIndex(),getControlList(),queryCommonData.showWarningSearch=false">{{$t('pub.searchBtn')}}</button>
               </div>
               <span class="advancedQuery" slot="reference">{{$t('Operation.Op_warningSearch')}}
                 <i class="iconfont icon-xiaotuziCduan_1"></i>
@@ -368,7 +368,7 @@
             </el-popover>
           </li>
           <li>
-            <button class="hollowFixedBtn" @click="getControlList(),resetPageIndex()">{{$t('pub.searchBtn')}}</button>
+            <button class="hollowFixedBtn" @click="resetPageIndex(),getControlList()">{{$t('pub.searchBtn')}}</button>
           </li>
         </ul>
       </div>
@@ -2522,6 +2522,7 @@
         ) {
           this.queryCommonData.checkCompanyAll = true;
         }
+        this.resetPageIndex();
         this.getControlList();
       },
       //查询全部