11

src/components/busManagement/HPTripPlan.vue

@@ -119,13 +119,24 @@
           </li>
         </ul>
       </div>
-      <el-tag effect="dark" color="#29b6f6">已制单</el-tag>
       <div style="float: right;">
-        <el-select v-model="CarId" filterable :placeholder="$t('pub.pleaseSel')">
-          <el-option v-for="item in carList" :label="item.CarName+`(`+item.CarNo+`)`" :value="item.Id" :key="item.Id">
-          </el-option>
-        </el-select>
-        <el-button type="success" size="mini" @click="SureCar()" :loading="saveLoading">确认派车</el-button>
+        <el-form :inline="true">
+          <el-form-item label="车">    
+            <el-select v-model="CarId" filterable :placeholder="$t('pub.pleaseSel')">
+              <el-option v-for="item in carList" :label="item.CarName+`(`+item.CarNo+`)`" :value="item.Id" :key="item.Id">
+              </el-option>
+          </el-select>
+          </el-form-item>
+          <el-form-item label="司机">
+              <el-select v-model="DriverId" filterable :placeholder="$t('pub.pleaseSel')">
+                <el-option v-for="item in driverList" :label="item.DriverName" :value="item.Id" :key="item.Id">
+                 </el-option>
+              </el-select>
+          </el-form-item>
+          <el-form-item>
+             <el-button type="success" size="mini" @click="SureCar()" :loading="saveLoading">确认派车</el-button>
+          </el-form-item>
+        </el-form>
       </div>
       <div style="width: 100%; overflow-x: auto;padding-bottom: 50px;margin-top:5px;"
         :style="{height: boxHeight + 'px'}" class="ownScrollbarStyle" v-loading="loading">
@@ -259,10 +270,12 @@
           isShowEditPlanDialog: false, //是否显示新增修改
           dialogTitle: "",
           carList: [],
+          driverList:[],
           isHaveAuth: false,
           boxHeight: 0,
           CarOrderIds: "",
-          CarId: "",
+          CarId: "",//车Id
+          DriverId:"",//司机Id
           saveLoading: false,
         }
       },
@@ -293,6 +306,16 @@
             }
           });
         },
+        //获取司机列表
+        getDriverList()
+        {
+      
+           this.apipost("JapanCar_get_GetCarDriverList", {}, res => {
+            if (res.data.resultCode == 1) {
+              this.driverList = res.data.data;
+            }
+          });
+        },
         //机票导出
         downLoadPlan() {
           this.loading = true;
@@ -397,7 +420,8 @@
           this.saveLoading = true;
           this.apipost('travel_post_SetTripUseCar', {
             OrderIds: OrderIds.join(','),
-            CarId: this.CarId
+            CarId: this.CarId,
+            DriverId:this.DriverId,
           }, res => {
             this.saveLoading = false;
             if (res.data.resultCode == 1) {
@@ -424,6 +448,7 @@
         let height = window.innerHeight - 200;
         this.boxHeight = height;
         this.getCarList();
+        this.getDriverList();
         this.getList();
       },
     }

src/router/config.js

@@ -2242,19 +2242,19 @@ export default {
               },
             },
             {
-              path: '/HPTripPlan', //和平用车
+              path: '/HPTripPlan', //派车管理
               name: 'HPTripPlan',
               component: resolve => require(['@/components/busManagement/HPTripPlan'], resolve),
               meta: {
-                title: '日本车行预订统计表'
+                title: '派车管理'
               },
             },
             {
-              path: '/JourneyTripPlan', //行程用车计划表
+              path: '/JourneyTripPlan', //车辆预订情况
               name: 'JourneyTripPlan',
               component: resolve => require(['@/components/busManagement/JourneyTripPlan'], resolve),
               meta: {
-                title: '行程用车计划表'
+                title: '车辆预订情况'
               },
             },
             {