车辆排班添加旅游路线

src/App.vue

@@ -22,7 +22,6 @@
     padding: 10px 0;
     display: flex;
     align-items: center;
-    border-bottom: 1px solid #e1e1e1;
   }
   .main-container{
     // padding: 0 10px;

src/api/vehicle/vehicleSchedulManage.js

@@ -98,4 +98,27 @@ export function getUpkeepAll() {
     url: '/vehicle/upkeep/item/all',
     method: 'get',
   });
-}
+}
\ No newline at end of file
+
+//获取旅游路线
+export function getTourList(param) {
+  if(param){
+    return fetch({
+      url: '/api/tour/verfication/getList?'+param,
+      method: 'get',
+    });
+  }else{
+    return fetch({
+      url: '/api/tour/verfication/getList',
+      method: 'get',
+    });
+  }
+}
+
+//获取核销路线id信息
+export function getTourInfor(id) {
+  return fetch({
+    url: '/api/tour/verfication/info/'+id,
+    method: 'get',
+  });
+}

src/views/vehicle/vehicleSchedulManage/index.vue

@@ -383,7 +383,8 @@
   } from 'utils/auth';
   import {
     getVehiclePlanList,
-    getVehicleOrderDetail
+    getVehicleOrderDetail,
+    getTourInfor
   } from 'api/vehicle/vehicleSchedulManage';
   import Element1 from "../../admin/menu/components/element";
   import ElRow from "element-ui/packages/row/src/row";
@@ -586,8 +587,17 @@
               this.currentItem = {item: item, iitem: iitem, ii: ii,title: "客户用车",upkeepName:'客户用车'};
             } else if(ii.bookType == 5) {
               //房车游订单详情
-              this.zhanlan = true;
-              this.currentItem = {item: item, iitem: iitem, ii: ii, title: "房车游",upkeepName:'房车游'};
+              var str = ''
+              getTourInfor(ii.vehicleBookRecord.orderNo).then(response => {
+                if(response.status==200){
+                  str = '旅游路线:' + response.data.goodName +'  出发时间:' +response.data.time
+                  this.currentItem = {item: item, iitem: iitem, ii: ii, title: "房车游",upkeepName:'房车游',str:str};
+                  this.zhanlan = true;
+                }else{
+                  this.currentItem = {item: item, iitem: iitem, ii: ii, title: "房车游",upkeepName:'房车游'};
+                  this.zhanlan = true;
+                }
+              })
               // if(!ii.vehicleBookRecord.orderNo){
               //   this.$notify({
               //     title: '警告',

src/views/vehicle/vehicleSchedulManage/vehicleExhibitionModal.vue

@@ -24,6 +24,9 @@
         <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
         <span>{{currentItem.ii.bookType==1?"租房车":currentItem.ii.bookType==3?"维修":currentItem.ii.bookType==8?"禁用":currentItem.ii.bookType==9?"客户用车":currentItem.ii.bookType==10?"其他":currentItem.ii.bookType==4?"展览":currentItem.ii.bookType==5?"旅游":currentItem.ii.bookType==6?"保养":currentItem.ii.bookType==8?"禁用":currentItem.ii.bookType==2?"分公司使用":'未知用途'}}</span>
       </el-form-item>
+      <el-form-item label="旅游详情:" v-if="currentItem.str">
+        {{currentItem.str}}
+      </el-form-item>
       <el-form-item label="申请说明:">
         <span>{{currentItem.ii.vehicleBookRecord.remark}}</span>
       </el-form-item>

src/views/vehicle/vehicleSchedulManage/vehiclePlanModal.vue

@@ -69,6 +69,19 @@
           <el-checkbox v-for="item in upkeepList" :label="item.id" :key="item.id">{{item.name}}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
+      <el-form-item label="路线" v-if="form.bookType==5" required>
+        <el-select class="filter-item" placeholder="请选择路线" v-model="goodId" @change="goodChange">
+          <el-option :key="undefined" label="无" :value="undefined"></el-option>
+          <el-option v-for="item in goodList" :key="item.goodId" :label="item.goodName" :value="item.goodId"></el-option>
+        </el-select>
+        <el-select class="filter-item" placeholder="请选择出车公司" v-model="siteId" @change="siteChange">
+          <el-option :key="undefined" label="无" :value="undefined"></el-option>
+           <el-option v-for="item in siteList" :key="item.siteId" :label="item.siteName" :value="item.siteId"></el-option>
+        </el-select>
+        <el-select class="filter-item" placeholder="请选择出发时间" v-model="verificationId">
+          <el-option v-for="item in timeList" :key="item.verificationId" :label="item.time" :value="item.verificationId"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="使用人" prop="vehicleUsername">
         <el-input v-model="form.vehicleUsername" placeholder="请输入使用人"></el-input>
       </el-form-item>
@@ -112,7 +125,8 @@
   } from 'api/base_info/branch_company/';
   import {
     bookPlan,
-    getUpkeepAll
+    getUpkeepAll,
+    getTourList
   } from 'api/vehicle/vehicleSchedulManage';
   import ElRow from "element-ui/packages/row/src/row";
   import ElCol from "element-ui/packages/col/src/col";
@@ -142,6 +156,12 @@
         }
       };
       return {
+        goodId:undefined,
+        siteId:undefined,
+        verificationId:undefined,
+        goodList:[],
+        siteList:[],
+        timeList:[],
         pickerOptions0: {
           disabledDate(time) {
             return time.getTime() < Date.now() - 8.64e7;
@@ -209,6 +229,9 @@
       getUpkeepAll().then(response => {
         this.upkeepList = response.data
       })
+      getTourList().then(response=> {
+        this.goodList = response.data
+      })
     },
     computed: {
       ...mapGetters([
@@ -226,6 +249,19 @@
       this.anpai = true;
     },
     methods: {
+      goodChange(){
+        this.siteId = undefined
+        getTourList('goodId='+this.goodId).then(response=> {
+          this.siteList = response.data
+        })
+      },
+      siteChange(){
+        this.verificationId = undefined
+        getTourList('siteId='+this.siteId+'&goodId='+this.goodId).then(response=> {
+          this.timeList = response.data
+          this.verificationId = response.data[0].verificationId
+        })
+      },
       /**
        * 还车分公司
        */
@@ -275,6 +311,19 @@
                 return false;
               }
             }
+            console.log(this.verificationId)
+            if(this.form.bookType==5){
+              if(this.verificationId==undefined){
+                this.$notify({
+                  title: '警告',
+                  message: '请选择旅游路线',
+                  type: 'warning',
+                  duration: 2000
+                });
+                return false;
+              }
+              this.form.verificationId = this.verificationId
+            }
             let params = {
               vehicleId:this.currentItem.item.id,
               bookStartDate: formatDate(this.form.times[0], "yyyy-MM-dd hh") + ":00:00",//预定开始时间
@@ -285,6 +334,7 @@
               vehicleUserPhone: this.form.vehicleUserPhone,//使用人电话
               remark: this.form.remark,//说明
               upkeepIds:this.form.bookType==6?this.form.upkeepIds.join(","):'',//保养类型
+              orderNo:this.form.bookType==5?this.verificationId:''
             };
             bookPlan(params).then(response => {
               if (response.status === 200) {

src/views/vehicle/vehicleSchedulManage/vehicleRecords.vue

@@ -110,7 +110,8 @@
     getVehicleOrderDetail
   } from 'api/vehicle/vehicleSchedulManage';
   import {
-    getBookRecord
+    getBookRecord,
+    getTourInfor
   } from 'api/vehicle/vehicleSchedulManage';
   import rsCode from '../../../utils/rsCode';
   import {
@@ -298,8 +299,17 @@
             this.currentItem = {item: item, ii: ii,title: "客户用车",upkeepName:'客户用车'};
           } else if(cc.bookType == 5) {
             //房车游订单详情
-            this.zhanlan = true;
-            this.currentItem = {item: item, ii: ii, title: "房车游",upkeepName:'房车游'};
+            var str = ''
+            getTourInfor(ii.vehicleBookRecord.orderNo).then(response => {
+              if(response.status==200){
+                str = '旅游路线:' + response.data.goodName +'  出发时间:' +response.data.time
+                this.currentItem = {item: item, ii: ii, title: "房车游",upkeepName:'房车游',str:str};
+                this.zhanlan = true;
+              }else{
+                this.currentItem = {item: item, ii: ii, title: "房车游",upkeepName:'房车游'};
+                this.zhanlan = true;
+              }
+            })
             // if(!ii.vehicleBookRecord.orderNo){
             //   this.$notify({
             //     title: '警告',