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

src/components/TravelManager/Ticket/TravelticketManager.vue

@@ -633,9 +633,6 @@
         <li>
           <span class="hotel_name">
             <em>{{$t('system.ph_flightTime')}}</em>
-            <!-- <el-date-picker class="w150" v-model="Query.QNeedDateStart" type="date" value-format="yyyy-MM-dd"
-              placeholder="" :picker-options="pickerBeginDateBefore">
-            </el-date-picker> -->
             <DateLimit :clearable="false" :StartGroupDate="Query.QNeedDateStart" :EndGroupDate="Query.QNeedDateEnd" @change="(date)=> Query.QNeedDateStart = date"></DateLimit>
             <el-date-picker class="w150" v-model="Query.QNeedDateEnd" type="date" value-format="yyyy-MM-dd"
               placeholder="" :picker-options="pickerBeginDateAfter">
@@ -1004,7 +1001,6 @@
             this.Query.QNeedDateStart = StartDate
           }
         });
-
       },
       //页面跳转
       goUrlT(path, obj, title) {
@@ -1135,6 +1131,7 @@
       },
     },
     mounted() {
+      this.Query.QNeedDateStart=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"));
       this.GetSupperOrderEditAuth()
       this.getEmployeeList();
       this.GetLineList();

src/components/busManagement/busSuplier.vue

@@ -102,7 +102,7 @@
       </el-dialog>
     </div>
     <div class="supplierList clearfix" v-loading="loading">
-      <div class="supList" v-for="item in tabelDate" :key="item.subCode">
+      <div class="supList" style="width:210px;" v-for="item in tabelDate" :key="item.subCode">
         <div class="suTop">
           <img src="../../assets/img/suplier.jpg">
           <div class="topCircle">{{item.Number}}</div>
@@ -123,7 +123,8 @@
           <button class="hollowFixedBtn UPBtn" @click="isdelete(item.ID)">{{$t('system.table_delete')}}</button>
           <button class="hollowFixedBtn HS_financial"
             @click="AccountManage(item)">{{$t('visaT.Accountmanagement')}}</button>
-          <button  class="hollowFixedBtn HS_financial" @click="goToDriver(item)">{{$t('objFill.v101.busManagement.driverManager')}}</button>
+          <button class="hollowFixedBtn HS_financial" style="margin-left:5px;"
+            @click="goToDriver(item)">{{$t('objFill.v101.busManagement.driverManager')}}</button>
         </div>
       </div>
     </div>
@@ -150,7 +151,7 @@
         deleteID: "",
         msg: {
           pageIndex: 1,
-          pageSize: 18,
+          pageSize: 14,
           Name: "",
           Contact: "",
           Type: 5,