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

src/components/busManagement/tripBusOrder.vue

@@ -157,16 +157,6 @@
           <el-col :span="8" style="text-align:left">{{postMsg.UseDayNum}}</el-col>
         </el-col>
       </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-col :span="4" style="text-align:right">接机信息：</el-col>
-          <el-col :span="8" style="text-align:left">{{postMsg.PickUpInfo}}</el-col>
-        </el-col>
-        <el-col :span="12">
-          <el-col :span="4" style="text-align:right"></el-col>
-          <el-col :span="8" style="text-align:left"></el-col>
-        </el-col>
-      </el-row>
       <el-row>
         <el-col :span="12">
           <el-col :span="4" style="text-align:right">去程航班：</el-col>
@@ -200,8 +190,8 @@
           </el-col>
         </el-col>
         <el-col :span="12">
-          <el-col :span="4" style="text-align:right"></el-col>
-          <el-col :span="8" style="text-align:left"></el-col>
+          <el-col :span="4" style="text-align:right">接机信息：</el-col>
+          <el-col :span="8" style="text-align:left">{{postMsg.PickUpInfo}}</el-col>
         </el-col>
       </el-row>
       <span>
@@ -340,7 +330,6 @@
         <el-col :span="12">
           <el-col :span="4" style="text-align:right"></el-col>
           <el-col :span="8" style="text-align:left">
-
           </el-col>
         </el-col>
       </el-row>
@@ -390,7 +379,7 @@
         DataList: [], //数据列表
         msg: {
           pageIndex: 1,
-          pageSize: 10,
+          pageSize: 12,
           UseCompName: "", //订车公司
           UseName: "", //订车人
           TeamName: "", //团体名称