车辆信息管理：增加简单的还车，提车环节

src/api/vehicle/bookRecord/index.js

@@ -37,3 +37,19 @@ export function unbook(id) {
     method: 'delete'
   });
 }
+
+export function lift(data) {
+  return fetch({
+    url: '/vehicle/vehicleInfo/book/4employee/lift',
+    method: 'put',
+    data: data
+  });
+}
+
+export function ret(data) {
+  return fetch({
+    url: '/vehicle/vehicleInfo/book/4employee/ret',
+    method: 'put',
+    data: data
+  });
+}

src/store/modules/baseInfo.js

@@ -13,6 +13,7 @@ export const VEHICLE_CONSTANT_STATUS_NORMAL = 1; // 车辆状态 - 废弃
 
 export const BOOK_RECORD_STATUS_APPLY = 1; // 预定记录状态 - 申请中
 export const BOOK_RECORD_STATUS_PROVED = 2; // 预定记录状态 - 已通过
+export const BOOK_RECORD_STATUS_LIFT = 7; // 预定记录状态 - 已提车
 
 
 const baseInfo = {
@@ -59,6 +60,10 @@ const baseInfo = {
       6: {
         code: 6,
         val: '取消预订'
+      },
+      7: {
+        code: 7,
+        val: '已提车'
       }
     }
   },

src/utils/rsCode.js

@@ -6,6 +6,7 @@ export default {
     VEHICLE_INFO_NUMBER_PLATE_EXIST: 102001,  //车牌已存在
     VEHICLE_INFO_CODE_EXIST: 102003,  //车辆编码已存在
     VEHICLE_BOOKED_RECORD_ALREADY_CHANGED: 103001, //车辆预定申请状态已被修改，请刷新后继续操作
+    VEHICLE_BOOKED_RECORD_STATUS_CHANGED: 103002 //车辆预定申请状态已被修改，请刷新后继续操作
   },
   msg: {
     1: '成功',
@@ -13,6 +14,7 @@ export default {
     101001: "车辆预定信息已被修改，请刷新后继续操作",
     103001: "车辆预定申请状态已被修改，请刷新后继续操作",
     102001: "车牌已存在",
-    102003: "车辆编码已存在"
+    102003: "车辆编码已存在",
+    103002: "车辆预定申请状态已变更，请刷新后继续操作"
   }
 }

src/views/vehicle/vehicleInfo/index.vue

@@ -49,13 +49,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-button class="filter-item" type="primary" :icon=" showMoreQueryFilter ? 'caret-top' : 'caret-bottom' "
-                       v-waves @click="showMoreQueryFilter=!showMoreQueryFilter">
-              更多条件
-            </el-button>
+            <el-form-item label="分公司" prop="subordinateBranch">
+              <el-select class="filter-item" v-model="listQuery.subordinateBranch" placeholder="请选择分公司">
+                <el-option :key="undefined" label="无" :value="undefined"></el-option>
+                <el-option v-for="item in allCompanies" :key="item.id" :label="item.name" :value="item.id"></el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
         </el-row>
-
+        <el-button class="filter-item" type="primary" :icon=" showMoreQueryFilter ? 'caret-top' : 'caret-bottom' "
+                   v-waves @click="showMoreQueryFilter=!showMoreQueryFilter">
+          更多条件
+        </el-button>
 
         <transition name="fade">
           <div v-if="showMoreQueryFilter">
@@ -462,8 +467,11 @@
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item label="提车地址" prop="liftAddr">
-          <el-input v-model="form4Apply.liftAddr" placeholder="请输入提车地址"></el-input>
+        <el-form-item label="提车分公司" prop="liftCompany">
+          <el-select class="filter-item" v-model.number="form4Apply.liftCompany" placeholder="请选择提车分公司">
+            <el-option :key="undefined" label="无" :value="undefined"></el-option>
+            <el-option v-for="item in allCompanies" :key="item.id" :label="item.name" :value="item.id"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="目的地" prop="destination">
           <el-input v-model="form4Apply.destination" placeholder="请输入目的地"></el-input>
@@ -622,6 +630,7 @@
           bookEndDate: undefined,
           vehicle: undefined,
           liftAddr: undefined,
+          liftCompany: undefined,
           destination: undefined,
           remark: undefined
         },
@@ -707,17 +716,12 @@
               trigger: 'blur'
             }
           ],
-          liftAddr: [
+          liftCompany: [
             {
               required: true,
-              message: '请输入提车地址',
-              trigger: 'blur'
-            },
-            {
-              min: 0,
-              max: 200,
-              message: '长度小于 200 个字符',
-              trigger: 'blur'
+              message: '请选择提车分公司',
+              trigger: 'blur',
+              type: 'integer'
             }
           ],
           destination: [
@@ -1154,6 +1158,7 @@
           bookStartDate: undefined,
           bookEndDate: undefined,
           vehicle: undefined,
+          liftCompany: undefined,
           liftAddr: undefined,
           destination: undefined,
           remark: undefined